From 3bfb247b2c527581da7d928e6b30919129a25f2f Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 1 Oct 2022 01:34:48 +0600 Subject: [PATCH] Fixed Phantom attractor item display; Added energy servo model; Yet another change in android upgrades texture atals. --- .../mc/otm/datagen/blocks/BlockStates.kt | 1 + .../mc/otm/datagen/items/ItemModels.kt | 3 + .../models/block/energy_servo.json | 359 ++++++++++++++++++ .../models/block/phantom_attractor.json | 38 +- .../textures/block/energy_servo.png | Bin 0 -> 470 bytes .../textures/gui/android_upgrades.png | Bin 2455 -> 2566 bytes 6 files changed, 400 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/energy_servo.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/energy_servo.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index f71ca7326..d7823b621 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -84,6 +84,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.STORAGE_POWER_SUPPLIER) provider.block(MBlocks.MATTER_RECYCLER) + provider.block(MBlocks.ENERGY_SERVO) provider.exec { for (crate in MRegistry.CARGO_CRATES.allBlocks.values) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index adb36d81d..e875bf76b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -81,6 +81,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.generated(MItems.MATTER_DUST) + provider.generated(MItems.TRITANIUM_DOOR) + for (item in MRegistry.CARGO_CRATES.allItems.values) { provider.block(item, "${item.registryName!!.path}_closed") } @@ -90,6 +92,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.MATTER_BOTTLER, "matter_bottler_working") provider.block(MItems.MATTER_CABLE, "matter_cable_core") provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working") + provider.block(MItems.ENERGY_SERVO, "energy_servo") provider.block(MItems.PLATE_PRESS, "plate_press_idle") provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier") diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo.json new file mode 100644 index 000000000..445708bcd --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo.json @@ -0,0 +1,359 @@ +{ + "parent": "block/cube_all", + "render_type": "translucent", + "textures": { + "0": "overdrive_that_matters:block/energy_servo", + "1": "overdrive_that_matters:item/energy_sword_charge", + "particle": "overdrive_that_matters:block/energy_servo" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 11], + "faces": { + "north": {"uv": [0, 0, 8, 2.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 8, 2.5], "texture": "#0"}, + "south": {"uv": [0, 9.25, 8, 11.75], "texture": "#0"}, + "west": {"uv": [8, 0, 13.5, 2.5], "texture": "#0"}, + "up": {"uv": [0, 6.5, 8, 9.25], "texture": "#0"}, + "down": {"uv": [0, 2.5, 8, 5.25], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [4, 10, 0], + "to": [12, 16, 7], + "faces": { + "north": {"uv": [8, 2.5, 12, 4], "texture": "#0"}, + "east": {"uv": [15.5, 2.5, 12, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, + "west": {"uv": [12, 2.5, 15.5, 4], "texture": "#0"}, + "up": {"uv": [8, 4, 12, 5.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 1.75], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 10, 7], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 14, 8, 15.5], "texture": "#0"}, + "east": {"uv": [12.5, 14, 8, 15.5], "texture": "#0"}, + "south": {"uv": [8, 12.5, 16, 14], "texture": "#0"}, + "west": {"uv": [8, 14, 12.5, 15.5], "texture": "#0"}, + "up": {"uv": [0, 11.75, 8, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 9, 8, 11.25], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 2, 11], + "to": [11, 10, 16], + "faces": { + "north": {"uv": [0, 0, 3, 2], "texture": "#missing"}, + "east": {"uv": [0, 9.25, 2.5, 11.25], "texture": "#0"}, + "south": {"uv": [8, 10.5, 11, 12.5], "texture": "#0"}, + "west": {"uv": [5.5, 9.25, 8, 11.25], "texture": "#0"}, + "up": {"uv": [0, 0, 3, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 3, 1.25], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 0, 11], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 0, 8, 0.5], "texture": "#missing"}, + "east": {"uv": [16, 2, 13.5, 2.5], "texture": "#0"}, + "south": {"uv": [0, 2, 8, 2.5], "texture": "#0"}, + "west": {"uv": [13.5, 2, 16, 2.5], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9.25], "texture": "#0"}, + "down": {"uv": [0, 5.25, 8, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 2, 11], + "to": [5, 3, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 4, 11], + "to": [5, 5, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 6, 11], + "to": [5, 7, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 8, 11], + "to": [5, 9, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 2, 11], + "to": [15, 3, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 4, 11], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 6, 11], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 8, 11], + "to": [15, 9, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [2, 2, 12], + "to": [4, 10, 14], + "faces": { + "north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"}, + "east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "coil", + "from": [12, 2, 12], + "to": [14, 10, 14], + "faces": { + "north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"}, + "east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 10, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [15, 10, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [15.2, 11, 1], + "to": [15.7, 12, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [15.2, 14, 1], + "to": [15.7, 15, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [0.3, 14, 1], + "to": [0.8, 15, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [0.3, 11, 1], + "to": [0.8, 12, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [1.5, 10, 1], + "to": [4.5, 14, 7], + "faces": { + "north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"}, + "east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"} + } + }, + { + "from": [11.5, 10, 1], + "to": [14.5, 14, 7], + "faces": { + "north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"}, + "east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"} + } + }, + { + "name": "effect", + "from": [0.5, 2, 10.5], + "to": [5.5, 10, 15.5], + "faces": { + "north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "east": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "south": {"uv": [2.5, 8, 5, 12], "texture": "#1"}, + "west": {"uv": [0, 8, 2.5, 12], "texture": "#1"}, + "up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"} + } + }, + { + "name": "effect", + "from": [10.5, 2, 10.5], + "to": [15.5, 10, 15.5], + "faces": { + "north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "east": {"uv": [2.5, 4, 5, 8], "texture": "#1"}, + "south": {"uv": [0, 4, 2.5, 8], "texture": "#1"}, + "west": {"uv": [2.5, 4, 5, 6], "texture": "#1"}, + "up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/phantom_attractor.json b/src/main/resources/assets/overdrive_that_matters/models/block/phantom_attractor.json index c8b7c2f1b..3e82989f9 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/phantom_attractor.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/phantom_attractor.json @@ -172,5 +172,41 @@ "down": {"uv": [7, 11, 10, 14], "texture": "#0"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, -3, 0], + "scale": [0.53, 0.53, 0.53] + }, + "head": { + "translation": [0, 13, 0] + }, + "fixed": { + "translation": [0, -3.25, 0], + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/energy_servo.png b/src/main/resources/assets/overdrive_that_matters/textures/block/energy_servo.png new file mode 100644 index 0000000000000000000000000000000000000000..1b400f8998214ed7c08ff0008a95982792dde834 GIT binary patch literal 470 zcmV;{0V)28P)Px#1ZP1_K>z@;j|==^1poj5Ay7VGd00BNpL_t(I%e9k1Zp0uAMV(9& zO?FTzqb_L{JwVd~R8EP z3t%b*a$;r!QE7>hadlk3E*Yqv&N(=)dq9R!0*?Zo zW9EMWP=emiJ3zzk13lyo#MBdL< z)X0n}*c9qu4|0@+d%u|Wz7~$s=H+{T`W0;D$0ccxsgg~xPyrBs0K00x%ti^-1^@s6 M07*qoM6N<$f(TZ)z5oCK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png index 1ca8e3da0b4b5b94c5e3c65ac84198bb46c3a188..f06b97c4ef43435d39128208abf50f8efe70f01e 100644 GIT binary patch delta 2519 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