diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json index 80004eb11..356637f64 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/adapter.json @@ -1,10 +1,9 @@ [{ - "ignoreInventoryContents": true, + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:node", "oc:adapter.blocks" ] } diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json index ef0a0bd1f..371e59352 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/assembler.json @@ -1,10 +1,9 @@ [{ - "ignoreInventoryContents": true, + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:node", "oc:remaining" ] } diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/cable.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/cable.json index 48ba941c5..2a5da92da 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/cable.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/cable.json @@ -1,7 +1,3 @@ [{ - "nbt": { - "blacklist": [ - "oc:node" - ] - } + "includes": ["traits/environment.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/capacitor.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/capacitor.json index 48ba941c5..2a5da92da 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/capacitor.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/capacitor.json @@ -1,7 +1,3 @@ [{ - "nbt": { - "blacklist": [ - "oc:node" - ] - } + "includes": ["traits/environment.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json new file mode 100644 index 000000000..e09a365c5 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case.json @@ -0,0 +1,7 @@ +[{ + "includes": ["traits/computer.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"] +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case1.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case1.json index caed68163..5236537c8 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case1.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case1.json @@ -1,16 +1,3 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:computer" - ] - } + "includes": ["case.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case2.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case2.json index caed68163..5236537c8 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case2.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case2.json @@ -1,16 +1,3 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:computer" - ] - } + "includes": ["case.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case3.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case3.json index caed68163..5236537c8 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/case3.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/case3.json @@ -1,16 +1,3 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:computer" - ] - } + "includes": ["case.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/caseCreative.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/caseCreative.json index caed68163..5236537c8 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/caseCreative.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/caseCreative.json @@ -1,16 +1,3 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:computer" - ] - } + "includes": ["case.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json index 012e1de60..8368f3009 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/charger.json @@ -1,17 +1,14 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:node", - "invertSignal", "hasPower", "chargeSpeed" + "chargeSpeed", + "hasPower", + "invertSignal" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json index 83ea43e6a..7fbfa7ea2 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/disassembler.json @@ -1,11 +1,12 @@ [{ - "ignoreInventoryContents": true, + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:node", - "oc:queue", "oc:buffer", "oc:total" + "oc:buffer", + "oc:queue", + "oc:total" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json index 966ffb216..e92595abd 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/diskDrive.json @@ -1,14 +1,5 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:node" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/rotatable.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/geolyzer.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/geolyzer.json index 48ba941c5..2a5da92da 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/geolyzer.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/geolyzer.json @@ -1,7 +1,3 @@ [{ - "nbt": { - "blacklist": [ - "oc:node" - ] - } + "includes": ["traits/environment.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json index 67325f4ad..1f7a6c392 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram.json @@ -1,13 +1,5 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:node", - "chunkX", "chunkZ", "dimension" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/externalData.json"], + "includes": ["traits/rotatable.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram1.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram1.json new file mode 100644 index 000000000..e7bedbd90 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram1.json @@ -0,0 +1,3 @@ +[{ + "includes": ["hologram.json"] +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram2.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram2.json new file mode 100644 index 000000000..e7bedbd90 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/hologram2.json @@ -0,0 +1,3 @@ +[{ + "includes": ["hologram.json"] +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/keyboard.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/keyboard.json index 902f434bd..a1a9760b2 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/keyboard.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/keyboard.json @@ -1,9 +1,5 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, + "includes": ["traits/rotatable.json"], "nbt": { "blacklist": [ "oc:keyboard" diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json index 6c8aafa28..1c8006734 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/microcontroller.json @@ -1,18 +1,16 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, + "includes": ["traits/computer.json"], + "includes": ["traits/hub.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:plugs", "oc:queue", - "oc:computer", - "oc:info", "oc:snooper", "oc:componentNodes", "oc:outputs" + "oc:info", + "oc:snooper", + "oc:componentNodes", + "oc:outputs" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/motionSensor.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/motionSensor.json index 48ba941c5..2a5da92da 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/motionSensor.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/motionSensor.json @@ -1,7 +1,3 @@ [{ - "nbt": { - "blacklist": [ - "oc:node" - ] - } + "includes": ["traits/environment.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json index 3b2ef93c3..3fb163c7b 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/netSplitter.json @@ -1,13 +1,5 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:rs.input", "oc:rs.output", - "oc:node" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json index 1ed975b68..5a0fba8d9 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/powerConverter.json @@ -1,8 +1,4 @@ [{ - "nbt": { - "blacklist": [ - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:node" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/powerAcceptor.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json index 4176ec767..cbcd5dbdd 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/printer.json @@ -1,11 +1,14 @@ [{ - "ignoreInventoryContents": true, + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:node", - "oc:amountInk", "oc:amountMaterial", - "oc:active", "oc:remaining", "oc:total", "oc:limit" + "oc:active", + "oc:amountInk", + "oc:amountMaterial", + "oc:limit", + "oc:remaining", + "oc:total" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json index 966ffb216..e92595abd 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/raid.json @@ -1,14 +1,5 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:items", - "oc:node" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/rotatable.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/redstone.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/redstone.json index 23ce129a7..f2be27863 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/redstone.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/redstone.json @@ -1,7 +1,7 @@ [{ + "includes": ["traits/redstone.json"], "nbt": { "blacklist": [ - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", "oc:redstone/node" ] } diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json index eb107b32d..5c12c2094 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/relay.json @@ -1,10 +1,10 @@ [{ - "ignoreInventoryContents": true, + "includes": ["traits/hub.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:plugs", "oc:queue", "oc:componentNodes" + "oc:componentNodes" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json index c495d8088..b3a3a2924 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/robot.json @@ -1,20 +1,22 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, + "includes": ["traits/computer.json"], + "includes": ["traits/environment.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:robot", "oc:node", "oc:computer", - "oc:components", "oc:containers", - "oc:owner", "oc:ownerUuid", - "oc:robotEnergy", "oc:storedEnergy", - "oc:selectedSlot", "oc:selectedTank", - "oc:lightColor", "display" + "display", + "oc:components", + "oc:containers", + "oc:lightColor", + "oc:owner", + "oc:ownerUuid", + "oc:robot", + "oc:robotEnergy", + "oc:selectedSlot", + "oc:selectedTank", + "oc:storedEnergy" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json new file mode 100644 index 000000000..793fdf7fa --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen.json @@ -0,0 +1,12 @@ +[{ + "includes": ["traits/environment.json"], + "includes": ["traits/externalData.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"], + "nbt": { + "blacklist": [ + "oc:hasPower", + "oc:hadRedstoneInput" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen1.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen1.json index 21df168ee..dadd2bf74 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen1.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen1.json @@ -1,15 +1,3 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:rs.input", "oc:rs.output", - "node", - "oc:hasPower", "oc:hadRedstoneInput", - "chunkX", "chunkZ", "dimension" - ] - } + "includes": ["screen.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen2.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen2.json index 21df168ee..dadd2bf74 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen2.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen2.json @@ -1,15 +1,3 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:rs.input", "oc:rs.output", - "node", - "oc:hasPower", "oc:hadRedstoneInput", - "chunkX", "chunkZ", "dimension" - ] - } + "includes": ["screen.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen3.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen3.json index 21df168ee..dadd2bf74 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen3.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/screen3.json @@ -1,15 +1,3 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:rs.input", "oc:rs.output", - "node", - "oc:hasPower", "oc:hadRedstoneInput", - "chunkX", "chunkZ", "dimension" - ] - } + "includes": ["screen.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json index 575b1fc09..bbf6196e6 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/serverRack.json @@ -1,17 +1,13 @@ [{ - "ignoreInventoryContents": true, - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, + "includes": ["traits/hub.json"], + "includes": ["traits/inventory.json"], + "includes": ["traits/powerAcceptor.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"], "nbt": { "blacklist": [ - "oc:items", - "oc:rs.input", "oc:rs.output", "oc:rs.bundledInput", "oc:rs.bundledOutput", "oc:rs.rednetInput", - "oc:ae2power", "oc:ic2power", "oc:ic2cpower", - "oc:plugs", "oc:queue", - "oc:servers", "oc:terminals" + "oc:servers", + "oc:terminals" ] } }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/environment.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/environment.json new file mode 100644 index 000000000..b91cf6986 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/environment.json @@ -0,0 +1,8 @@ +[{ + "nbt": { + "blacklist": [ + "node", + "oc:node" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/externalData.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/externalData.json new file mode 100644 index 000000000..c579dec59 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/externalData.json @@ -0,0 +1,9 @@ +[{ + "nbt": { + "blacklist": [ + "chunkX", + "chunkZ", + "dimension" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/hub.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/hub.json new file mode 100644 index 000000000..6994b8091 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/hub.json @@ -0,0 +1,8 @@ +[{ + "nbt": { + "blacklist": [ + "oc:plugs", + "oc:queue" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/inventory.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/inventory.json new file mode 100644 index 000000000..f16d956de --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/inventory.json @@ -0,0 +1,8 @@ +[{ + "ignoreInventoryContents": true, + "nbt": { + "blacklist": [ + "oc:items" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/powerAcceptor.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/powerAcceptor.json new file mode 100644 index 000000000..7500c660b --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/powerAcceptor.json @@ -0,0 +1,9 @@ +[{ + "nbt": { + "blacklist": [ + "oc:ae2power", + "oc:ic2power", + "oc:ic2cpower" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/redstone.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/redstone.json new file mode 100644 index 000000000..6b2818069 --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/redstone.json @@ -0,0 +1,11 @@ +[{ + "nbt": { + "blacklist": [ + "oc:rs.input", + "oc:rs.output", + "oc:rs.bundledInput", + "oc:rs.bundledOutput", + "oc:rs.rednetInput" + ] + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/rotatable.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/rotatable.json new file mode 100644 index 000000000..2168077cf --- /dev/null +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/traits/rotatable.json @@ -0,0 +1,7 @@ +[{ + "rotation": { + "type": "nbtField", + "tag": "oc:yaw", + "format": "ForgeDirection" + } +}] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/transposer.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/transposer.json index 48ba941c5..2a5da92da 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/transposer.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/transposer.json @@ -1,7 +1,3 @@ [{ - "nbt": { - "blacklist": [ - "oc:node" - ] - } + "includes": ["traits/environment.json"] }] \ No newline at end of file diff --git a/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json b/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json index 3b2ef93c3..3fb163c7b 100644 --- a/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json +++ b/src/main/resources/assets/opencomputers/bcbuilder/blocks/waypoint.json @@ -1,13 +1,5 @@ [{ - "rotation": { - "type": "nbtField", - "tag": "oc:yaw", - "matrix": [2, 5, 3, 4] - }, - "nbt": { - "blacklist": [ - "oc:rs.input", "oc:rs.output", - "oc:node" - ] - } + "includes": ["traits/environment.json"], + "includes": ["traits/redstone.json"], + "includes": ["traits/rotatable.json"] }] \ No newline at end of file