From 456e5bdc9301df6069ed0fd6509414c1e1eb0e55 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 5 Nov 2023 15:00:04 +0100 Subject: [PATCH] fix: controller item models not rendering energy state correctly Also scopes item properties correctly. Fixes #3173 --- .../f481442ce31db2c3b3dabb5b6d85f9a78568164e | 4 +- .../fd27170b6bf91459ed2598d25721edfeafc82e0a | 66 +++++++++---------- .../models/item/black_controller.json | 27 +++++++- .../item/black_creative_controller.json | 27 +++++++- .../models/item/blue_controller.json | 27 +++++++- .../models/item/blue_creative_controller.json | 27 +++++++- .../models/item/brown_controller.json | 27 +++++++- .../item/brown_creative_controller.json | 27 +++++++- .../models/item/controller.json | 27 +++++++- .../models/item/creative_controller.json | 27 +++++++- .../models/item/cyan_controller.json | 27 +++++++- .../models/item/cyan_creative_controller.json | 27 +++++++- .../models/item/gray_controller.json | 27 +++++++- .../models/item/gray_creative_controller.json | 27 +++++++- .../models/item/green_controller.json | 27 +++++++- .../item/green_creative_controller.json | 27 +++++++- .../models/item/light_gray_controller.json | 27 +++++++- .../item/light_gray_creative_controller.json | 27 +++++++- .../models/item/lime_controller.json | 27 +++++++- .../models/item/lime_creative_controller.json | 27 +++++++- .../models/item/magenta_controller.json | 27 +++++++- .../item/magenta_creative_controller.json | 27 +++++++- .../models/item/orange_controller.json | 27 +++++++- .../item/orange_creative_controller.json | 27 +++++++- .../models/item/pink_controller.json | 27 +++++++- .../models/item/pink_creative_controller.json | 27 +++++++- .../models/item/purple_controller.json | 27 +++++++- .../item/purple_creative_controller.json | 27 +++++++- .../models/item/red_controller.json | 27 +++++++- .../models/item/red_creative_controller.json | 27 +++++++- .../models/item/white_controller.json | 27 +++++++- .../item/white_creative_controller.json | 27 +++++++- .../models/item/yellow_controller.json | 27 +++++++- .../item/yellow_creative_controller.json | 27 +++++++- .../tags/blocks/relocation_not_supported.json | 16 ++--- .../datageneration/BlockModelGenerator.java | 20 +++++- .../ControllerItemPropertyGetter.java | 6 +- .../refinedstorage/setup/ClientSetup.java | 8 +-- .../creative_wireless_crafting_monitor.json | 4 +- .../item/creative_wireless_fluid_grid.json | 4 +- .../models/item/creative_wireless_grid.json | 4 +- .../models/item/security_card.json | 4 +- .../item/wireless_crafting_monitor.json | 4 +- .../models/item/wireless_fluid_grid.json | 4 +- .../models/item/wireless_grid.json | 4 +- 45 files changed, 917 insertions(+), 95 deletions(-) diff --git a/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e index b5b6040f8..13fd2c89a 100644 --- a/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e +++ b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e @@ -1,5 +1,5 @@ -// 1.20.1 2023-11-05T14:19:25.400231284 Tags for minecraft:block mod id refinedstorage -1fa2f2b3024535fa34f1b192e3f4abaae383119b data/forge/tags/blocks/relocation_not_supported.json +// 1.20.1 2023-11-05T14:52:30.007687009 Tags for minecraft:block mod id refinedstorage +885d292a69d67240dbf2e57e951bf4fff5c7a064 data/forge/tags/blocks/relocation_not_supported.json 061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/blocks/controller.json 407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/blocks/crafter.json dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/blocks/crafter_manager.json diff --git a/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a b/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a index 23714c3c3..22654df4c 100644 --- a/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a +++ b/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a @@ -1,4 +1,4 @@ -// 1.20.1 2023-11-05T14:19:25.392534402 Block States: refinedstorage +// 1.20.1 2023-11-05T14:52:29.995381618 Block States: refinedstorage 7b69e3ab3a7471a50e264579d36c04adb8acad35 assets/refinedstorage/blockstates/black_controller.json c87045bd089212825bdd0f06b0d25e7bcf0e3f5d assets/refinedstorage/blockstates/black_crafter.json 999fe91e1661d6b45f9c29878f06438b3b5919dc assets/refinedstorage/blockstates/black_crafter_manager.json @@ -513,12 +513,12 @@ c2e51f822376d1968fc07e6987f70ff069d460d4 assets/refinedstorage/models/block/wire 747ea39519e81abea94ca278f2e610e7c55d342e assets/refinedstorage/models/block/wireless_transmitter/red.json c6258775f847e0957a14fdfd24dcce3116d90acc assets/refinedstorage/models/block/wireless_transmitter/white.json 556c8e5da522c6e27f8a6ee8de69fc95fafb504e assets/refinedstorage/models/block/wireless_transmitter/yellow.json -b281a426469c35fbbb1cb3e87795daa52ec3f97b assets/refinedstorage/models/item/black_controller.json +0fb53d70880b97a55241dbb04f49b9ad39048920 assets/refinedstorage/models/item/black_controller.json 942d718968e1b8d27b203bc661801d37d154b5f2 assets/refinedstorage/models/item/black_crafter.json 75ac21fb6def11be4568d2ac5ff2651f3564f25d assets/refinedstorage/models/item/black_crafter_manager.json 28891a28805f96c47409a34943342830a15e6690 assets/refinedstorage/models/item/black_crafting_grid.json ddb0a90214bf85dc8e188068f73ae2b20f82150f assets/refinedstorage/models/item/black_crafting_monitor.json -b281a426469c35fbbb1cb3e87795daa52ec3f97b assets/refinedstorage/models/item/black_creative_controller.json +0fb53d70880b97a55241dbb04f49b9ad39048920 assets/refinedstorage/models/item/black_creative_controller.json 241b9b206acf6f4c9ac3151c4044dac213bc0670 assets/refinedstorage/models/item/black_detector.json ac9dc77f9d6ba5ee90101187aa09e406c0d14fbd assets/refinedstorage/models/item/black_disk_manipulator.json 876fc7ec3dda3568c1fd1e8d2b6ceb200d1380ab assets/refinedstorage/models/item/black_fluid_grid.json @@ -529,12 +529,12 @@ d823ba7bc1affa7af633185834d1ff582882f2e6 assets/refinedstorage/models/item/black 61861f588ea12538786c06129c3d0a1040394f16 assets/refinedstorage/models/item/black_relay.json c634efc545854df54c57dd2bf61d6e03448742e6 assets/refinedstorage/models/item/black_security_manager.json 6a1e27442bf1512ba949fafaf135502ae0420169 assets/refinedstorage/models/item/black_wireless_transmitter.json -691f05fe24b16b4eb7688992e08b2f3f5afb02ee assets/refinedstorage/models/item/blue_controller.json +1df94eb9089e76129d911d793c26402ff9313880 assets/refinedstorage/models/item/blue_controller.json 2de69e179294ad396ebe181228c3e9c1787ab550 assets/refinedstorage/models/item/blue_crafter.json cdea55152a48642717bdc630f74ee6fcf1d8f667 assets/refinedstorage/models/item/blue_crafter_manager.json c75d3ac7fb95df1b57ae997f5bf9ed7aad112eb0 assets/refinedstorage/models/item/blue_crafting_grid.json 4fba5520838ccf9f88f51853ad95b9bd6c6c9b9c assets/refinedstorage/models/item/blue_crafting_monitor.json -691f05fe24b16b4eb7688992e08b2f3f5afb02ee assets/refinedstorage/models/item/blue_creative_controller.json +1df94eb9089e76129d911d793c26402ff9313880 assets/refinedstorage/models/item/blue_creative_controller.json f59b716bc576eed79556110ef355fa28cf92d10a assets/refinedstorage/models/item/blue_detector.json 5f8275097f6478a4f23e1ce55dde36a5dc2e5407 assets/refinedstorage/models/item/blue_disk_manipulator.json 675c756edd54900ab155bc45d5a7134cf6dac3a3 assets/refinedstorage/models/item/blue_fluid_grid.json @@ -545,12 +545,12 @@ f59b716bc576eed79556110ef355fa28cf92d10a assets/refinedstorage/models/item/blue_ 763ebca22b3642be09f396deac9cd9c54b90e58f assets/refinedstorage/models/item/blue_relay.json 5abbfde1e5a947ae44fde121c3294f9fb2b60e7d assets/refinedstorage/models/item/blue_security_manager.json e38c127e67a2ef649d7ed595577947c93473d3d2 assets/refinedstorage/models/item/blue_wireless_transmitter.json -4be65b24bde8f3b4dd101ee78b74bb8e22cfd193 assets/refinedstorage/models/item/brown_controller.json +f27acd12556251b68e10d33d55cb90bcee40ab07 assets/refinedstorage/models/item/brown_controller.json 0fb2cc9e3e05d19d9fcc5e04c6baeaa2cb04265c assets/refinedstorage/models/item/brown_crafter.json 022322ce32ac742f4ce5498d3da128741fe0767d assets/refinedstorage/models/item/brown_crafter_manager.json eb37e649bbb3f087df69a30c22215418b3fc901d assets/refinedstorage/models/item/brown_crafting_grid.json 4556f504e89f87de6ab73c12259b73eb151e8d7a assets/refinedstorage/models/item/brown_crafting_monitor.json -4be65b24bde8f3b4dd101ee78b74bb8e22cfd193 assets/refinedstorage/models/item/brown_creative_controller.json +f27acd12556251b68e10d33d55cb90bcee40ab07 assets/refinedstorage/models/item/brown_creative_controller.json 470afaeaaaec68a1474b2efcb2e027382b6d4069 assets/refinedstorage/models/item/brown_detector.json 12c9098c38f118056d9576671287b9783e50be98 assets/refinedstorage/models/item/brown_disk_manipulator.json 7fcf4b0092b4a6e733046548217f8cd40a0b0c01 assets/refinedstorage/models/item/brown_fluid_grid.json @@ -561,18 +561,18 @@ a852eda91b130409a8127af77cf1a00b2aab81c8 assets/refinedstorage/models/item/brown 023fb3d3d0164e237d6d8c83028e66ffb080905f assets/refinedstorage/models/item/brown_relay.json 45c70a18a9b27b3a0f7cd41a450ba23ba4b97faf assets/refinedstorage/models/item/brown_security_manager.json 3c329581c36a66b21409184843a78e90eae25c50 assets/refinedstorage/models/item/brown_wireless_transmitter.json -016151e185659bb813f613e2fd854b97f409e6ee assets/refinedstorage/models/item/controller.json +9af89e77d470eaf03b34847b568e0fcd0cfeb2ca assets/refinedstorage/models/item/controller.json 712a2408676f6ce1208b196d0cfe065136d612fe assets/refinedstorage/models/item/crafter.json 2adb1c2ed2c30890df2492069293f20c085eddf2 assets/refinedstorage/models/item/crafter_manager.json 2ef1da280a960eafd61369b67ea1647966fdcc0c assets/refinedstorage/models/item/crafting_grid.json ea61beccbf6896f3fdf99b8d4787be67573595dc assets/refinedstorage/models/item/crafting_monitor.json -016151e185659bb813f613e2fd854b97f409e6ee assets/refinedstorage/models/item/creative_controller.json -0771c634ffd9a6a354ca2464a26c48bfbb19699d assets/refinedstorage/models/item/cyan_controller.json +9af89e77d470eaf03b34847b568e0fcd0cfeb2ca assets/refinedstorage/models/item/creative_controller.json +d3d25cbac485889dd6766253c3fb96a1827963a9 assets/refinedstorage/models/item/cyan_controller.json 5b3089cc0257509445e335427fcee15a0c6d19e4 assets/refinedstorage/models/item/cyan_crafter.json 734e1865d2b25eda65d72541f7db30b277d3cf73 assets/refinedstorage/models/item/cyan_crafter_manager.json c4fc9d67c903d107548d25237173d1df0dfad2ee assets/refinedstorage/models/item/cyan_crafting_grid.json 133a84e4fd76123350bffc37cab6156ae6a0f61f assets/refinedstorage/models/item/cyan_crafting_monitor.json -0771c634ffd9a6a354ca2464a26c48bfbb19699d assets/refinedstorage/models/item/cyan_creative_controller.json +d3d25cbac485889dd6766253c3fb96a1827963a9 assets/refinedstorage/models/item/cyan_creative_controller.json 3e224af44dddb95f804967974a776f3d39e14f79 assets/refinedstorage/models/item/cyan_detector.json db51d1db8c2ef34f4ca03499081995031fc9bd75 assets/refinedstorage/models/item/cyan_disk_manipulator.json 959e0627277816d1d5a0a529bee59631aa2cbd59 assets/refinedstorage/models/item/cyan_fluid_grid.json @@ -586,12 +586,12 @@ c3bcb743cd9b551b8e3e07dd16a039ccce65167f assets/refinedstorage/models/item/cyan_ a14c5f121b112f80f018eb39e4017a044f5176c2 assets/refinedstorage/models/item/detector.json b864dd2a574cb0ff0f87373ba145b7e7c4b6a315 assets/refinedstorage/models/item/disk_manipulator.json b6f77a02dc8f84c8dc50af0e3ca8d4a2597894fb assets/refinedstorage/models/item/fluid_grid.json -9dfedbca7429678288b5e569f4ca99b1723c24b2 assets/refinedstorage/models/item/gray_controller.json +2793400d4b735f12ca00a38d89ce230de4882728 assets/refinedstorage/models/item/gray_controller.json f201a4dc689054fbf5afa4cd9318059b45e34fac assets/refinedstorage/models/item/gray_crafter.json d699ea44dc8ba183d453f865bb5dd816cae8a628 assets/refinedstorage/models/item/gray_crafter_manager.json e8beb5658c198903aa882e818e9f1a12fb219ed2 assets/refinedstorage/models/item/gray_crafting_grid.json a24b4fb9353df1c8b9ba48ec7cda1402a0d18e06 assets/refinedstorage/models/item/gray_crafting_monitor.json -9dfedbca7429678288b5e569f4ca99b1723c24b2 assets/refinedstorage/models/item/gray_creative_controller.json +2793400d4b735f12ca00a38d89ce230de4882728 assets/refinedstorage/models/item/gray_creative_controller.json 3a62caa71a381e853fb8e1fd09e6eca16de95b8c assets/refinedstorage/models/item/gray_detector.json 876cf3b8ad044945e93a2dcf595e5ee851a95801 assets/refinedstorage/models/item/gray_disk_manipulator.json 4eb03c2834f4d92be29707d3a7e3412d2e5afae7 assets/refinedstorage/models/item/gray_fluid_grid.json @@ -602,12 +602,12 @@ d549169a533feee23ee8f3e1b39b7c4bcf23b475 assets/refinedstorage/models/item/gray_ 39bd74ec45ffe304d1e339d184b2164117d88b5f assets/refinedstorage/models/item/gray_relay.json 9db80d9e795dbe5edff7a565671cf0095a7c4973 assets/refinedstorage/models/item/gray_security_manager.json be60c25b51488e5a1f5db9aa0b8ce834b4f843b6 assets/refinedstorage/models/item/gray_wireless_transmitter.json -83f880c7750bb4e0ab772b23955faa259792b078 assets/refinedstorage/models/item/green_controller.json +a6dccc5437fa6c15a9a032e7862c4c5653849dd8 assets/refinedstorage/models/item/green_controller.json 36aec4f5a603dddd1817a815a612a4eb7190e222 assets/refinedstorage/models/item/green_crafter.json 6fce1c029999c014a5d9bd0ac7b2b24838dc0cf6 assets/refinedstorage/models/item/green_crafter_manager.json 3d835f157f4ace96a84a0e990276fe03fe1758c4 assets/refinedstorage/models/item/green_crafting_grid.json cbb61098395bda16b743c82f56529a00d91a708a assets/refinedstorage/models/item/green_crafting_monitor.json -83f880c7750bb4e0ab772b23955faa259792b078 assets/refinedstorage/models/item/green_creative_controller.json +a6dccc5437fa6c15a9a032e7862c4c5653849dd8 assets/refinedstorage/models/item/green_creative_controller.json 7ec5ba813db5c1ae5663bebfa659b53c8e75096c assets/refinedstorage/models/item/green_detector.json 7b0b74419933a23e3921672b49edc8830d1b3045 assets/refinedstorage/models/item/green_disk_manipulator.json a8c70489b145ecafc07040195946c329ae30da41 assets/refinedstorage/models/item/green_fluid_grid.json @@ -619,12 +619,12 @@ ca9981a8b7c74fbdea91c12409b1c56929f829a2 assets/refinedstorage/models/item/green 29860d74f6f59ebabc4534eb3e437c50d82e6d75 assets/refinedstorage/models/item/green_security_manager.json 0f626e543261b13e2d9021d09fc804236b9c9ca5 assets/refinedstorage/models/item/green_wireless_transmitter.json 8e62b1170a93f317a3a0463eb2dc331bc6a29fc8 assets/refinedstorage/models/item/grid.json -2269e15b0f486194980cd1fe6ed2c7c506d10c3c assets/refinedstorage/models/item/light_gray_controller.json +dbcc2e910fd5029dd5061fc018b0c21bee0aa0b0 assets/refinedstorage/models/item/light_gray_controller.json 1280d243a5ee781a911776123a92280f6871e92b assets/refinedstorage/models/item/light_gray_crafter.json 63d91aa91f0b04bc56661d77cba3802a028b14c3 assets/refinedstorage/models/item/light_gray_crafter_manager.json 5447f9412ac89a2453495f7012906936556f3f97 assets/refinedstorage/models/item/light_gray_crafting_grid.json 589f1eab82f17738f7c84408250051526612166c assets/refinedstorage/models/item/light_gray_crafting_monitor.json -2269e15b0f486194980cd1fe6ed2c7c506d10c3c assets/refinedstorage/models/item/light_gray_creative_controller.json +dbcc2e910fd5029dd5061fc018b0c21bee0aa0b0 assets/refinedstorage/models/item/light_gray_creative_controller.json c0fe9601a0b96cb28e05777646e8b1fa06dff11c assets/refinedstorage/models/item/light_gray_detector.json a015d9065f13234987d35e242922e19a39cda358 assets/refinedstorage/models/item/light_gray_disk_manipulator.json 792b2649c17462ffad43035187f9ae62faf2f741 assets/refinedstorage/models/item/light_gray_fluid_grid.json @@ -635,12 +635,12 @@ d7492fb5ea426b156d29d90cac3c068a69257993 assets/refinedstorage/models/item/light 4b04ebd4de4cc44d66f69595a15e19c986bd89c5 assets/refinedstorage/models/item/light_gray_relay.json 72c8be165eead23444e70fd27b214fbe4b4c8f5c assets/refinedstorage/models/item/light_gray_security_manager.json cf8a25b86388ed35135d6f7abc84c9db2f8c3147 assets/refinedstorage/models/item/light_gray_wireless_transmitter.json -011d6b505683c116a6dec86ac3f6a6164f6b9d6a assets/refinedstorage/models/item/lime_controller.json +191c24b9824b3c218963d8ec68c79a25600cd04e assets/refinedstorage/models/item/lime_controller.json b5fe18a5faa8b19bca2356055bed26e3c4b7d6da assets/refinedstorage/models/item/lime_crafter.json c06a4c91f48f582ec7bbddf1992632496f628052 assets/refinedstorage/models/item/lime_crafter_manager.json 5cd081548f10fccc38406afa4e62211a67068868 assets/refinedstorage/models/item/lime_crafting_grid.json d42a9b602a6b3e8ca87f44093bd5dbb8d025b83b assets/refinedstorage/models/item/lime_crafting_monitor.json -011d6b505683c116a6dec86ac3f6a6164f6b9d6a assets/refinedstorage/models/item/lime_creative_controller.json +191c24b9824b3c218963d8ec68c79a25600cd04e assets/refinedstorage/models/item/lime_creative_controller.json acc983f06040f4785c84fca542678df7bf93eba6 assets/refinedstorage/models/item/lime_detector.json 19e1e36a546b3ec487a2a4356d85b0f0d72ad69d assets/refinedstorage/models/item/lime_disk_manipulator.json 2d485286e0757a593ca7ce9cd37ce34ba036fc4f assets/refinedstorage/models/item/lime_fluid_grid.json @@ -651,12 +651,12 @@ a9be76a8a262a6a315f1227d33c8d7304b21f04a assets/refinedstorage/models/item/lime_ 95676494b1360458129336fb1c89a827d9887d9a assets/refinedstorage/models/item/lime_relay.json c06aaadeb1e8573ee6a8f4d66c47a908df9df070 assets/refinedstorage/models/item/lime_security_manager.json 4ac21895d402f5824f599daeae315330deeeb5cc assets/refinedstorage/models/item/lime_wireless_transmitter.json -9f27b43f99677fca67591759cbe5f6edd73bb50a assets/refinedstorage/models/item/magenta_controller.json +ed8cd700afa7ce785453398f1739fa69b544306b assets/refinedstorage/models/item/magenta_controller.json 7ae69165d5905f17a5e837de77d22941f3f22181 assets/refinedstorage/models/item/magenta_crafter.json 97a0c41ddb54000647c33b56095215033b7f364a assets/refinedstorage/models/item/magenta_crafter_manager.json fea6df9eea90ca27131d5b9e37b08d50b1cb3618 assets/refinedstorage/models/item/magenta_crafting_grid.json 3bf88ca8bbd2ebe7eba52cd6a90a81d4af0391b0 assets/refinedstorage/models/item/magenta_crafting_monitor.json -9f27b43f99677fca67591759cbe5f6edd73bb50a assets/refinedstorage/models/item/magenta_creative_controller.json +ed8cd700afa7ce785453398f1739fa69b544306b assets/refinedstorage/models/item/magenta_creative_controller.json 5fdee8b4342e1b1b8e09a8ab300fcb9dbdcf8530 assets/refinedstorage/models/item/magenta_detector.json 44ff4ad0e90b6b4bc72653d833e04e5352241304 assets/refinedstorage/models/item/magenta_disk_manipulator.json 220ab0b014958d16917799de11a951e9ab8b207c assets/refinedstorage/models/item/magenta_fluid_grid.json @@ -669,12 +669,12 @@ d7bcf381a5d9689d554438184f0fec0012f65f05 assets/refinedstorage/models/item/magen 833c0a8c3e209c604cad8146468143470693f42a assets/refinedstorage/models/item/magenta_wireless_transmitter.json 6dbbe55fd346aaa8eec23b2808ffd18d5840d832 assets/refinedstorage/models/item/network_receiver.json 54f8841b6832f05b8e5076cfb5a714ef66c4b159 assets/refinedstorage/models/item/network_transmitter.json -4c5f868c405f5a821344993b45ce1c7eb53b39ef assets/refinedstorage/models/item/orange_controller.json +62a9e346d5e83e3b4c1c947d7ef5316d93b168a6 assets/refinedstorage/models/item/orange_controller.json 2a934a32a43fd58110eebc7b3e4b05f71c21b76c assets/refinedstorage/models/item/orange_crafter.json 3e7fbb114a1270c3e2cf2d79f043c62e869de2dc assets/refinedstorage/models/item/orange_crafter_manager.json 4f35a7cc88dff4dc4ee066261024f14f123f8227 assets/refinedstorage/models/item/orange_crafting_grid.json 0c7188e1968be58e1797720861a5d104f7dae2a4 assets/refinedstorage/models/item/orange_crafting_monitor.json -4c5f868c405f5a821344993b45ce1c7eb53b39ef assets/refinedstorage/models/item/orange_creative_controller.json +62a9e346d5e83e3b4c1c947d7ef5316d93b168a6 assets/refinedstorage/models/item/orange_creative_controller.json 833cc370275e91e9088bba3505b52e9199beafca assets/refinedstorage/models/item/orange_detector.json cc94b04311c3c1089dc1e488464540f5ef04b448 assets/refinedstorage/models/item/orange_disk_manipulator.json 846a0e2b574b4518a392916902564fc692b72994 assets/refinedstorage/models/item/orange_fluid_grid.json @@ -686,12 +686,12 @@ cae021973ae73db4f26907bc20af071b4788a7d1 assets/refinedstorage/models/item/orang fc333d59e066c62ef6bad598dfaadcc030655f23 assets/refinedstorage/models/item/orange_security_manager.json 27557f3fd10361a51c867fe8211073807576f040 assets/refinedstorage/models/item/orange_wireless_transmitter.json 4368418d5b92cbaa041d20e6f25d06ab3f24fd6f assets/refinedstorage/models/item/pattern_grid.json -ee76a877974d73451d88c2ca231c8854ada09a1b assets/refinedstorage/models/item/pink_controller.json +0514638803a2e3805e5078001fb4f53ceb7d1a41 assets/refinedstorage/models/item/pink_controller.json 3b472cd0ed96b6eb64c7695429cc7a76e629f1a6 assets/refinedstorage/models/item/pink_crafter.json 03a29baf74da2cbf3d7ee5ae8d9925d19c34e8f3 assets/refinedstorage/models/item/pink_crafter_manager.json e0710739ed2c8c74147585c990fe62d9fdb18ab0 assets/refinedstorage/models/item/pink_crafting_grid.json 71045a36761dca453325aced8d84cff206c81817 assets/refinedstorage/models/item/pink_crafting_monitor.json -ee76a877974d73451d88c2ca231c8854ada09a1b assets/refinedstorage/models/item/pink_creative_controller.json +0514638803a2e3805e5078001fb4f53ceb7d1a41 assets/refinedstorage/models/item/pink_creative_controller.json 6c67a4fc7796172f625c4862cf616c86bf8cba79 assets/refinedstorage/models/item/pink_detector.json 75c748b9473e195554615573406e1571b5ccac10 assets/refinedstorage/models/item/pink_disk_manipulator.json c3b2796d126d95f9141472a0c0009d88bd7cb855 assets/refinedstorage/models/item/pink_fluid_grid.json @@ -702,12 +702,12 @@ ba12ed9891fa73b2336ff93ab4bfd0d3b1492652 assets/refinedstorage/models/item/pink_ 6d6d9cd242688e2891cd6fc8c74eb19dcf36ac19 assets/refinedstorage/models/item/pink_relay.json fe2fc6e128f619dddc5d9f04486264a245c2b457 assets/refinedstorage/models/item/pink_security_manager.json 332f608a7dc84019b8b0fa2a5e44ad9f78e430de assets/refinedstorage/models/item/pink_wireless_transmitter.json -4dfb50d2cd83c9592a6273cebe727c01aa4f1636 assets/refinedstorage/models/item/purple_controller.json +0f11e9205719c6fe582e96bd4205ac7c93bfd209 assets/refinedstorage/models/item/purple_controller.json 506b89f03df977db6eb43c09d39b8aa8d7fcc28a assets/refinedstorage/models/item/purple_crafter.json b3b6be54491ba314822a6b47b20a55955b81a986 assets/refinedstorage/models/item/purple_crafter_manager.json 413fffa72205e3c3f50106162bf88e8d18cad8ab assets/refinedstorage/models/item/purple_crafting_grid.json ac159f10aab33c9e95009384d994a46caf4e9c5b assets/refinedstorage/models/item/purple_crafting_monitor.json -4dfb50d2cd83c9592a6273cebe727c01aa4f1636 assets/refinedstorage/models/item/purple_creative_controller.json +0f11e9205719c6fe582e96bd4205ac7c93bfd209 assets/refinedstorage/models/item/purple_creative_controller.json a137fc45d5f9b891ef00d75a2855258a88177668 assets/refinedstorage/models/item/purple_detector.json 525576087501ad8483619e8339a614951eada2b6 assets/refinedstorage/models/item/purple_disk_manipulator.json 80fb0c7bc38471d990c1623918a96db182bbe93b assets/refinedstorage/models/item/purple_fluid_grid.json @@ -718,12 +718,12 @@ c5a01a9ddace2e421e32b12c83d7a0b384be75fa assets/refinedstorage/models/item/purpl e2efaf0e99c7dc1125b32370201be809a67c25d9 assets/refinedstorage/models/item/purple_relay.json 3c3ed303d605e0e9345940fc1756e2ecd1c48287 assets/refinedstorage/models/item/purple_security_manager.json ef7d480ea1f08c1a2a7c2aebcbe3ca751df9f9b6 assets/refinedstorage/models/item/purple_wireless_transmitter.json -30cae1f86496d859b04120d0f0948597323b1c6b assets/refinedstorage/models/item/red_controller.json +004e6cf370c1b7ad3d243a358494bb1af2fdee8d assets/refinedstorage/models/item/red_controller.json 6804c531235f5c7cd13f0c734a30aa58855c66d8 assets/refinedstorage/models/item/red_crafter.json f2804c202120637bff89dd8b2ab8e43ba1f5aafc assets/refinedstorage/models/item/red_crafter_manager.json acddcd41152a23916905fd85ad62081f5cb8c90c assets/refinedstorage/models/item/red_crafting_grid.json 5a93d02b15f7ef2d9803ef0d004930ed1766707b assets/refinedstorage/models/item/red_crafting_monitor.json -30cae1f86496d859b04120d0f0948597323b1c6b assets/refinedstorage/models/item/red_creative_controller.json +004e6cf370c1b7ad3d243a358494bb1af2fdee8d assets/refinedstorage/models/item/red_creative_controller.json 4c1c2a7322dada203e2521225d80c5b516cacb62 assets/refinedstorage/models/item/red_detector.json 262bdaf7a4a2a587dc88e3fb5c72c22e16829998 assets/refinedstorage/models/item/red_disk_manipulator.json 67e092b9a6df25cb4396d3ae4464dd3c009c60b2 assets/refinedstorage/models/item/red_fluid_grid.json @@ -736,12 +736,12 @@ d2127558a02a6cb0a6c58a1feb8a4b9eb251d544 assets/refinedstorage/models/item/red_n 05e22d0e5fafbbe8c6864c896a05907b1808c4cf assets/refinedstorage/models/item/red_wireless_transmitter.json 58e008aea088a9e1903885a2bc6e14d9f0b2c333 assets/refinedstorage/models/item/relay.json e0546ec6993e456e7ef61a35cccc862382b15fd5 assets/refinedstorage/models/item/security_manager.json -346c26a65981ebc056b0ee27d2de9c51ba4994dd assets/refinedstorage/models/item/white_controller.json +9b37576964ccce28c9396299400a78a0a9d9ee04 assets/refinedstorage/models/item/white_controller.json c6e5a16319d0fad19ac8ede0108b658cd4028146 assets/refinedstorage/models/item/white_crafter.json e6194df137b2c614d6402d6dc672beae80430d38 assets/refinedstorage/models/item/white_crafter_manager.json 399926c00694fa7abefd1709cc3da37d7eb0c5af assets/refinedstorage/models/item/white_crafting_grid.json ecff06abfe1465fb6630f027f9253965ceb2ed60 assets/refinedstorage/models/item/white_crafting_monitor.json -346c26a65981ebc056b0ee27d2de9c51ba4994dd assets/refinedstorage/models/item/white_creative_controller.json +9b37576964ccce28c9396299400a78a0a9d9ee04 assets/refinedstorage/models/item/white_creative_controller.json 5f1ae8346d30d2e4f6b5aed97504d35ec05eecfe assets/refinedstorage/models/item/white_detector.json 0eec3932d36ed9e265a48b90fc1ae83bb95a3aa3 assets/refinedstorage/models/item/white_disk_manipulator.json ca0c7707acf771758db0194f30f1247d4721ae50 assets/refinedstorage/models/item/white_fluid_grid.json @@ -753,12 +753,12 @@ ca0c7707acf771758db0194f30f1247d4721ae50 assets/refinedstorage/models/item/white 42c146254c8c634eb9f79f29b909535b0504d6a5 assets/refinedstorage/models/item/white_security_manager.json dffc5e13406d4370d1cc3fcc69c7556029406e98 assets/refinedstorage/models/item/white_wireless_transmitter.json 08797906f5356ea0ccc061347d188bab0c63c02d assets/refinedstorage/models/item/wireless_transmitter.json -ffd57aa30d902404da8963c14320fa8be54d6451 assets/refinedstorage/models/item/yellow_controller.json +2fca7b8b45c98bc01de598dd53f0f80f2e547dd4 assets/refinedstorage/models/item/yellow_controller.json 1bf5a3d8d72edcd34ddf8266caaac89717a02ecb assets/refinedstorage/models/item/yellow_crafter.json 6b33ac9d2c729a4ea8dd42efb8feeb553a434d70 assets/refinedstorage/models/item/yellow_crafter_manager.json b628289d264ed316cd2d88c297fb8712f8bbffd2 assets/refinedstorage/models/item/yellow_crafting_grid.json 496e7503c51cf826e718301641235d07ddb24de7 assets/refinedstorage/models/item/yellow_crafting_monitor.json -ffd57aa30d902404da8963c14320fa8be54d6451 assets/refinedstorage/models/item/yellow_creative_controller.json +2fca7b8b45c98bc01de598dd53f0f80f2e547dd4 assets/refinedstorage/models/item/yellow_creative_controller.json 04e4c31f56373507a46da2deccc4890305fe671e assets/refinedstorage/models/item/yellow_detector.json 6412b4000a8034e4b5e019b9a6d9c32085cda263 assets/refinedstorage/models/item/yellow_disk_manipulator.json 5b6b9685ed940cdfcede5c4df4b6836fbd748895 assets/refinedstorage/models/item/yellow_fluid_grid.json diff --git a/src/generated/resources/assets/refinedstorage/models/item/black_controller.json b/src/generated/resources/assets/refinedstorage/models/item/black_controller.json index cb9427193..77f69fea5 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/black_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/black_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/black" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/black", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json index cb9427193..77f69fea5 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/black_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/black" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/black", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json b/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json index bc76a6088..9809a99e4 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/blue_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/blue" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/blue", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json index bc76a6088..9809a99e4 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/blue_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/blue" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/blue", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json b/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json index 56cbbdfcd..d42593757 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/brown_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/brown" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/brown", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json index 56cbbdfcd..d42593757 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/brown_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/brown" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/brown", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/controller.json b/src/generated/resources/assets/refinedstorage/models/item/controller.json index 990f3923d..23ab4e6ec 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/light_blue" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/light_blue", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json index 990f3923d..23ab4e6ec 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/light_blue" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/light_blue", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json b/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json index 47221fabc..2ff8aa9b0 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/cyan_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/cyan" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/cyan", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json index 47221fabc..2ff8aa9b0 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/cyan_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/cyan" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/cyan", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json b/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json index f88c49bf5..0d55382c0 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/gray_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/gray" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/gray", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json index f88c49bf5..0d55382c0 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/gray_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/gray" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/gray", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/green_controller.json b/src/generated/resources/assets/refinedstorage/models/item/green_controller.json index 77e71dcaa..7cb5b0a19 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/green_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/green_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/green" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/green", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json index 77e71dcaa..7cb5b0a19 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/green_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/green" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/green", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json b/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json index 128f618ca..263512147 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/light_gray_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/light_gray" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/light_gray", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json index 128f618ca..263512147 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/light_gray_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/light_gray" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/light_gray", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json b/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json index d795339fd..ed97c4543 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/lime_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/lime" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/lime", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json index d795339fd..ed97c4543 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/lime_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/lime" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/lime", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json b/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json index 6852bbc37..c9913d1ca 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/magenta_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/magenta" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/magenta", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json index 6852bbc37..c9913d1ca 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/magenta_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/magenta" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/magenta", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json b/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json index 61fc873b6..c3251821d 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/orange_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/orange" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/orange", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json index 61fc873b6..c3251821d 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/orange_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/orange" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/orange", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json b/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json index 920e54942..b9990aa43 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/pink_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/pink" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/pink", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json index 920e54942..b9990aa43 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/pink_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/pink" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/pink", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json b/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json index 1316bea3d..2b2682be3 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/purple_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/purple" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/purple", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json index 1316bea3d..2b2682be3 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/purple_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/purple" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/purple", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/red_controller.json b/src/generated/resources/assets/refinedstorage/models/item/red_controller.json index eb572767f..c3151af90 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/red_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/red_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/red" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/red", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json index eb572767f..c3151af90 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/red_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/red" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/red", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/white_controller.json b/src/generated/resources/assets/refinedstorage/models/item/white_controller.json index bb2593f05..40ae4ca37 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/white_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/white_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/white" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/white", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json index bb2593f05..40ae4ca37 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/white_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/white" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/white", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json b/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json index 7821d06ec..b652c9421 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/yellow_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/yellow" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/yellow", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json b/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json index 7821d06ec..b652c9421 100644 --- a/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json +++ b/src/generated/resources/assets/refinedstorage/models/item/yellow_creative_controller.json @@ -1,3 +1,28 @@ { - "parent": "refinedstorage:block/controller/yellow" + "overrides": [ + { + "model": "refinedstorage:block/controller/off", + "predicate": { + "refinedstorage:energy_type": 0.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_off", + "predicate": { + "refinedstorage:energy_type": 1.0 + } + }, + { + "model": "refinedstorage:block/controller/nearly_on", + "predicate": { + "refinedstorage:energy_type": 2.0 + } + }, + { + "model": "refinedstorage:block/controller/yellow", + "predicate": { + "refinedstorage:energy_type": 3.0 + } + } + ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json index d230f6c51..1e66d2379 100644 --- a/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json +++ b/src/generated/resources/data/forge/tags/blocks/relocation_not_supported.json @@ -1,21 +1,21 @@ { "values": [ - "#refinedstorage:disk_manipulator", "#refinedstorage:creative_controller", - "#refinedstorage:wireless_transmitter", - "#refinedstorage:controller", + "#refinedstorage:detector", + "#refinedstorage:pattern_grid", "#refinedstorage:network_transmitter", "#refinedstorage:security_manager", + "#refinedstorage:disk_manipulator", + "#refinedstorage:wireless_transmitter", "#refinedstorage:crafter_manager", "#refinedstorage:grid", - "#refinedstorage:crafter", - "#refinedstorage:crafting_grid", - "#refinedstorage:pattern_grid", "#refinedstorage:crafting_monitor", - "#refinedstorage:relay", - "#refinedstorage:detector", + "#refinedstorage:controller", + "#refinedstorage:crafting_grid", + "#refinedstorage:crafter", "#refinedstorage:fluid_grid", "#refinedstorage:network_receiver", + "#refinedstorage:relay", "refinedstorage:1k_storage_block", "refinedstorage:4k_storage_block", "refinedstorage:16k_storage_block", diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java index 05fd52a44..5c3872c02 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java @@ -13,6 +13,7 @@ import net.minecraft.world.level.block.Block; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; +import net.minecraftforge.registries.ForgeRegistries; public class BlockModelGenerator extends BlockStateProvider { private static final ResourceLocation BOTTOM = new ResourceLocation(RS.ID, "block/bottom"); @@ -249,7 +250,24 @@ public class BlockModelGenerator extends BlockStateProvider { resourceLocation(folderName, "cutouts/" + color) ); - simpleBlockItem(block, model); + final ResourceLocation energyType = new ResourceLocation(RS.ID, "energy_type"); + itemModels().getBuilder(ForgeRegistries.BLOCKS.getKey(block).getPath()) + .override() + .predicate(energyType, 0) + .model(models().getExistingFile( + new ResourceLocation(RS.ID, "block/" + folderName + "/off") + )).end().override() + .predicate(energyType, 1) + .model(models().getExistingFile( + new ResourceLocation(RS.ID, "block/" + folderName + "/nearly_off") + )).end().override() + .predicate(energyType, 2) + .model(models().getExistingFile( + new ResourceLocation(RS.ID, "block/" + folderName + "/nearly_on") + )).end().override() + .predicate(energyType, 3) + .model(model).end(); + return model; } }); diff --git a/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java b/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java index 205ec1c43..210936982 100644 --- a/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java +++ b/src/main/java/com/refinedmods/refinedstorage/item/property/ControllerItemPropertyGetter.java @@ -14,10 +14,14 @@ import javax.annotation.Nullable; public class ControllerItemPropertyGetter implements ItemPropertyFunction { @Override public float call(ItemStack stack, @Nullable ClientLevel level, @Nullable LivingEntity entity, int p) { + // if that stack is still clean (like in the creative mode tab, or just crafted) maintain the on state. + if (stack.getTag() == null) { + return ControllerBlock.EnergyType.ON.ordinal(); + } IEnergyStorage storage = stack.getCapability(ForgeCapabilities.ENERGY).orElse(null); if (storage != null) { return Network.getEnergyType(storage.getEnergyStored(), storage.getMaxEnergyStored()).ordinal(); } - return ControllerBlock.EnergyType.OFF.ordinal(); + return ControllerBlock.EnergyType.ON.ordinal(); } } diff --git a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java index 0256a42be..52f1f0652 100644 --- a/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java +++ b/src/main/java/com/refinedmods/refinedstorage/setup/ClientSetup.java @@ -50,7 +50,7 @@ public final class ClientSetup { private static final ResourceLocation DISK_FULL_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk_full"); private static final ResourceLocation DISK_DISCONNECTED_RESOURCE = new ResourceLocation(RS.ID + ":block/disks/disk_disconnected"); - private static final ResourceLocation CONNECTED = new ResourceLocation("connected"); + private static final ResourceLocation CONNECTED = new ResourceLocation(RS.ID, "connected"); private static final BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY = new BakedModelOverrideRegistry(); @@ -96,10 +96,10 @@ public final class ClientSetup { // ItemProperties isn't thread safe e.enqueueWork(() -> { - ItemProperties.register(RSItems.SECURITY_CARD.get(), new ResourceLocation("active"), new SecurityCardItemPropertyGetter()); + ItemProperties.register(RSItems.SECURITY_CARD.get(), new ResourceLocation(RS.ID, "active"), new SecurityCardItemPropertyGetter()); - RSItems.CONTROLLER.values().forEach(controller -> ItemProperties.register(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); - RSItems.CREATIVE_CONTROLLER.values().forEach(controller -> ItemProperties.register(controller.get(), new ResourceLocation("energy_type"), new ControllerItemPropertyGetter())); + RSItems.CONTROLLER.values().forEach(controller -> ItemProperties.register(controller.get(), new ResourceLocation(RS.ID, "energy_type"), new ControllerItemPropertyGetter())); + RSItems.CREATIVE_CONTROLLER.values().forEach(controller -> ItemProperties.register(controller.get(), new ResourceLocation(RS.ID, "energy_type"), new ControllerItemPropertyGetter())); ItemProperties.register(RSItems.WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); ItemProperties.register(RSItems.CREATIVE_WIRELESS_CRAFTING_MONITOR.get(), CONNECTED, new NetworkItemPropertyGetter()); diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_crafting_monitor.json b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_crafting_monitor.json index 6c3d31f1b..a1f687f8b 100644 --- a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_crafting_monitor.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_crafting_monitor_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_crafting_monitor_connected" } diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_fluid_grid.json b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_fluid_grid.json index 8fce21f78..cd4890a76 100644 --- a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_fluid_grid.json +++ b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_fluid_grid.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_fluid_grid_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_fluid_grid_connected" } diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json index a5f147c18..dba825f60 100644 --- a/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json +++ b/src/main/resources/assets/refinedstorage/models/item/creative_wireless_grid.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_grid_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_grid_connected" } diff --git a/src/main/resources/assets/refinedstorage/models/item/security_card.json b/src/main/resources/assets/refinedstorage/models/item/security_card.json index fd77a4a27..33d62782a 100755 --- a/src/main/resources/assets/refinedstorage/models/item/security_card.json +++ b/src/main/resources/assets/refinedstorage/models/item/security_card.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "active": 0 + "refinedstorage:active": 0 }, "model": "refinedstorage:item/security_card_inactive" }, { "predicate": { - "active": 1 + "refinedstorage:active": 1 }, "model": "refinedstorage:item/security_card_active" } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_crafting_monitor.json b/src/main/resources/assets/refinedstorage/models/item/wireless_crafting_monitor.json index 6c3d31f1b..a1f687f8b 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_crafting_monitor.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_crafting_monitor_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_crafting_monitor_connected" } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_fluid_grid.json b/src/main/resources/assets/refinedstorage/models/item/wireless_fluid_grid.json index 8fce21f78..cd4890a76 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_fluid_grid.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_fluid_grid.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_fluid_grid_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_fluid_grid_connected" } diff --git a/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json b/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json index a5f147c18..dba825f60 100755 --- a/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json +++ b/src/main/resources/assets/refinedstorage/models/item/wireless_grid.json @@ -6,13 +6,13 @@ "overrides": [ { "predicate": { - "connected": 0 + "refinedstorage:connected": 0 }, "model": "refinedstorage:item/wireless_grid_disconnected" }, { "predicate": { - "connected": 1 + "refinedstorage:connected": 1 }, "model": "refinedstorage:item/wireless_grid_connected" }