diff --git a/build.gradle b/build.gradle index 4095a0e19..3635612db 100755 --- a/build.gradle +++ b/build.gradle @@ -51,5 +51,9 @@ minecraft { property 'mixin.env.remapRefMap', 'true' property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" } + data { + property 'mixin.env.remapRefMap', 'true' + property 'mixin.env.refMapRemappingFile', "${buildDir}/createSrgToMcp/output.srg" + } } } \ No newline at end of file diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index 3152aa7f3..7ea369eaf 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-03T11:19:34.4889238 Loot Tables +// 1.20.1 2023-11-05T14:19:25.383214243 Loot Tables 24df81614f6b28c4c7e59589d79fd2c929d71727 data/refinedstorage/loot_tables/blocks/black_controller.json aadbec0f79a3fb95d39e866a453cfec0cbbacd36 data/refinedstorage/loot_tables/blocks/black_crafter.json a792eb6ac90ce775052c9c4a1b29bf9551477b5d data/refinedstorage/loot_tables/blocks/black_crafter_manager.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index de34118af..f36e239f5 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-03T11:19:34.5209453 Recipes +// 1.20.1 2023-11-05T14:19:25.387472745 Recipes 1ccdc8b9da42fbc8d8c954215c76634af2d5254e data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_controller.json b4936ab0116ecd65cc2ca1f8342b18d9019d9bf4 data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter.json 6632b2a29739b77ca01b29a33688640d63ba85fb data/refinedstorage/advancements/recipes/misc/coloring_recipes/black_crafter_manager.json diff --git a/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c b/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c index 46cfc689f..a21f9e8f5 100644 --- a/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c +++ b/src/generated/resources/.cache/c52895b732924e707cb6e5ddd1c6b6962039449c @@ -1,2 +1,2 @@ -// 1.20.1 2023-07-03T11:19:34.4768009 Block Entity Type Tags +// 1.20.1 2023-11-05T14:19:25.380203046 Block Entity Type Tags 98555d946827da8ddb7a7c451a1c99f4d0184ad3 data/packingtape/tags/block_entity_type/blacklist/problematic.json diff --git a/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 b/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 index d0ed1eb30..a4d61d098 100644 --- a/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 +++ b/src/generated/resources/.cache/cb654f100e416ac39358630d6623170b9bfdc5d2 @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-03T11:19:34.4829224 Tags for minecraft:item mod id refinedstorage +// 1.20.1 2023-11-05T14:19:25.382491537 Tags for minecraft:item mod id refinedstorage 061bf4c2f3bdd530115615f2b04e55c2602908bd data/refinedstorage/tags/items/controller.json 407a16e5d941c69915f75b135a13e9144cc9c43e data/refinedstorage/tags/items/crafter.json dc1342f1d3e6a4cd8eaaa52429a011c10c6c2d96 data/refinedstorage/tags/items/crafter_manager.json diff --git a/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e index be9c673fa..b5b6040f8 100644 --- a/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e +++ b/src/generated/resources/.cache/f481442ce31db2c3b3dabb5b6d85f9a78568164e @@ -1,5 +1,5 @@ -// 1.20.1 2023-07-03T11:19:34.5471111 Tags for minecraft:block mod id refinedstorage -3f3a0c830f4ddc021ae2c2a36f75311d8df1fb2e data/forge/tags/blocks/relocation_not_supported.json +// 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 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 7c582666b..23714c3c3 100644 --- a/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a +++ b/src/generated/resources/.cache/fd27170b6bf91459ed2598d25721edfeafc82e0a @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-03T11:19:34.5335391 Block States: refinedstorage +// 1.20.1 2023-11-05T14:19:25.392534402 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 @@ -267,7 +267,7 @@ e25236415255c8e84e8425cd5ef5068af2e90bf5 assets/refinedstorage/models/block/cont 719f9943433757fe6d544facfad02cf5c863b128 assets/refinedstorage/models/block/controller/magenta.json ac1cb6e399a675e681a5c32be92cf2bbbabb845e assets/refinedstorage/models/block/controller/nearly_off.json df5ef8ae2db4d693376007210753f08e8ed9aa1f assets/refinedstorage/models/block/controller/nearly_on.json -70e2a0e01172f7da1631c48358986597731f210f assets/refinedstorage/models/block/controller/off.json +649b3ac449fa858abcf8771bc91fe9ce04949989 assets/refinedstorage/models/block/controller/off.json 197c8d6037075f2a32aa361a573a86a93b71d178 assets/refinedstorage/models/block/controller/orange.json b5d54a0751d165ea36f32a545cd0d74cfec96138 assets/refinedstorage/models/block/controller/pink.json f6f6681357c6759a6de3baac9116c45f4027ed0b assets/refinedstorage/models/block/controller/purple.json @@ -278,7 +278,7 @@ a3fc2ae7524e81e7ac41d116f23dfcfe58fcca9a assets/refinedstorage/models/block/craf ca9f47ac28aa1e6779613d426b837526b50ae0e2 assets/refinedstorage/models/block/crafter/blue.json 58a500649c2d2a496f7228b9fa537802baf15a20 assets/refinedstorage/models/block/crafter/brown.json cce737a93507d1eb58d51d2ddac6428c695c6b23 assets/refinedstorage/models/block/crafter/cyan.json -9abba05387aa43ead444a35b3337f87dcf8a07ce assets/refinedstorage/models/block/crafter/disconnected.json +9a012e8377cf60c903a5d42918f3b2bde17539d2 assets/refinedstorage/models/block/crafter/disconnected.json 7c6c30838702c3e43f7c9e62319d2cd486d1498a assets/refinedstorage/models/block/crafter/gray.json c495e9d2fc43e5e6094b4799609961445d391927 assets/refinedstorage/models/block/crafter/green.json 8c493f345d1a6af778087a49cf36588954bb84fe assets/refinedstorage/models/block/crafter/light_blue.json @@ -295,7 +295,7 @@ c1ab462d97a36b71baa6d03b0aefab777377aa80 assets/refinedstorage/models/block/craf 947d1cacb3f457c5f9985961bf9a2cb64392f9c6 assets/refinedstorage/models/block/crafter_manager/blue.json bdf1b91bb479fdc377250a925dd569c222b8b983 assets/refinedstorage/models/block/crafter_manager/brown.json 41746225550b6f965c0bcb2168aef5afa6ac5780 assets/refinedstorage/models/block/crafter_manager/cyan.json -3760e96ab56ce35790deccb0bc0dd5b777d5624a assets/refinedstorage/models/block/crafter_manager/disconnected.json +006345975c1de5fb804ad47027d66730f13676d9 assets/refinedstorage/models/block/crafter_manager/disconnected.json 7470d98e9ed8ab00a4cac8b651d095dbc33a787a assets/refinedstorage/models/block/crafter_manager/gray.json a6b801087e0e0311fa660ae060879aede938bfa0 assets/refinedstorage/models/block/crafter_manager/green.json e6d7a1289f13a29a429db62287ac6c3143a9565a assets/refinedstorage/models/block/crafter_manager/light_blue.json @@ -312,7 +312,7 @@ a65b6a6e90137b5b6d061637daca39cf0230a756 assets/refinedstorage/models/block/craf f1beacefdaf9aae0aaafc5a3c5e865e84173c2d4 assets/refinedstorage/models/block/crafting_grid/blue.json 3f85170b187def3b075ec11982f91775c72ea2bb assets/refinedstorage/models/block/crafting_grid/brown.json e3a6ddbf8c7348f8f0678b7b88d7309c1c2048fb assets/refinedstorage/models/block/crafting_grid/cyan.json -d9bedeb26d136630195de1b309d67f58d771bfb5 assets/refinedstorage/models/block/crafting_grid/disconnected.json +6cc5581bebc7eaa3b6ab156aec032534afa56b89 assets/refinedstorage/models/block/crafting_grid/disconnected.json c483c28bc8d003c214cd9d2c7de40500d9a14a5e assets/refinedstorage/models/block/crafting_grid/gray.json 53c5036ea2fd4bc481bccdcd3f37f4b4a3c0e25f assets/refinedstorage/models/block/crafting_grid/green.json 034ce68bb933818291cc7b28b6c5da5471c16f01 assets/refinedstorage/models/block/crafting_grid/light_blue.json @@ -329,7 +329,7 @@ e40a7af2d99a7ff0847a13865339fa00a3ebc439 assets/refinedstorage/models/block/craf 52a2c625eb84f7586bdb98d8f709ffb3c17e4ee9 assets/refinedstorage/models/block/crafting_monitor/blue.json 9c8ceeee7c2dc1512e23d3798c51fa75387d411c assets/refinedstorage/models/block/crafting_monitor/brown.json 1d071a43fa223ffd8261704132df37b8ee916a1d assets/refinedstorage/models/block/crafting_monitor/cyan.json -185e19d54b212f6736caa383bfe0337f79439992 assets/refinedstorage/models/block/crafting_monitor/disconnected.json +8cc27a1d4bf9f12010581454f1d78aa1d982b3ac assets/refinedstorage/models/block/crafting_monitor/disconnected.json 1e2f04d1521c27e31f06940684c1ca7306fa3524 assets/refinedstorage/models/block/crafting_monitor/gray.json ddf85353932580ced34a09ce5cd5fc121828e90d assets/refinedstorage/models/block/crafting_monitor/green.json a161a5fa71b287a0eb7ff801458ad5c76a55a7c5 assets/refinedstorage/models/block/crafting_monitor/light_blue.json @@ -352,7 +352,7 @@ c735ce9091c7a5ab2eb0c7b162af77c2ffac2ad8 assets/refinedstorage/models/block/dete b462ca74227c62a9e8567ab7461f45e5e95425d8 assets/refinedstorage/models/block/detector/light_gray.json 4f52368581621adf1d799660c42f108207217575 assets/refinedstorage/models/block/detector/lime.json 170d5328b3f1d9c05c2f6af3191a42d734e89e2b assets/refinedstorage/models/block/detector/magenta.json -d571bd12d733c62c3b7e28e6adbf44990429414e assets/refinedstorage/models/block/detector/off.json +f50f9956dc7bdd3cac13a6473a45906050667a78 assets/refinedstorage/models/block/detector/off.json 2c735eca8fcf7770558758a49f7f8ea469225897 assets/refinedstorage/models/block/detector/orange.json d795e18038baa420972781d7206c1809c7297ae8 assets/refinedstorage/models/block/detector/pink.json 0fe0d9e192b473fdb4cc8a5844ca44de22364e43 assets/refinedstorage/models/block/detector/purple.json @@ -363,7 +363,7 @@ bb3725144c25a75f4e0e0a47e7efd174b7211261 assets/refinedstorage/models/block/dete 08feb52f08c96567bbdc6cd0ab9f289748c3bd1c assets/refinedstorage/models/block/disk_manipulator/blue.json 5050a32ef1afdb15f31f169d257596a29cf0e46d assets/refinedstorage/models/block/disk_manipulator/brown.json 9900ae5b9004204fea75cad20e4b18a6d8d3ec37 assets/refinedstorage/models/block/disk_manipulator/cyan.json -2621bf9ea6ba66ebeb9eb3130c9a58b5858c8f78 assets/refinedstorage/models/block/disk_manipulator/disconnected.json +46b21908098b41f5a6a4229d941dd4732ef1dd76 assets/refinedstorage/models/block/disk_manipulator/disconnected.json 8f78635bbb9015e9b3c710418adec9b96570b133 assets/refinedstorage/models/block/disk_manipulator/gray.json 588bb56e49677311063aa0eee9ebbb864e528fc0 assets/refinedstorage/models/block/disk_manipulator/green.json 46677b54fec1f540a8d63e8037bbf164f755b995 assets/refinedstorage/models/block/disk_manipulator/light_blue.json @@ -381,7 +381,7 @@ d7c7712fe9dc02e0bde2ed57f5e886698b5d1d65 assets/refinedstorage/models/block/disk 2cc6db45ec512f617d3dfc74e56c812700e8c9be assets/refinedstorage/models/block/fluid_grid/blue.json 043ee02c82d506d6f5024246fafdf467bcba50f4 assets/refinedstorage/models/block/fluid_grid/brown.json 92c6f3c28c41f179c507434f9e13c41fb6713942 assets/refinedstorage/models/block/fluid_grid/cyan.json -0cbd7a5d7692ef3a031960eccc58307cf15d887d assets/refinedstorage/models/block/fluid_grid/disconnected.json +8715a94eb3b672cf941e471c5883cc9ddebff362 assets/refinedstorage/models/block/fluid_grid/disconnected.json 328db8a51dac5c943b005dd8178f70de0e69b03d assets/refinedstorage/models/block/fluid_grid/gray.json 3a012b462e69bdca95c5bb3e030d8dea2d438539 assets/refinedstorage/models/block/fluid_grid/green.json 7f05d7725b608fdb70ba2ae4c6ade712912b5d30 assets/refinedstorage/models/block/fluid_grid/light_blue.json @@ -398,7 +398,7 @@ e845c4a37c72d5ad426fac7203353a9665648a46 assets/refinedstorage/models/block/grid 589f51309dbecb1964c070a70496b79ae1c4ebcb assets/refinedstorage/models/block/grid/blue.json 437076a560cbafb39c685b88e6fd2073c7c158d0 assets/refinedstorage/models/block/grid/brown.json 49f3eb8374ee309b81f9242bd048f66421eaa75e assets/refinedstorage/models/block/grid/cyan.json -b85adb5c23340beb39809692ae600bae8a8fbd97 assets/refinedstorage/models/block/grid/disconnected.json +97d78c65ba856ead9ff344625e37ed4f6f880516 assets/refinedstorage/models/block/grid/disconnected.json 3ad1130e18a706495810f1cc32e2658b4910607a assets/refinedstorage/models/block/grid/gray.json 83b393342de4c5aee81c50715479ec78efb21667 assets/refinedstorage/models/block/grid/green.json 3fb70b9aba3dbe38bc0279f1b2789695f8e0a784 assets/refinedstorage/models/block/grid/light_blue.json @@ -415,7 +415,7 @@ b6ad5c9d362ca9c4cbb5727be2a3ea38f03e0a64 assets/refinedstorage/models/block/grid 521b606adc714ae111325cfb4b86c2f00fc49838 assets/refinedstorage/models/block/network_receiver/blue.json e988e5bf8a325e3ed5e80e5615e8d5b337e92892 assets/refinedstorage/models/block/network_receiver/brown.json 9feb023af7e1f64c0586fcaa67059743deb3da04 assets/refinedstorage/models/block/network_receiver/cyan.json -1ab3271c61288c831ec53f64d025a34c1805d87b assets/refinedstorage/models/block/network_receiver/disconnected.json +978191a2fcbf46cfd70fe9e4bfa564a3b1b89336 assets/refinedstorage/models/block/network_receiver/disconnected.json 44587865547f9c2e58421ea0a880ff51cf8b8fbf assets/refinedstorage/models/block/network_receiver/gray.json 180555a0b56ddbe2def2b86d44ad8d8747bffbea assets/refinedstorage/models/block/network_receiver/green.json cd3a8952d2246b8ae436f6b6b66ee7f7f3f51fa7 assets/refinedstorage/models/block/network_receiver/light_blue.json @@ -432,7 +432,7 @@ c17ae790076c791a6f51b86f307c71452a47e5b9 assets/refinedstorage/models/block/netw c4e1615846d83ab4c806b6b24373be722261d1f3 assets/refinedstorage/models/block/network_transmitter/blue.json 0f59245da158e77b1cf84cfab5164eeb8814384d assets/refinedstorage/models/block/network_transmitter/brown.json d1dd664110221c97fe2d22a111800cd2b6df6982 assets/refinedstorage/models/block/network_transmitter/cyan.json -90f410054ba60b9f9b4cc7212cefb0ec54b8d0db assets/refinedstorage/models/block/network_transmitter/disconnected.json +7fad44f8c99b39fa763f603e3f30fa67abebd566 assets/refinedstorage/models/block/network_transmitter/disconnected.json 8d516cc91c6e1bd3fb8e2eee31e268bf10b590df assets/refinedstorage/models/block/network_transmitter/gray.json ce9afe78c7f30a826630135797ca4c90f7cccbb8 assets/refinedstorage/models/block/network_transmitter/green.json 3a230a4a14c2151ac1de52072514b622a4fac746 assets/refinedstorage/models/block/network_transmitter/light_blue.json @@ -449,7 +449,7 @@ ef2ca4a218be25d42a994a308d3a684f82aeb3e8 assets/refinedstorage/models/block/netw 09d8500c01a62a454e8e1a817a82e1ad19deace2 assets/refinedstorage/models/block/pattern_grid/blue.json 50406c5a5a65c0d46e91ef389cd3fd23a2b2599b assets/refinedstorage/models/block/pattern_grid/brown.json 6ce91be1821a684898a59d3a8cfbe13ba4f6b707 assets/refinedstorage/models/block/pattern_grid/cyan.json -d06e4411da2bf8312b42cfefc1830610befa8bfd assets/refinedstorage/models/block/pattern_grid/disconnected.json +1dfe91631ef1f12dcecc7e0e45ec7f5e9aeb53f0 assets/refinedstorage/models/block/pattern_grid/disconnected.json 3257be294252ab0a567fc96486e30b028ba6009d assets/refinedstorage/models/block/pattern_grid/gray.json b0713d7de5cd75e371bc83e9abd33e842702f1cc assets/refinedstorage/models/block/pattern_grid/green.json 5412d15ff025c0ba4bf04e74cbecb765932cb697 assets/refinedstorage/models/block/pattern_grid/light_blue.json @@ -466,7 +466,7 @@ e6b978a202ab3b7096443862fc70418fab92d528 assets/refinedstorage/models/block/patt 3918e0f6307e76c72f112b9e5a26977e4b32bb1a assets/refinedstorage/models/block/relay/blue.json 2e79077645de1d34de0d3f01102d5242a577440d assets/refinedstorage/models/block/relay/brown.json a683b28b4b41949b663208e28c393746419e5f1f assets/refinedstorage/models/block/relay/cyan.json -d27657d53a4ea85f6c28d11f82d08015af9ef0e2 assets/refinedstorage/models/block/relay/disconnected.json +b66ed29783c7a24a7112af3d58cfb903d14535bd assets/refinedstorage/models/block/relay/disconnected.json 9705e6e41a83a5349f74e4478284f6fe8b63a6dd assets/refinedstorage/models/block/relay/gray.json 2d21af4bfa0fade473addf82032db9e3187af096 assets/refinedstorage/models/block/relay/green.json f53061187c76cce0787d11c6b800745dfd48b36a assets/refinedstorage/models/block/relay/light_blue.json @@ -483,7 +483,7 @@ d6e52eb671800d61b5565e502f395f91c5b650a0 assets/refinedstorage/models/block/rela e6dcfb1bfa2cd2ce4f3d3dc2aae7da3ad344bbda assets/refinedstorage/models/block/security_manager/blue.json cacca03ecf0de2bce557ca841401033c45cf4cc1 assets/refinedstorage/models/block/security_manager/brown.json e241938c7d93a4fc12a09fa9a1ee847d129e92b9 assets/refinedstorage/models/block/security_manager/cyan.json -101c60b99c9c532a248ed15adb59f64ec4bcd186 assets/refinedstorage/models/block/security_manager/disconnected.json +c47c799fca836d8d3ee2022acd5347c3e84836f1 assets/refinedstorage/models/block/security_manager/disconnected.json 5fcb0264b7cc0d4132cf9f18deafa366c6066f53 assets/refinedstorage/models/block/security_manager/gray.json 871b6c7a028d339a551e10d432a936e316f7910e assets/refinedstorage/models/block/security_manager/green.json f068112ed910080dfc74f2309228f2d5c41ea1b6 assets/refinedstorage/models/block/security_manager/light_blue.json @@ -500,7 +500,7 @@ a865ead60de383ea8e84c5c16ffdcc2fcbd2791a assets/refinedstorage/models/block/secu f338756587a7c6bce14677030543f7399aee9259 assets/refinedstorage/models/block/wireless_transmitter/blue.json 667bad1eaa409dbd56bb9db7048a029a610dc5c0 assets/refinedstorage/models/block/wireless_transmitter/brown.json eeb75332e2a0a9a10b1f5d47b8621340c3913877 assets/refinedstorage/models/block/wireless_transmitter/cyan.json -ca0a18305f47bf6b1e01014b9c557cefbd2873af assets/refinedstorage/models/block/wireless_transmitter/disconnected.json +7d8cdce240042937a7a9ad14390f02f978e3b38f assets/refinedstorage/models/block/wireless_transmitter/disconnected.json 732c1094b53f66b96e04630b2e3549f1ae3f3d3e assets/refinedstorage/models/block/wireless_transmitter/gray.json 2cb3ccf208c6144c461f8b6d05e45360f88e31f1 assets/refinedstorage/models/block/wireless_transmitter/green.json f0c6cd01aa8af1558c43033433096942fdda103e assets/refinedstorage/models/block/wireless_transmitter/light_blue.json diff --git a/src/generated/resources/assets/refinedstorage/models/block/controller/off.json b/src/generated/resources/assets/refinedstorage/models/block/controller/off.json index 2aaf85f05..3aff0b9a1 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/controller/off.json +++ b/src/generated/resources/assets/refinedstorage/models/block/controller/off.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_all_cutout", + "parent": "refinedstorage:block/cube_all_cutout_nonemissive", "textures": { "all": "refinedstorage:block/controller/off", "cutout": "refinedstorage:block/controller/cutouts/off", diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json index d15472b3b..58a52d159 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_cutout", + "parent": "refinedstorage:block/cube_cutout_nonemissive", "textures": { "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/crafter/cutouts/side_disconnected", diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json index 7794045c7..d32f65a71 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafter_manager/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/crafter_manager/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json index 8378dd852..f84890b12 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_grid/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/crafting_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json index ad88be609..17be00f50 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/crafting_monitor/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/crafting_monitor/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/detector/off.json b/src/generated/resources/assets/refinedstorage/models/block/detector/off.json index 3eb956b11..641f83ebe 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/detector/off.json +++ b/src/generated/resources/assets/refinedstorage/models/block/detector/off.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/detector", + "parent": "refinedstorage:block/detector_nonemissive", "textures": { "torch": "refinedstorage:block/detector/cutouts/off" } diff --git a/src/generated/resources/assets/refinedstorage/models/block/disk_manipulator/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/disk_manipulator/disconnected.json index eb028766e..7bfb147f4 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/disk_manipulator/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/disk_manipulator/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/disk_manipulator/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json index 6bbd50a69..abdc69046 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/fluid_grid/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/fluid_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json index 3f5a5e069..8fdc6e15a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/grid/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json index d2a6a5743..bba41f11c 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_receiver/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_all_cutout", + "parent": "refinedstorage:block/cube_all_cutout_nonemissive", "textures": { "all": "refinedstorage:block/network_receiver/network_receiver", "cutout": "refinedstorage:block/network_receiver/cutouts/disconnected", diff --git a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json index afe1c92ca..c3eb9aae8 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/network_transmitter/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_all_cutout", + "parent": "refinedstorage:block/cube_all_cutout_nonemissive", "textures": { "all": "refinedstorage:block/network_transmitter/network_transmitter", "cutout": "refinedstorage:block/network_transmitter/cutouts/disconnected", diff --git a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json index 4a0435908..258441a01 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/pattern_grid/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_north_cutout", + "parent": "refinedstorage:block/cube_north_cutout_nonemissive", "textures": { "cutout": "refinedstorage:block/pattern_grid/cutouts/disconnected", "down": "refinedstorage:block/bottom", diff --git a/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json index 0e414bfbf..bdf5dc10f 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/relay/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_all_cutout", + "parent": "refinedstorage:block/cube_all_cutout_nonemissive", "textures": { "all": "refinedstorage:block/relay/relay", "cutout": "refinedstorage:block/relay/cutouts/disconnected", diff --git a/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json index e47c5ef9b..ea45c7c2e 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/security_manager/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/cube_cutout", + "parent": "refinedstorage:block/cube_cutout_nonemissive", "textures": { "cutout_down": "refinedstorage:block/bottom", "cutout_east": "refinedstorage:block/security_manager/cutouts/right_disconnected", diff --git a/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/disconnected.json b/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/disconnected.json index 0bb7ace34..b1541db7a 100644 --- a/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/disconnected.json +++ b/src/generated/resources/assets/refinedstorage/models/block/wireless_transmitter/disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/wireless_transmitter", + "parent": "refinedstorage:block/wireless_transmitter_nonemissive", "textures": { "cutout": "refinedstorage:block/wireless_transmitter/cutouts/disconnected" } 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 2157aa497..d230f6c51 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:pattern_grid", + "#refinedstorage:disk_manipulator", + "#refinedstorage:creative_controller", + "#refinedstorage:wireless_transmitter", + "#refinedstorage:controller", "#refinedstorage:network_transmitter", "#refinedstorage:security_manager", - "#refinedstorage:creative_controller", - "#refinedstorage:fluid_grid", - "#refinedstorage:crafter", - "#refinedstorage:grid", - "#refinedstorage:wireless_transmitter", - "#refinedstorage:detector", - "#refinedstorage:crafting_monitor", - "#refinedstorage:controller", - "#refinedstorage:network_receiver", - "#refinedstorage:relay", "#refinedstorage:crafter_manager", + "#refinedstorage:grid", + "#refinedstorage:crafter", "#refinedstorage:crafting_grid", - "#refinedstorage:disk_manipulator", + "#refinedstorage:pattern_grid", + "#refinedstorage:crafting_monitor", + "#refinedstorage:relay", + "#refinedstorage:detector", + "#refinedstorage:fluid_grid", + "#refinedstorage:network_receiver", "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 2c30ca820..05fd52a44 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModelGenerator.java @@ -51,14 +51,14 @@ public class BlockModelGenerator extends BlockStateProvider { models.wirelessTransmitterBlock(block, state -> { if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { - return models.createWirelessTransmitterModel( - "block/" + folderName + "/disconnected", - resourceLocation(folderName, "cutouts/disconnected") + return models.createWirelessTransmitterNonEmissiveModel( + "block/" + folderName + "/disconnected", + resourceLocation(folderName, "cutouts/disconnected") ); } else { ModelFile model = models.createWirelessTransmitterModel( - "block/" + folderName + "/" + color, - resourceLocation(folderName, "cutouts/" + color) + "block/" + folderName + "/" + color, + resourceLocation(folderName, "cutouts/" + color) ); simpleBlockItem(block, model); @@ -75,14 +75,14 @@ public class BlockModelGenerator extends BlockStateProvider { models.simpleBlockStateModel(block, state -> { if (Boolean.FALSE.equals(state.getValue(DetectorBlock.POWERED))) { - return models.createDetectorModel( - "block/" + folderName + "/off", - resourceLocation(folderName, "cutouts/off") + return models.createDetectorNonEmissiveModel( + "block/" + folderName + "/off", + resourceLocation(folderName, "cutouts/off") ); } else { ModelFile model = models.createDetectorModel( - "block/" + folderName + "/" + color, - resourceLocation(folderName, "cutouts/" + color) + "block/" + folderName + "/" + color, + resourceLocation(folderName, "cutouts/" + color) ); simpleBlockItem(block, model); @@ -99,36 +99,36 @@ public class BlockModelGenerator extends BlockStateProvider { models.horizontalRSBlock(block, state -> { if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { - return models.createCubeCutoutModel( - "block/" + folderName + "/disconnected", - BOTTOM, - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "cutouts/top_disconnected"), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "cutouts/right_disconnected"), - resourceLocation(folderName, "left"), - resourceLocation(folderName, "cutouts/left_disconnected"), - resourceLocation(folderName, "front"), - resourceLocation(folderName, "cutouts/front_disconnected"), - resourceLocation(folderName, "back"), - resourceLocation(folderName, "cutouts/back_disconnected") + return models.createCubeCutoutNonEmissiveModel( + "block/" + folderName + "/disconnected", + BOTTOM, + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "cutouts/top_disconnected"), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "cutouts/right_disconnected"), + resourceLocation(folderName, "left"), + resourceLocation(folderName, "cutouts/left_disconnected"), + resourceLocation(folderName, "front"), + resourceLocation(folderName, "cutouts/front_disconnected"), + resourceLocation(folderName, "back"), + resourceLocation(folderName, "cutouts/back_disconnected") ); } else { ModelFile model = models.createCubeCutoutModel( - "block/" + folderName + "/" + color, - BOTTOM, - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "cutouts/top" + "_" + color), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "cutouts/right" + "_" + color), - resourceLocation(folderName, "left"), - resourceLocation(folderName, "cutouts/left" + "_" + color), - resourceLocation(folderName, "front"), - resourceLocation(folderName, "cutouts/front" + "_" + color), - resourceLocation(folderName, "back"), - resourceLocation(folderName, "cutouts/back" + "_" + color) + "block/" + folderName + "/" + color, + BOTTOM, + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "cutouts/top" + "_" + color), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "cutouts/right" + "_" + color), + resourceLocation(folderName, "left"), + resourceLocation(folderName, "cutouts/left" + "_" + color), + resourceLocation(folderName, "front"), + resourceLocation(folderName, "cutouts/front" + "_" + color), + resourceLocation(folderName, "back"), + resourceLocation(folderName, "cutouts/back" + "_" + color) ); simpleBlockItem(block, model); @@ -145,18 +145,18 @@ public class BlockModelGenerator extends BlockStateProvider { models.simpleBlockStateModel(block, state -> { if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { - return models.createCubeAllCutoutModel( - "block/" + folderName + "/disconnected", - resourceLocation(folderName, folderName), - resourceLocation(folderName, folderName), - resourceLocation(folderName, "cutouts/disconnected") + return models.createCubeAllCutoutNonEmissiveModel( + "block/" + folderName + "/disconnected", + resourceLocation(folderName, folderName), + resourceLocation(folderName, folderName), + resourceLocation(folderName, "cutouts/disconnected") ); } else { ModelFile model = models.createCubeAllCutoutModel( - "block/" + folderName + "/" + color, - resourceLocation(folderName, folderName), - resourceLocation(folderName, folderName), - resourceLocation(folderName, "cutouts/" + color) + "block/" + folderName + "/" + color, + resourceLocation(folderName, folderName), + resourceLocation(folderName, folderName), + resourceLocation(folderName, "cutouts/" + color) ); simpleBlockItem(block, model); @@ -173,36 +173,36 @@ public class BlockModelGenerator extends BlockStateProvider { models.anyDirectionalRSBlock(block, state -> { if (Boolean.FALSE.equals(state.getValue(NetworkNodeBlock.CONNECTED))) { - return models.createCubeCutoutModel( - "block/" + folderName + "/disconnected", - BOTTOM, - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "cutouts/top_disconnected"), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_disconnected"), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_disconnected"), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_disconnected"), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_disconnected") + return models.createCubeCutoutNonEmissiveModel( + "block/" + folderName + "/disconnected", + BOTTOM, + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "cutouts/top_disconnected"), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_disconnected"), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_disconnected"), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_disconnected"), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_disconnected") ); } else { ModelFile model = models.createCubeCutoutModel( - "block/" + folderName + "/" + color, - BOTTOM, - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "cutouts/top_" + color), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_" + color), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_" + color), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_" + color), - resourceLocation(folderName, "side"), - resourceLocation(folderName, "cutouts/side_" + color) + "block/" + folderName + "/" + color, + BOTTOM, + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "cutouts/top_" + color), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_" + color), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_" + color), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_" + color), + resourceLocation(folderName, "side"), + resourceLocation(folderName, "cutouts/side_" + color) ); simpleBlockItem(block, model); @@ -219,34 +219,34 @@ public class BlockModelGenerator extends BlockStateProvider { models.simpleBlockStateModel(block, state -> { if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.OFF)) { - return models.createCubeAllCutoutModel( - "block/" + folderName + "/off", - resourceLocation(folderName, "off"), - resourceLocation(folderName, "off"), - resourceLocation(folderName, "cutouts/off") + return models.createCubeAllCutoutNonEmissiveModel( + "block/" + folderName + "/off", + resourceLocation(folderName, "off"), + resourceLocation(folderName, "off"), + resourceLocation(folderName, "cutouts/off") ); } else if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_OFF)) { return models.createControllerNearlyCutoutModel( - "block/" + folderName + "/nearly_off", - resourceLocation(folderName, "off"), - resourceLocation(folderName, "on"), - resourceLocation(folderName, "cutouts/nearly_off"), - resourceLocation(folderName, "cutouts/nearly_off_gray") + "block/" + folderName + "/nearly_off", + resourceLocation(folderName, "off"), + resourceLocation(folderName, "on"), + resourceLocation(folderName, "cutouts/nearly_off"), + resourceLocation(folderName, "cutouts/nearly_off_gray") ); } else if (state.getValue(ControllerBlock.ENERGY_TYPE).equals(ControllerBlock.EnergyType.NEARLY_ON)) { return models.createControllerNearlyCutoutModel( - "block/" + folderName + "/nearly_on", - resourceLocation(folderName, "off"), - resourceLocation(folderName, "on"), - resourceLocation(folderName, "cutouts/nearly_on"), - resourceLocation(folderName, "cutouts/nearly_on_gray") + "block/" + folderName + "/nearly_on", + resourceLocation(folderName, "off"), + resourceLocation(folderName, "on"), + resourceLocation(folderName, "cutouts/nearly_on"), + resourceLocation(folderName, "cutouts/nearly_on_gray") ); } else { ModelFile model = models.createCubeAllCutoutModel( - "block/" + folderName + "/" + color, - resourceLocation(folderName, "off"), - resourceLocation(folderName, "on"), - resourceLocation(folderName, "cutouts/" + color) + "block/" + folderName + "/" + color, + resourceLocation(folderName, "off"), + resourceLocation(folderName, "on"), + resourceLocation(folderName, "cutouts/" + color) ); simpleBlockItem(block, model); @@ -261,27 +261,27 @@ public class BlockModelGenerator extends BlockStateProvider { Block block = registryObject.get(); String folderName = blockMap.get(ColorMap.DEFAULT_COLOR).getId().getPath(); - ModelFile disconnected = models.createCubeNorthCutoutModel( - "block/" + folderName + "/disconnected", - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "front"), - resourceLocation(folderName, "back"), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "left"), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "cutouts/disconnected") + ModelFile disconnected = models.createCubeNorthCutoutNonEmissiveModel( + "block/" + folderName + "/disconnected", + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "front"), + resourceLocation(folderName, "back"), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "left"), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "cutouts/disconnected") ); ModelFile connected = models.createCubeNorthCutoutModel( - "block/" + folderName + "/" + color, - BOTTOM, - resourceLocation(folderName, "top"), - resourceLocation(folderName, "front"), - resourceLocation(folderName, "back"), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "left"), - resourceLocation(folderName, "right"), - resourceLocation(folderName, "cutouts/" + color) + "block/" + folderName + "/" + color, + BOTTOM, + resourceLocation(folderName, "top"), + resourceLocation(folderName, "front"), + resourceLocation(folderName, "back"), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "left"), + resourceLocation(folderName, "right"), + resourceLocation(folderName, "cutouts/" + color) ); //generate Item Model diff --git a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java index 9a6d11f45..0a810a673 100644 --- a/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java +++ b/src/main/java/com/refinedmods/refinedstorage/datageneration/BlockModels.java @@ -89,11 +89,21 @@ public class BlockModels { .texture("torch", torch); } + public BlockModelBuilder createDetectorNonEmissiveModel(String name, ResourceLocation torch) { + return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "detector_nonemissive")) + .texture("torch", torch); + } + public BlockModelBuilder createWirelessTransmitterModel(String name, ResourceLocation cutout) { return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "wireless_transmitter")) .texture("cutout", cutout); } + public BlockModelBuilder createWirelessTransmitterNonEmissiveModel(String name, ResourceLocation cutout) { + return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "wireless_transmitter_nonemissive")) + .texture("cutout", cutout); + } + public BlockModelBuilder createCubeCutoutModel(String name, ResourceLocation down, ResourceLocation downCutout, ResourceLocation up, ResourceLocation upCutout, ResourceLocation east, ResourceLocation eastCutout, ResourceLocation west, ResourceLocation westCutout, ResourceLocation north, ResourceLocation northCutout, ResourceLocation south, ResourceLocation southCutout) { return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "cube_cutout")) .texture("particle", north) @@ -111,6 +121,23 @@ public class BlockModels { .texture("cutout_up", upCutout); } + public BlockModelBuilder createCubeCutoutNonEmissiveModel(String name, ResourceLocation down, ResourceLocation downCutout, ResourceLocation up, ResourceLocation upCutout, ResourceLocation east, ResourceLocation eastCutout, ResourceLocation west, ResourceLocation westCutout, ResourceLocation north, ResourceLocation northCutout, ResourceLocation south, ResourceLocation southCutout) { + return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "cube_cutout_nonemissive")) + .texture("particle", north) + .texture("east", east) + .texture("south", south) + .texture("west", west) + .texture("up", up) + .texture("down", down) + .texture("north", north) + .texture("cutout_down", downCutout) + .texture("cutout_east", eastCutout) + .texture("cutout_west", westCutout) + .texture("cutout_south", southCutout) + .texture("cutout_north", northCutout) + .texture("cutout_up", upCutout); + } + public BlockModelBuilder createControllerNearlyCutoutModel(String name, ResourceLocation particle, ResourceLocation all, ResourceLocation grayCutout, ResourceLocation cutout) { return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "block/controller_nearly")) .texture("particle", particle) @@ -126,6 +153,13 @@ public class BlockModels { .texture("cutout", cutout); } + public BlockModelBuilder createCubeAllCutoutNonEmissiveModel(String name, ResourceLocation particle, ResourceLocation all, ResourceLocation cutout) { + return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "cube_all_cutout_nonemissive")) + .texture("particle", particle) + .texture("all", all) + .texture("cutout", cutout); + } + public BlockModelBuilder createCubeNorthCutoutModel(String name, ResourceLocation down, ResourceLocation up, ResourceLocation north, ResourceLocation south, ResourceLocation east, ResourceLocation west, ResourceLocation particle, ResourceLocation cutout) { return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "cube_north_cutout")) .texture("particle", particle) @@ -138,6 +172,18 @@ public class BlockModels { .texture("cutout", cutout); } + public BlockModelBuilder createCubeNorthCutoutNonEmissiveModel(String name, ResourceLocation down, ResourceLocation up, ResourceLocation north, ResourceLocation south, ResourceLocation east, ResourceLocation west, ResourceLocation particle, ResourceLocation cutout) { + return generator.models().withExistingParent(name, new ResourceLocation(RS.ID, "cube_north_cutout_nonemissive")) + .texture("particle", particle) + .texture("east", east) + .texture("south", south) + .texture("west", west) + .texture("up", up) + .texture("down", down) + .texture("north", north) + .texture("cutout", cutout); + } + class CustomLoaderBuilderBasic extends CustomLoaderBuilder { protected CustomLoaderBuilderBasic(ResourceLocation loaderId, BlockModelBuilder parent, ExistingFileHelper existingFileHelper) { super(loaderId, parent, existingFileHelper); diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_nonemissive.json new file mode 100755 index 000000000..f3e19b2e7 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_nonemissive.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/src/main/resources/assets/refinedstorage/models/block/constructor_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/constructor_disconnected.json index 2b1fdec09..1dcf2b175 100644 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/constructor_destructor", + "parent": "refinedstorage:block/constructor_destructor_nonemissive", "textures": { "front": "refinedstorage:block/constructor/constructor", "cutout": "refinedstorage:block/constructor/cutouts/disconnected" diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout_nonemissive.json new file mode 100644 index 000000000..fa7bdf6d7 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/cube_all_cutout_nonemissive.json @@ -0,0 +1,82 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#all", + "cullface": "down" + }, + "up": { + "texture": "#all", + "cullface": "up" + }, + "north": { + "texture": "#all", + "cullface": "north" + }, + "south": { + "texture": "#all", + "cullface": "south" + }, + "west": { + "texture": "#all", + "cullface": "west" + }, + "east": { + "texture": "#all", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#cutout", + "cullface": "up" + }, + "down": { + "texture": "#cutout", + "cullface": "down" + }, + "north": { + "texture": "#cutout", + "cullface": "north" + }, + "south": { + "texture": "#cutout", + "cullface": "south" + }, + "west": { + "texture": "#cutout", + "cullface": "west" + }, + "east": { + "texture": "#cutout", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_cutout_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/cube_cutout_nonemissive.json new file mode 100644 index 000000000..f6cf9f51a --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/cube_cutout_nonemissive.json @@ -0,0 +1,82 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "up": { + "texture": "#cutout_up", + "cullface": "up" + }, + "down": { + "texture": "#cutout_down", + "cullface": "down" + }, + "north": { + "texture": "#cutout_north", + "cullface": "north" + }, + "south": { + "texture": "#cutout_south", + "cullface": "south" + }, + "west": { + "texture": "#cutout_west", + "cullface": "west" + }, + "east": { + "texture": "#cutout_east", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout_nonemissive.json new file mode 100644 index 000000000..e2c556cf8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/cube_north_cutout_nonemissive.json @@ -0,0 +1,62 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#down", + "cullface": "down" + }, + "up": { + "texture": "#up", + "cullface": "up" + }, + "north": { + "texture": "#north", + "cullface": "north" + }, + "south": { + "texture": "#south", + "cullface": "south" + }, + "west": { + "texture": "#west", + "cullface": "west" + }, + "east": { + "texture": "#east", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "north": { + "texture": "#cutout", + "cullface": "north" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/destructor_disconnected.json b/src/main/resources/assets/refinedstorage/models/block/destructor_disconnected.json index ee6535d82..e62d62ed8 100644 --- a/src/main/resources/assets/refinedstorage/models/block/destructor_disconnected.json +++ b/src/main/resources/assets/refinedstorage/models/block/destructor_disconnected.json @@ -1,5 +1,5 @@ { - "parent": "refinedstorage:block/constructor_destructor", + "parent": "refinedstorage:block/constructor_destructor_nonemissive", "textures": { "front": "refinedstorage:block/destructor/destructor", "cutout": "refinedstorage:block/destructor/cutouts/disconnected" diff --git a/src/main/resources/assets/refinedstorage/models/block/detector_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/detector_nonemissive.json new file mode 100755 index 000000000..ad2cd86fd --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/detector_nonemissive.json @@ -0,0 +1,210 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "textures": { + "side": "refinedstorage:block/detector/side", + "bottom": "refinedstorage:block/detector/bottom", + "top": "refinedstorage:block/detector/top", + "particle": "refinedstorage:block/detector/side" + }, + "elements": [ + { + "name": "Handle", + "from": [ + 7, + 5, + 7 + ], + "to": [ + 9, + 8, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 7, + 7, + 9, + 11 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 7, + 7, + 9, + 11 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 7, + 7, + 9, + 11 + ], + "texture": "#side" + }, + "west": { + "uv": [ + 7, + 7, + 9, + 11 + ], + "texture": "#side" + }, + "up": { + "uv": [ + 7, + 7, + 9, + 9 + ], + "texture": "#side" + } + } + }, + { + "name": "Torch", + "from": [ + 7, + 5, + 6 + ], + "to": [ + 9, + 11, + 10 + ], + "shade": false, + "faces": { + "east": { + "uv": [ + 6, + 4, + 10, + 12 + ], + "texture": "#torch" + }, + "west": { + "uv": [ + 6, + 4, + 10, + 12 + ], + "texture": "#torch" + } + } + }, + { + "name": "Torch", + "from": [ + 6, + 5, + 7 + ], + "to": [ + 10, + 11, + 9 + ], + "shade": false, + "faces": { + "north": { + "uv": [ + 6, + 4, + 10, + 12 + ], + "texture": "#torch" + }, + "south": { + "uv": [ + 6, + 4, + 10, + 12 + ], + "texture": "#torch" + } + } + }, + { + "name": "Base", + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 5, + 16 + ], + "faces": { + "north": { + "uv": [ + 0, + 11, + 16, + 16 + ], + "texture": "#side" + }, + "east": { + "uv": [ + 0, + 11, + 16, + 16 + ], + "texture": "#side" + }, + "south": { + "uv": [ + 0, + 11, + 16, + 16 + ], + "texture": "#side" + }, + "west": { + "uv": [ + 0, + 11, + 16, + 16 + ], + "texture": "#side" + }, + "up": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#top" + }, + "down": { + "uv": [ + 0, + 0, + 16, + 16 + ], + "texture": "#bottom" + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter_nonemissive.json b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter_nonemissive.json new file mode 100644 index 000000000..8704aa8ae --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/wireless_transmitter_nonemissive.json @@ -0,0 +1,209 @@ +{ + "render_type": "cutout", + "parent": "block/cube", + "ambientocclusion": false, + "textures": { + "particle": "refinedstorage:block/wireless_transmitter/wireless_transmitter", + "torch": "refinedstorage:block/wireless_transmitter/wireless_transmitter" + }, + "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