From 20f7ef45ede92a8b8fa00126f4fd5dc3e8dff84c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 25 Mar 2023 23:37:41 +0600 Subject: [PATCH 01/13] Matter Reconstructor --- .../ru/dbotthepony/mc/otm/registry/MNames.kt | 2 +- .../models/block/matter_reconstructor.json | 232 ++++++++++++++++++ .../textures/block/matter_reconstructor.png | Bin 0 -> 750 bytes 3 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor.png diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 81bdd5794..0347f06dd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -23,7 +23,7 @@ object MNames { const val MATTER_PANEL = "matter_panel" const val MATTER_REPLICATOR = "matter_replicator" const val MATTER_BOTTLER = "matter_bottler" - const val MATTER_RECONSTRUCTOR = "item_repairer" + const val MATTER_RECONSTRUCTOR = "matter_reconstructor" const val DRIVE_VIEWER = "drive_viewer" const val DRIVE_RACK = "drive_rack" const val ITEM_MONITOR = "item_monitor" diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json new file mode 100644 index 000000000..94d03904b --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_reconstructor.json @@ -0,0 +1,232 @@ +{ + "credit": "Made with Blockbench", + "render_type": "cutout", + "textures": { + "0": "overdrive_that_matters:block/matter_reconstructor", + "particle": "overdrive_that_matters:block/matter_reconstructor" + }, + "elements": [ + { + "name": "body", + "from": [0, 4, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 0, 4, 2], "texture": "#0"}, + "east": {"uv": [8, 0, 4, 2], "texture": "#0"}, + "south": {"uv": [8, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [4, 0, 8, 2], "texture": "#0"}, + "up": {"uv": [4, 4, 8, 12], "texture": "#0"}, + "down": {"uv": [4, 4, 8, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 4, 11], + "faces": { + "north": {"uv": [0, 2, 4, 4], "texture": "#0"}, + "east": {"uv": [6.75, 2, 4, 4], "texture": "#0"}, + "south": {"uv": [0, 2, 4, 4], "texture": "#0"}, + "west": {"uv": [4, 2, 6.75, 4], "texture": "#0"}, + "down": {"uv": [0, 4, 4, 9.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [13, 8, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 12, 0.75, 16], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0.75, 12, 4.75, 16], "texture": "#0"}, + "south": {"uv": [0, 12, 0.75, 16], "texture": "#0"}, + "west": {"uv": [4.75, 12, 8.75, 16], "texture": "#0"}, + "up": {"uv": [0, 10.5, 4, 12], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 8, 0], + "to": [3, 16, 16], + "faces": { + "north": {"uv": [0, 12, 0.75, 16], "texture": "#0"}, + "east": {"uv": [4.75, 12, 8.75, 16], "texture": "#0"}, + "south": {"uv": [0, 12, 0.75, 16], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0.75, 12, 4.75, 16], "texture": "#0"}, + "up": {"uv": [0, 10.5, 4, 12], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "chamber glass", + "from": [3, 8, 1], + "to": [13, 15, 15], + "faces": { + "north": {"uv": [8.75, 5.5, 11.25, 9], "texture": "#0"}, + "south": {"uv": [8.75, 5.5, 11.25, 9], "texture": "#0"}, + "up": {"uv": [8.75, 9, 11.25, 16], "texture": "#0"} + } + }, + { + "name": "shields", + "from": [-1, 8, 1], + "to": [0, 15, 15], + "faces": { + "north": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"}, + "south": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [11.25, 4.5, 13, 11.5], "rotation": 270, "texture": "#0"}, + "up": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"}, + "down": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"} + } + }, + { + "name": "shields", + "from": [16, 8, 1], + "to": [17, 15, 15], + "faces": { + "north": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [11.25, 4.5, 13, 11.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [11.25, 4, 13, 4.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 3.5, 3.5], "texture": "#missing"}, + "up": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"}, + "down": {"uv": [13, 4.5, 13.25, 11.5], "texture": "#0"} + } + }, + { + "name": "item platform", + "from": [4, 8, 4], + "to": [12, 9, 12], + "faces": { + "north": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"}, + "east": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"}, + "south": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"}, + "west": {"uv": [11.25, 11.5, 13.25, 12], "texture": "#0"}, + "up": {"uv": [11.25, 12, 13.25, 16], "texture": "#0"} + } + }, + { + "name": "matter storage", + "from": [14, 0, 11], + "to": [15, 4, 15], + "faces": { + "east": {"uv": [6.75, 2, 7.75, 4], "texture": "#0"}, + "south": {"uv": [11, 2, 11.25, 4], "texture": "#0"}, + "down": {"uv": [11, 2, 11.25, 4], "texture": "#0"} + } + }, + { + "name": "matter storage", + "from": [1, 0, 11], + "to": [3, 4, 15], + "faces": { + "south": {"uv": [7.75, 2, 8.25, 4], "texture": "#0"}, + "west": {"uv": [6.75, 2, 7.75, 4], "texture": "#0"}, + "down": {"uv": [7.75, 2, 8.25, 4], "texture": "#0"} + } + }, + { + "name": "matter glow", + "from": [3, 0, 11], + "to": [14, 4, 15], + "faces": { + "south": {"uv": [8.25, 2, 11, 4], "texture": "#0"}, + "down": {"uv": [8.25, 2, 11, 4], "texture": "#0"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "manipulator", + "from": [6, 6, 10.9], + "to": [7, 11, 11.9], + "rotation": {"angle": 45, "axis": "x", "origin": [6.5, 8.5, 12.4]}, + "faces": { + "north": {"uv": [8, 4.5, 9.25, 5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 4, 9.25, 4.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 4.5, 9.25, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 4, 9.25, 4.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "manipulator", + "from": [6, 10, 8.1], + "to": [7, 11, 9.1], + "rotation": {"angle": 45, "axis": "x", "origin": [6.5, 10, 10.4]}, + "faces": { + "north": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"}, + "east": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"}, + "south": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"}, + "west": {"uv": [9.25, 4, 9.5, 4.5], "texture": "#0"} + } + }, + { + "name": "manipulator tip", + "from": [6, 9, 8.1], + "to": [7, 10, 9.1], + "rotation": {"angle": 45, "axis": "x", "origin": [6.5, 10, 10.4]}, + "faces": { + "north": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"}, + "east": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"}, + "south": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"}, + "west": {"uv": [9.25, 4.5, 9.5, 5], "texture": "#0"}, + "down": {"uv": [9.5, 4.5, 9.75, 5], "texture": "#0"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "manipulator", + "from": [5.9, 10.5, 9.4], + "to": [7.1, 12.5, 14.4], + "rotation": {"angle": 0, "axis": "x", "origin": [6.5, 12.5, 13.9]}, + "faces": { + "north": {"uv": [8, 5.5, 8.5, 6.1], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 6, 8.5, 8.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [8, 5.5, 8.5, 6.1], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 6, 8.5, 8.5], "rotation": 270, "texture": "#0"}, + "up": {"uv": [8.5, 6, 8.75, 8.5], "texture": "#0"}, + "down": {"uv": [8, 6, 8.25, 8.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "emerald lens", + "from": [7, 8, 3], + "to": [9, 10, 5], + "faces": { + "north": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"}, + "east": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"}, + "south": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"}, + "west": {"uv": [8, 10.5, 8.5, 11.5], "texture": "#0"}, + "up": {"uv": [8, 9.5, 8.5, 10.5], "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], + "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/textures/block/matter_reconstructor.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor.png new file mode 100644 index 0000000000000000000000000000000000000000..854ab7991021e88da9221aa4eb463d550fe9ad89 GIT binary patch literal 750 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`T?2eVTun_)bDR2)Z3!0>6Z?OI;r|2AgoK3u|Nn=Cgrrrr+`fIgzP`Sw zsL1{QZu4UkwlXmMXJBY=Z&y=O)7I8zn5yacxdmtvtH&QLASGTB*#OnUCE;qXMS?zYUMzRO>)et1x|J5JNWoM##@(<9q6Weh6)Ywxk-nLoPdd%5HE zVrfR@W9yE(eCn1^{B&$Hv)orFRwhv;J{AiWJ{^{2%?vURt}LZWbyg$>fFtu z+^3TxlQQhStxrEzus9r*ib)FZ*(ULH%Axs8rx!8Jtnso; z_P4A&6xe-#O9G$9;suY4Zw4y6y*#$6=-{HQmIlnP6e>Hpi)0MnR_ve7HD~gkWegnG z3pY&=6lv6YG5M*e&Sv2YZM;(!@Xpy7!Swvv$)f9?DXzDZ8l%b_v&t!F+Z%{=&IB{4tc_D`(qrYw)>rWAxT@%WKm>aoH zoDaB``-(-cum8SK*m5h~ozt}zCs@ZBM!GN};sr-EBn8LE& zux?phFoSVlTG(oZZC=WM^gmp4e3mP_C+ncKo#l)44VD#_N4h8Tf0;M=z_tl~+Y4js Z85M-1S@l*pJp`r~22WQ%mvv4FO#uC;KoS4| literal 0 HcmV?d00001 From a7dbae85abac98aa9d99ebbb65cc8c58dd8d874d Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 25 Mar 2023 23:38:20 +0600 Subject: [PATCH 02/13] Essence storage funni --- .../models/block/essence_storage.json | 72 ++++++++++++++++--- 1 file changed, 62 insertions(+), 10 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json index 232c1ec45..9727bad86 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json @@ -1,4 +1,5 @@ { + "credit": "Made with Blockbench", "render_type": "cutout", "texture_size": [32, 64], "textures": { @@ -88,16 +89,6 @@ "west": {"uv": [8, 10.5, 8.5, 11.75], "texture": "#0"} } }, - { - "name": "container", - "from": [1, 5, 1], - "to": [9, 15, 9], - "faces": { - "north": {"uv": [8, 2, 12, 4.5], "texture": "#0"}, - "west": {"uv": [8, 2, 12, 4.5], "texture": "#0"}, - "up": {"uv": [8, 0, 12, 2], "texture": "#0"} - } - }, { "name": "experience", "from": [1.5, 5, 1.5], @@ -110,6 +101,67 @@ "up": {"uv": [9.5, 12.5, 13, 14.25], "texture": "#0"} }, "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "bottle", + "from": [1, 13, 1], + "to": [9, 15, 9], + "faces": { + "north": {"uv": [8, 2, 12, 2.5], "texture": "#0"}, + "west": {"uv": [8, 2, 12, 2.5], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [8, 0, 12, 2], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [1, 5, 1], + "to": [9, 6, 9], + "faces": { + "north": {"uv": [8, 4.25, 12, 4.5], "texture": "#0"}, + "west": {"uv": [8, 4.25, 12, 4.5], "texture": "#0"}, + "up": {"uv": [8, 0, 12, 2], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [1, 6, 1], + "to": [2, 13, 2], + "faces": { + "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "east": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"}, + "south": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [8, 6, 8], + "to": [9, 13, 9], + "faces": { + "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [1, 6, 8], + "to": [2, 13, 9], + "faces": { + "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "east": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} + } + }, + { + "name": "bottle", + "from": [8, 6, 1], + "to": [9, 13, 2], + "faces": { + "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "south": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} + } } ], "display": { From 44d4c6bbbe3f362e36c9844259e25feb4a4505ac Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sat, 25 Mar 2023 23:39:12 +0600 Subject: [PATCH 03/13] Tritanium bars (pls fix) --- .../dbotthepony/mc/otm/datagen/DecorativeData.kt | 2 ++ .../mc/otm/datagen/blocks/BlockStates.kt | 1 + .../mc/otm/datagen/items/ItemModels.kt | 2 ++ .../textures/block/decorative/tritanium_bars.png | Bin 0 -> 254 bytes 4 files changed, 5 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_bars.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 0a40478ab..36667ac77 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -276,6 +276,8 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr DataGen.pane(glass, textureSide, textureRailing) } + DataGen.pane(MBlocks.TRITANIUM_BARS, ResourceLocation(DataGen.MOD_ID,"block/decorative/tritanium_bars"), ResourceLocation(DataGen.MOD_ID,"block/decorative/tritanium_bars")) + blockStateProvider.block(MBlocks.ENGINE) itemModelProvider.block(MItems.ENGINE) } 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 52135accd..6fb27fc90 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 @@ -87,6 +87,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.STORAGE_POWER_SUPPLIER) provider.block(MBlocks.MATTER_RECYCLER) + provider.block(MBlocks.MATTER_RECONSTRUCTOR) provider.block(MBlocks.ENERGY_SERVO) provider.block(MBlocks.COBBLESTONE_GENERATOR) provider.block(MBlocks.ESSENCE_STORAGE) 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 8c2d8c79b..b906e6e24 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 @@ -25,6 +25,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.CARBON_FIBRE_BLOCK) provider.block(MItems.METAL_JUNK) provider.block(MItems.METAL_MESH) + provider.generatedTranslucent(MItems.TRITANIUM_BARS, ResourceLocation(DataGen.MOD_ID, "block/decorative/tritanium_bars")) provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) provider.block(MItems.TRITANIUM_ORE) provider.block(MItems.TRITANIUM_STRIPED_BLOCK) @@ -125,6 +126,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working") provider.block(MItems.ENERGY_SERVO, "energy_servo") provider.block(MItems.ESSENCE_STORAGE, "essence_storage") + provider.block(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor") 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/textures/block/decorative/tritanium_bars.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_bars.png new file mode 100644 index 0000000000000000000000000000000000000000..86d2aa5aa1ff81eeed557bab794bf6394319df13 GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G|^0G|-ow91yoSt~+Pa(h>7&u!`l3Y%|GtOHVPB|(0{|3QFZ^Zq6Kfg+p* z9+AZi419+{nDKc2iWHz=vZsq*FVdQ&MBb@02|F$xBvhE literal 0 HcmV?d00001 From dd7ec5d83906a1cf3d5d1e4f17e554f292aada81 Mon Sep 17 00:00:00 2001 From: YuRaNnNzZZ Date: Sat, 25 Mar 2023 23:05:43 +0300 Subject: [PATCH 04/13] CAGO 2 --- .../mc/otm/shapes/BlockShapes.java | 16 +++++++++++++++ ...erBlock.kt => MatterReconstructorBlock.kt} | 20 ++++++++++++++++++- .../ru/dbotthepony/mc/otm/registry/MBlocks.kt | 4 ++-- 3 files changed, 37 insertions(+), 3 deletions(-) rename src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/{ItemRepairerBlock.kt => MatterReconstructorBlock.kt} (58%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java index b1f97bd01..d87f1ef00 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java +++ b/src/main/java/ru/dbotthepony/mc/otm/shapes/BlockShapes.java @@ -633,4 +633,20 @@ public class BlockShapes { new SimpleCuboid(0.0625d, 0.3125d, 0.875d, 0.9375d, 0.625d, 0.9375d), new SimpleCuboid(0.0625d, 0.3125d, 0.0625d, 0.5625d, 0.9375d, 0.5625d) ); + + public static final BlockShape MATTER_RECONSTRUCTOR = new BlockShape( + new SimpleCuboid(0d, 0.25d, 0d, 1d, 0.5d, 1d), + new SimpleCuboid(0d, 0d, 0d, 1d, 0.25d, 0.6875d), + new SimpleCuboid(0.8125d, 0.5d, 0d, 1d, 1d, 1d), + new SimpleCuboid(0d, 0.5d, 0d, 0.1875d, 1d, 1d), + new SimpleCuboid(0.1875d, 0.5d, 0.0625d, 0.8125d, 0.9375d, 0.9375d), + new SimpleCuboid(-0.0625d, 0.5d, 0.0625d, 0d, 0.9375d, 0.9375d), + new SimpleCuboid(1d, 0.5d, 0.0625d, 1.0625d, 0.9375d, 0.9375d), + new SimpleCuboid(0.25d, 0.5d, 0.25d, 0.75d, 0.5625d, 0.75d), + new SimpleCuboid(0.875d, 0d, 0.6875d, 0.9375d, 0.25d, 0.9375d), + new SimpleCuboid(0.0625d, 0d, 0.6875d, 0.1875d, 0.25d, 0.9375d), + new SimpleCuboid(0.1875d, 0d, 0.6875d, 0.875d, 0.25d, 0.9375d), + new SimpleCuboid(0.36875d, 0.65625d, 0.5875d, 0.44375d, 0.78125d, 0.9d), + new SimpleCuboid(0.4375d, 0.5d, 0.1875d, 0.5625d, 0.625d, 0.3125d) + ); } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt similarity index 58% rename from src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt rename to src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt index d3fc0928b..d46b0e414 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/ItemRepairerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt @@ -1,16 +1,22 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.EntityBlock import net.minecraft.world.level.block.entity.BlockEntity import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.state.BlockState +import net.minecraft.world.phys.shapes.CollisionContext +import net.minecraft.world.phys.shapes.VoxelShape import ru.dbotthepony.mc.otm.block.RotatableMatteryBlock import ru.dbotthepony.mc.otm.block.entity.matter.MatterReconstructorBlockEntity +import ru.dbotthepony.mc.otm.block.getShapeForEachState +import ru.dbotthepony.mc.otm.core.get +import ru.dbotthepony.mc.otm.shapes.BlockShapes -class ItemRepairerBlock : RotatableMatteryBlock(), EntityBlock { +class MatterReconstructorBlock : RotatableMatteryBlock(), EntityBlock { override fun newBlockEntity(pPos: BlockPos, pState: BlockState): BlockEntity { return MatterReconstructorBlockEntity(pPos, pState) } @@ -21,4 +27,16 @@ class ItemRepairerBlock : RotatableMatteryBlock(), EntityBlock { return BlockEntityTicker { _, _, _, pBlockEntity -> if (pBlockEntity is MatterReconstructorBlockEntity) pBlockEntity.tick() } } + + private val shapes = getShapeForEachState(rotationProperty) { BlockShapes.MATTER_RECONSTRUCTOR.rotateFromNorth(it[rotationProperty]).computeShape() } + + @Suppress("override_deprecation") + override fun getShape( + state: BlockState, + blockGetter: BlockGetter, + pos: BlockPos, + context: CollisionContext + ): VoxelShape { + return shapes[state]!! + } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index afe8b208c..90de2a4e3 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -47,7 +47,7 @@ import ru.dbotthepony.mc.otm.block.tech.PlatePressBlock import ru.dbotthepony.mc.otm.block.StorageCableBlock import ru.dbotthepony.mc.otm.block.decorative.EngineBlock import ru.dbotthepony.mc.otm.block.decorative.HoloSignBlock -import ru.dbotthepony.mc.otm.block.matter.ItemRepairerBlock +import ru.dbotthepony.mc.otm.block.matter.MatterReconstructorBlock import ru.dbotthepony.mc.otm.block.matter.MatterBottlerBlock import ru.dbotthepony.mc.otm.block.matter.MatterCapacitorBankBlock import ru.dbotthepony.mc.otm.block.matter.MatterDecomposerBlock @@ -92,7 +92,7 @@ object MBlocks { val ENERGY_SERVO: Block by registry.register(MNames.ENERGY_SERVO) { EnergyServoBlock() } val COBBLESTONE_GENERATOR: Block by registry.register(MNames.COBBLESTONE_GENERATOR) { CobblerBlock() } val ESSENCE_STORAGE: EssenceStorageBlock by registry.register(MNames.ESSENCE_STORAGE) { EssenceStorageBlock() } - val MATTER_RECONSTRUCTOR: ItemRepairerBlock by registry.register(MNames.MATTER_RECONSTRUCTOR) { ItemRepairerBlock() } + val MATTER_RECONSTRUCTOR: MatterReconstructorBlock by registry.register(MNames.MATTER_RECONSTRUCTOR) { MatterReconstructorBlock() } val STORAGE_BUS: Block by registry.register(MNames.STORAGE_BUS) { StorageBusBlock() } val STORAGE_IMPORTER: Block by registry.register(MNames.STORAGE_IMPORTER) { StorageImporterBlock() } From cbde740747cf0a6d60488edca4ec954648c0dbf5 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sun, 26 Mar 2023 16:53:01 +0600 Subject: [PATCH 05/13] ACKSHUALLY --- .../models/block/essence_storage.json | 38 ++---------------- .../textures/block/essence_storage.png | Bin 1275 -> 1775 bytes 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json index 9727bad86..95fef5c70 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json @@ -99,8 +99,7 @@ "south": {"uv": [9, 12, 12.5, 13.5], "texture": "#0"}, "west": {"uv": [11.5, 14.5, 15, 16], "texture": "#0"}, "up": {"uv": [9.5, 12.5, 13, 14.25], "texture": "#0"} - }, - "forge_data": { "block_light": 15, "sky_light": 15 } + } }, { "name": "bottle", @@ -126,41 +125,10 @@ { "name": "bottle", "from": [1, 6, 1], - "to": [2, 13, 2], - "faces": { - "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "east": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"}, - "south": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} - } - }, - { - "name": "bottle", - "from": [8, 6, 8], "to": [9, 13, 9], "faces": { - "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} - } - }, - { - "name": "bottle", - "from": [1, 6, 8], - "to": [2, 13, 9], - "faces": { - "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "east": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"}, - "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} - } - }, - { - "name": "bottle", - "from": [8, 6, 1], - "to": [9, 13, 2], - "faces": { - "north": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "south": {"uv": [11.5, 2.5, 12, 4.25], "texture": "#0"}, - "west": {"uv": [8, 2.5, 8.5, 4.25], "texture": "#0"} + "north": {"uv": [8, 2.5, 12, 4.25], "texture": "#0"}, + "west": {"uv": [8, 2.5, 12, 4.25], "texture": "#0"} } } ], diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png b/src/main/resources/assets/overdrive_that_matters/textures/block/essence_storage.png index f0136b877e34d1fd21a6ec81edce323490c58e7c..bf0d329201779959851ae6129fdde23bf7c78429 100644 GIT binary patch delta 1770 zcmV4Y?o}9M1Vk;RjV*fv&QtMX@7eE>scT!2eboS*MUo>Pp8vf z+g!EW*aGd~^y$+83=aEgP}$WHilt%E*KgbV)N$BjwJ2>Z3eONy`Km6 zYWUU?g;Y=Qz>#wP??!m>u?J(?sUJ^}Fn&YVb$|Bk*%LU=y#pn)yhgZm;!w*nDrnF+ zoi0;M){2ZwyMAc!VB^y-L@ErU znd|(K{h#pMmVQd_oab%e&ifzs`r=`qNThnwp1-2TGz-5%|9=3jcYFuE5rTgl`T~Ft zBkDhslarBV_v7w?FC+UjFYqEzul@s<4wffheqEVQO7EPnJHK|S`w8X!&6+8Z&wuBY z^`Anapsa+1aU^7JC4q(`s9*n)sCVg5jgbda)5mdC{l||Z`#%Z%e*M`;H3wCgOj88v z)qmPWY<%zMPShP{A7HqX zp9W62ithxvfM0<>flMO{gpW=Y<~hu7Kn~~zZU?S%S3C{$x=QDPD_of>aFVs8`JT4? z2k@+e(+BheOArs4E?^2cgRsnyOU?k!0+aNzK%6*s`)|V@;9A5A0c?cNe?XW$i*Q2+ z&<8j`Cl)KPJvX(5E_c#7#DD4+fK#sWE?^}hK)*!<>8-$8Y&sAwY5Q@SKm_6pBC7uY zjskzt&DFqlE}3(5QAW7wZ{QpvXxp}cOe;&>$<6>Jvcz$?NErvX0e~twM1amBg4SLP z0@DZ|-v|r1gF921Kjv%`P+Rp=f9UK!8SRIIHzW{7P zY|m*#>Rp1^nrTE#7_Lm)E|_sA&mi{yS>jaarNT6(tNbEx5*P-qapkJO`NbgcDLv$v zVKw4RxQl<#m}UTxoMQ|`)XVes0+4da?q^B+1QzJzSF-37DIx-}50Qd95Sefm5f??o z!E_VijOb^!eFCc}@;AZ_264XSA66m)?Rh)~QXRITMq6wzu|Nk}}_S=4B~ zqSPx6qHKK_-C`733A(jaI^AI%tw%YhrL(Sg=^wFs&i8)Kz4wQE?)RLV&kgc7q1aOZ zz=Rp#%hQvtm$$KjKC`*l_~I3)1Hd4g;WFL46rxsGm7;*?d1wPfu4@ zR~s7}XJ_Y>l#~M1HEFp@EEa!}rHIdv@%em#K!Au`0zx@LDndR&20|mkX@mp>A;KpJi3sTkMF>p@HxMo(C=t{MB7}H^ zefS|0&A&!yM(9M4Aao(H&^!Pw1JSe&Ar|2TLJ7iQgaU*LgffJS2;m4^q-G<8AUO$v ziPkK%N*ms~V=lh4j^$D1(Mv@vUjIqP zE&d$4;-{0R2vsotyC}+BzF$s?-i!SFJ`MTp<05Bu9@2^V&zRr(~8m# zj@4Dj(kXSfWK>f}Zbo!ZUxj?{CE>OQ410O@m{FO_e|8>mTKMHvTw0QBdEXV4t-wxH*y2c4z5@u2wWTIlizxbv(gvb!Kr{ z8}z&>@##mChu!%NtyPxtf2MkP Date: Sun, 26 Mar 2023 17:05:22 +0600 Subject: [PATCH 06/13] Oops --- .../overdrive_that_matters/models/block/essence_storage.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json index 95fef5c70..b8cd1d055 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/essence_storage.json @@ -99,7 +99,8 @@ "south": {"uv": [9, 12, 12.5, 13.5], "texture": "#0"}, "west": {"uv": [11.5, 14.5, 15, 16], "texture": "#0"}, "up": {"uv": [9.5, 12.5, 13, 14.25], "texture": "#0"} - } + }, + "forge_data": { "block_light": 15, "sky_light": 15 } }, { "name": "bottle", From 2752a822251ef586d31ab5e84aea3c478495459e Mon Sep 17 00:00:00 2001 From: GearShocky Date: Sun, 26 Mar 2023 19:18:12 +0600 Subject: [PATCH 07/13] Active engine model (WIP) --- .../models/block/engine.json | 5 +- .../models/block/engine_active.json | 303 ++++++++++++++++++ 2 files changed, 307 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/engine.json b/src/main/resources/assets/overdrive_that_matters/models/block/engine.json index d3bc265b0..89cb5ee31 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/engine.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/engine.json @@ -1,5 +1,8 @@ { - "parent": "minecraft:block/cube_all", + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube_all", + "render_type": "cutout", + "texture_size": [16, 32], "textures": { "0": "overdrive_that_matters:block/ship_engine", "particle": "overdrive_that_matters:block/ship_engine" diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json b/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json new file mode 100644 index 000000000..23a785b34 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/engine_active.json @@ -0,0 +1,303 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube_all", + "render_type": "cutout", + "texture_size": [16, 32], + "textures": { + "0": "overdrive_that_matters:block/ship_engine", + "particle": "overdrive_that_matters:block/ship_engine" + }, + "elements": [ + { + "name": "frame", + "from": [0, 0, 14], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 8, 4], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 4, 8, 4.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 4], "texture": "#0"}, + "west": {"uv": [0, 4, 8, 4.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 4, 8, 4.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 4, 8, 4.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [1, 1, 10], + "to": [15, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 5.5, 7, 9], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 4.5, 7, 5.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 7, 7], "texture": "#missing"}, + "west": {"uv": [0, 4.5, 7, 5.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 4.5, 7, 5.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 4.5, 7, 5.5], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [4, 4, 7], + "to": [12, 12, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 4, 4], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [2, 1.75, 6, 3.25], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "west": {"uv": [2, 1.75, 6, 3.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [2, 1.75, 6, 3.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [2, 1.75, 6, 3.25], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [3, 3, 4], + "to": [13, 13, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#missing"}, + "east": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [1.5, 0.75, 6.5, 3.25], "texture": "#0"}, + "west": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1.5, 2.25, 6.5, 3.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1.5, 2.25, 6.5, 3.75], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [2, 2, 0], + "to": [14, 14, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [6, 9, 12, 12], "rotation": 180, "texture": "#0"}, + "east": {"uv": [1, 2, 7, 4], "rotation": 270, "texture": "#0"}, + "south": {"uv": [1, 0.5, 7, 3.5], "texture": "#0"}, + "west": {"uv": [1, 2, 7, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [1, 2, 7, 4], "rotation": 180, "texture": "#0"}, + "down": {"uv": [1, 2, 7, 4], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [10, 7, 1], + "to": [13, 9, 10], + "rotation": {"angle": -22.5, "axis": "y", "origin": [12, 8, 9.5]}, + "faces": { + "north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 270, "texture": "#0"}, + "east": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [0, 0, 1, 4.5], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [13.5, 0, 15, 2.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [11, 0, 12.5, 2.25], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [7, 10, 1], + "to": [9, 13, 10], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 9.5]}, + "faces": { + "north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 180, "texture": "#0"}, + "east": {"uv": [11, 0, 12.5, 2.25], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1.5], "texture": "#missing"}, + "west": {"uv": [13.5, 0, 15, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 1, 4.5], "texture": "#missing"} + } + }, + { + "name": "funnycone", + "from": [7, 3, 1], + "to": [9, 6, 10], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4, 9.5]}, + "faces": { + "north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13.5, 0, 15, 2.25], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1.5], "texture": "#missing"}, + "west": {"uv": [11, 0, 12.5, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 1, 4.5], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [12.5, 0, 13.5, 2.25], "texture": "#0"} + } + }, + { + "name": "funnycone", + "from": [3, 7, 1], + "to": [6, 9, 10], + "rotation": {"angle": 22.5, "axis": "y", "origin": [4, 8, 9.5]}, + "faces": { + "north": {"uv": [12.5, 2.25, 13.5, 3], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 1, 4.5], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [12.5, 0, 13.5, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [11, 0, 12.5, 2.25], "rotation": 180, "texture": "#0"}, + "down": {"uv": [13.5, 0, 15, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 14, 9], + "to": [2, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 1.75, 9, 2.25], "texture": "#0"}, + "east": {"uv": [9, 0.5, 8, 1.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [9, 0.5, 8, 1.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 0.5, 9, 1.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 0.5, 9, 1.75], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [1, 14, 4], + "to": [2, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [1, 1, 4], + "to": [2, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [14, 1, 4], + "to": [15, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [14, 14, 4], + "to": [15, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [9, 1.5, 9.5, 1.75], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.25, 9.5, 1.5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.25, 9.5, 1.5], "texture": "#0"} + } + }, + { + "from": [14, 2, 7], + "to": [15, 14, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9.5, 0.25, 10.5, 3.25], "texture": "#0"}, + "south": {"uv": [10.5, 0.25, 11, 3.25], "texture": "#0"}, + "west": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [1, 2, 7], + "to": [2, 14, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9.5, 0.25, 10.5, 3.25], "texture": "#0"}, + "south": {"uv": [10.5, 0.25, 11, 3.25], "texture": "#0"}, + "west": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "rotation": 180, "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [2, 14, 7], + "to": [14, 15, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 270, "texture": "#0"}, + "down": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 1, 7], + "to": [14, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 0, 0.5, 1], "rotation": 270, "texture": "#missing"}, + "south": {"uv": [10.5, 0.25, 11, 3.25], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 0.5, 1], "rotation": 90, "texture": "#missing"}, + "up": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 270, "texture": "#0"}, + "down": {"uv": [9.5, 0.25, 10.5, 3.25], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [14, 14, 9], + "to": [16, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 1.75, 9, 2.25], "rotation": 270, "texture": "#0"}, + "east": {"uv": [8, 0.5, 9, 1.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [8, 0.5, 9, 1.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8, 1.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.5, 8, 1.75], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [14, 0, 9], + "to": [16, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 1.75, 9, 2.25], "rotation": 180, "texture": "#0"}, + "east": {"uv": [9, 0.5, 8, 1.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [9, 0.5, 8, 1.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 0.5, 9, 1.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 0.5, 9, 1.75], "texture": "#0"} + } + }, + { + "from": [0, 0, 9], + "to": [2, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 16, 0]}, + "faces": { + "north": {"uv": [8, 1.75, 9, 2.25], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 0.5, 9, 1.75], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [8, 0.5, 9, 1.75], "rotation": 90, "texture": "#0"}, + "up": {"uv": [9, 0.5, 8, 1.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [9, 0.5, 8, 1.75], "texture": "#0"} + } + } + ] +} \ No newline at end of file From 5b0988f08e5ae8d7cdccd8d7f2a628ef249c20dc Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 27 Mar 2023 18:13:46 +0600 Subject: [PATCH 08/13] Perish --- .../textures/block/android_station_em.png | Bin 487 -> 0 bytes .../textures/block/batterybank_core_em.png | Bin 166 -> 0 bytes .../textures/block/chemical_generator_em.png | Bin 200 -> 0 bytes .../textures/block/drive_rack_em.png | Bin 195 -> 0 bytes .../textures/block/drive_viewer_em.png | Bin 209 -> 0 bytes .../block/gravitational_stabilizer_em.png | Bin 261 -> 0 bytes .../block/gravitational_stabilizer_idle_em.png | Bin 192 -> 0 bytes .../textures/block/item_monitor_em.png | Bin 216 -> 0 bytes .../textures/block/matter_bottler_em.png | Bin 227 -> 0 bytes .../textures/block/matter_decomposer_em.png | Bin 221 -> 0 bytes .../textures/block/matter_panel_em.png | Bin 216 -> 0 bytes .../textures/block/matter_recycler_em.png | Bin 242 -> 0 bytes .../textures/block/matter_replicator_em.png | Bin 227 -> 0 bytes .../block/matter_replicator_halted_em.png | Bin 213 -> 0 bytes .../block/matter_replicator_offline_em.png | Bin 180 -> 0 bytes .../textures/block/matter_scanner_em.png | Bin 246 -> 0 bytes .../textures/block/matterybank_core_em.png | Bin 169 -> 0 bytes .../textures/block/plate_press_em.png | Bin 195 -> 0 bytes .../textures/block/storage_power_supplier_em.png | Bin 197 -> 0 bytes 19 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png deleted file mode 100644 index 2e734afc4fd9c7c71b0f4d0ab1359005636b9392..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 487 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0eneBK~!i%?U*}~ z!Y~Ym2`8bX-f~aCUV)>~?#!NG>y%spPC=bA71zk>cciSHI3|8D%mjTi9?LRTB-x6A zjgPL`bSw_|bn7K012Gv|cQ)(q`RGD(%2VjtuMUleUbfsT>*0ONP+!H0q9}@@D2k$_ zQqj-n6U!~NrrKR@r29Y*C1muY@t)caW77YiPsVZ}nw+%){vSZ(CNjH0=i||QEO4Od z#Xil_ST!Lum%=vFpvhhiFaL|C;(h|{^N~dZW$Mi00M0`0mIO0^ht55i#cYzcK%&l# z9%OAn5hR@{X)U=GQRFy1A;nn9$Z-e{z1SO`GoIq;BFNw`i_y?p=b)y5>lhByQc@D3 zJ%%iL0#`98a~&(nt3eeEb#0$^se)2?s>vV@9PDx$e`w5{bM`|*0nj|&AD`4}a~rY( zb$!Ly=F!7MHp=DT?c37&v&n#X%@cy-OemryaFB@lPVFl8obLlmoDhdu<-qF=R#3pP d`ETcP`vVHg@#5aAlA-_r002ovPDHLkV1mYh*@XZA diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png deleted file mode 100644 index 268923c4edad2fd02a997f4c0e400c6b53ec643d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j10c+pb*+;VC}{2J;uzxLoh-r1%qy|bMB>l>gCFEi9pRQR z4fqNn{1`ISV`@iy0XB4uLSEsD@VqP%zfh#W5tq`Rye~t_A}hmx~Wht-ktuRe0e` z!#hW>u!-whI=rYi;Ngj!>gBH=xVO75_v6p)w>x{Ib{~7bMeO~>s3@k{>brk1&fBb7 kP_b$DKX#yzP%xwM1h@PIDTXaSMUp{6p00i_>zopr07tn%)c^nh diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png deleted file mode 100644 index b25583f22bd9859935393a8f416d8f7b228f1b7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~$#S7!u+B_JSc-gMom{#iOTIAN{>5eB&31 zve(CYqCB*i#s0A$KCr>Hw!ixF#J20!+!6s6hm%ky9kKy>FVdQ&MBb@0OY(w>i_@% diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png deleted file mode 100644 index 0ea676437cad35f06d5d2e70ff618fa147c98a34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uUY_j)~cCfr4qCE{-7?&TlUtNn{1``2&1HT;2cgHa|Au{{zqeH-JJ6=igc{1yZafL4Lvifq>!nHojn>0B3Nn{1`ISV`@iy0XB_Jc5^1#7ShP%zZf#W5tq`R%2RoDBv7Z5O+RceFEiFz=ZE zdPjrb1G&5fEI|>{0*dcV> z?wFYU7AWZH>Eak-;s3VJkPm3xk%s^FQT!5ljJ@65y+#vmX_P&16HwaD!gBY=1uua) z>lh9yPi?3OFW6--uv1mxNb;TIPUkreavZEbn8T>W&+h%g(a9QUD1)b~pUXO@geCxi CCqerF diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png deleted file mode 100644 index ab1db4e56584b986ad53fd32021226e08d421591..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`MFV_7T>sx-`2WCjD+9xS1_t;4yUmYH0LqvbB+3CP_L3mK;QwI2Amz>M z1{C5f@Q5sCVBp&i!i*NI!74yO7f%<*5D)LS=dAe{99Ucf=S%*MH(E4fUXoH}_~OE* zHL`|Bzj7qVG1=P-h^}1AyW-lmZ_U>kEX>o)0~i@50MT0ZGcpqn=|_reeF8F%!PC{x JWt~$(69CbuMHv79 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png deleted file mode 100644 index 8ad97db8e80898e5d500bd2fb9530bf30831eef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yy8qv8ery7e_y2HU1(0Gc3Gxg6|DWOdDPEvj2F?PH$YKTtzWpG~ zXu%q+0u=P~ba4!caDRKwkc&Z)hxOu&-||uW*tTry=x(x3R`mSX@iUEqfs4UmFTt!Ag2R9yR^A%s7X!t5pj!rP2lKQ>Mz#ey_=E3N)F))78&q Iol`;+029bUeE{L}al6>d5(|L}A90%(U<}hmUvwOdAbg~8-%HZkh=d#Wzp$Pym C)j=u% diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png deleted file mode 100644 index 6b48c2cb83aa06724c66ab7c6c4b34e65e6611e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheq5(c3uK#Z^{D0uNm4V?u1B3hj-R8$80Ak diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png deleted file mode 100644 index 09c99d763d0c544a593267a517324e41b06d089d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe`~f~8uK#Z^{D0tSer$sK|J^{bJx{VX0V&p!Aiv=MK)~>O8(%O`fV03O zvY3H^Z$Ah#TCfJI00n(KT^vI^ypt0Y8D1=EXlxWbb&Tsp5))&CFQc$A50fQx3KN$^ zCFAYgY_Hvsq?eN4gk$% N@O1TaS?83{1OOABKgIw6 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png deleted file mode 100644 index a83f9bd046d862e762a1f8f640e6d8e06a8096c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLD46Bx;uwx7?gIb zZ-2z#_dqUBVCA={FG`F4?ssO+V!; zzPrTIjeDWI_R4$gc4}#=YKvyYT#}x6@Kj9fmc7wSP2+Q&`F7Ps zw8W#;{oCdXvkNSKd$e?ag7fOiJJ)y^4wx@3+f)CxY31UZGapLsH?Y diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png deleted file mode 100644 index 9e65bdf498bb663bbb3f000469a5be62620b5b2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j{UFR}!5XXr6twenaSZYBPL^P0=9O4zA~8dL_6PY>N4Wi> zL>IhR%(6h@$-jE@K)xF%UwBEg_p}|z-~bXGJdJ?{2O1g~8It%kxRoQ#Hv&y!@O1Ta JS?83{1OTgwEpq?> diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png deleted file mode 100644 index 2340c4106a9b650d56009553157a9759e9d9c5c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP%y&N#W5tq`Rye~t_A}hmx~9dhOhn}y8h9n zH=mZT&(l4Zsk8A?R26gdl(XL%&fk=_Sd_Eu fKO@jMC`eP-yI)_5A?2I(2at%TtDnm{r-UW|Z7G;uwkXbecq)78&qol`;+09P$PTmS$7 From 51c23b425c5fc559f8c95b5780c1c5faf8d69c34 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 27 Mar 2023 18:17:14 +0600 Subject: [PATCH 09/13] Cargo crates texture update --- .../textures/block/cargo_crates/cargo_crate.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_black.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_blue.png | Bin 416 -> 559 bytes .../block/cargo_crates/cargo_crate_brown.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_cyan.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_gray.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_green.png | Bin 417 -> 559 bytes .../cargo_crates/cargo_crate_light_blue.png | Bin 417 -> 559 bytes .../cargo_crates/cargo_crate_light_gray.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_lime.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_magenta.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_orange.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_pink.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_purple.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_red.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_white.png | Bin 417 -> 559 bytes .../block/cargo_crates/cargo_crate_yellow.png | Bin 417 -> 559 bytes 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png index f55a0c4b7739021eb362655bc497e6acd564ecfd..9c627d98a36ff788ceaed8de7759431e2cc8a90a 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000PnMg}?&wf9}uHk+OidY0Ys;>8m4mMWuoW?tKeS3W%DJl__1WwGNU_Nyxvhlzi& zIG41D=lr42gR-K|K;03)wJWq4%hw!k30k2(!BNHHits6)f)(mhmUBKk(ov;U@#bTa z;j5E(1Y&#~?RK7(UOP`ljMqm(BEtWtbklr;oZH;%OiVqSCq6X>h5>`8tDnm{r-UW| D75boB diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png index 062cb67065f8c47c803550c229409714a767a1d5..351e6d1f97cd80185954894fabb915c92baee1f1 100644 GIT binary patch delta 504 zcmVOVv|#qO0000FbW%=J|NsC0|NsC0|NsC0|Nj8g+?b&N000SaNLh0L z01m$Z01m$aI0aKA0004SNklb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000mR-Sv|*9(MArHh+a66%>OWGj*X+z9Io{JzGJ&F3N^h1O2*`Gw zGQHS2^yv52gKzFM6qFiVJg{Kdj~V-KH&hv!`z+tF@kI3PJ$YA3SATDJwLMtaXp{HK z(|pEOBLkg?+WW3+n@!IMJ zoJ(57bN*21L0M5}pzes@+7;T2GN>8Mhwc=IvI z@YTsX0x>?0c012Xubn3&#_J;?5#j$+x@o>a&TZ~>CZ?Xv6Q3Fb!+^ol)z4*}Q$iB} DR<)iJ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png index 9b96f96e71a93ec1541600da3bfb3b22a1d7a7c9..d08bba27ecd61a951a265614316584abaae849d9 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000h34x3 delta 360 zcmZ3_vVeJlW4&B}Pl&6jscAw&LSSHEeSJLx1B05HnwXfFvFU6T)oLKu@|@CEAjMS@ zT^vI^yx&fK$k$}R)8ef?d(VIF z+tK-d8Jh)#g@yl$SfBI0zEweqJD@)IVE)^QGwye-;oaQfet46ZdkAY`>^510D^ZDG z3-VU1`mxtw#$4$MF|s)(1}il6KIcaV_&;lVDQ4car}WHgx7h7f_ByXPkFgfrxiUG= zAUiQ3BB0jZb#1d$n&dN6msc;An733Jt#53b_wdSxr;_tPwlp7+UnS_iR_{gOnMH{_ z=?_;u=8ve#JgtcFFKG=G^{oo4q zV&{U5tUsR^=5MJo(vg~xn2=!eG@qmH(1u+7brVcIS=_%|1_l9xr>mdKI;Vst0C^*s A%>V!Z diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png index 78c9e9e0210dc188fc3658a19e530bdeba3fb466..8142ac08f868ae497db8f35cafe0effd14e030a4 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000)=VeU|Uocq01tp1doitG~Cq+8!)yw8?wr zX+C4Ck%3M`?S0p^&8BCBo@IBuc(KI1rOGItnb-E=l@Cuj&$mThS?u_T{pyOvVd7sb z&Lu74Ie#ehpsc7fPHBf>x+ca8$9lB7DlHV1@dW<($usbW|x-y!n`9 z`0C^xffyf0yPapH*Upm>gTe~DWM4f D-pihP diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png index 3b946c37ff42fb8dd27b8f753c86d3953d857554..7d2724f68906839c59e97f09c3193d4417c56d36 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000BINI$zE4_A}j2N$vghYh@PwA%l206F6*O{1lHcxzN3=9JXPgg&ebxsLQ06)8( A_y7O^ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png index f2f18b4b4d3ccbe6f4d209de36806ee30d53c587..c4fa7b5cf4f8d40b331b96b91f5b03698b0cd0eb 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000PnMg}?&wf9}uHk+OidY0Ys;>8m4mMWuoW?tKeS3W%DJl__1WwGNU_Nyxvhlzi& zIG41D=lr42gR-K|K;03)wJWq4%hw!k30k2(!BNHHits6)f)(mhmUBKk(ov;U@#bTa z;j5E(1Y&#~?RK7(UOP`ljMqm(BEtWtbklr;oZH;%OiVqSCq6X>h5>`8tDnm{r-UW| DUc;W_ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png index 364f0a6680e29a47eaee8acf1a54ce71a868e20c..8392f07d4aba67cd0fd9b1545c6ed6fff6a03cd6 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000?%=i4H$EOvaves#s-F!3)I z=aLrjoIezLP*&6#s5|1fc7--$`I^HmK`YcJII37&5kBQputI&xa?WQ*I;xZ^-h50l ze0B1UK#Y&0-OjVpYv;*`@%l(eMEL)dZklh9bDMjeiK%Dv#HYr^>bP0l+XkK DKEj>& diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png index d6fbbea41dc59e9ef5aaa26da2407c1179468e23..90cf6bcc90e732f296f3b0b5144f8061318aa87f 100644 GIT binary patch delta 485 zcmVu4#wA(bEzyJUM3W`|N0000FbW%=J|NsC0|NsC0|NsC0|Nj8g+?b(}eiwfMa7jc# zR7gwhRM~RFAPf`+rO43y|L1mfnCUbkp6P459-~-n7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8IBm4^&L3mGq_|PoIK*XM z1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eAIp4Sxl4kkFrLZNuQ9v)zN1q2w zPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@&|AYqHEKO0P& z)N%z(D!wAbf~Dah{0o>_{GU_-gw}ib7pUuYC;(f6DL^A3*aowhL_*N-g5b5c1y}eN z$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3TdgmSq<&pG%MQeU;C`xVYm1vIQ|6T b`TPRcH&$Xl+t&yH000R9NkvXXu0mjf$fV`) delta 361 zcmZ3_vXFU#W4&B}Pl&6jscAw&LSSHEeSJLx1B05HnwXfF^_JV}lgPnMg}?&wf9}uHk+OidY0Ys;>8m4mMWuoW?tKeS3W%DJl__1WwGNU_Nyxvhlzi& zIG41D=lr42gR-K|K;03)wJWq4%hw!k30k2(!BNHHits6)f)(mhmUBKk(ov;U@#bTa z;j5E(1Y&#~?RK7(UOP`ljMqm(BEtWtbklr;oZH;%OiVqSCq6X>h5>`8tDnm{r-UW| Ddd!~4 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png index 9d573a1c26a14873ccd00f5f67ed1b59cf9833d9..62e44425351d1f35247499f06d110c5d6ce51894 100644 GIT binary patch delta 504 zcmZ3;yq;x(W4&&GPl&6jscA?^NJ2tFU|^uOwsw7e{r?*b{~vg&si_qe6^V(7H8)rH z^fXsj7c($0JPdaA0aE-WL4LviQ2@i0J2Msnr8o;bB7rLT_Jc5^1#7Sh0|R4$r;B5V zhxgl%n?;8ectqHip1APm|MU8?(ityJl;*w6-YvH{B1bINOmJ$EjQiRMFU71Q{rv}; zKYH9%c=K&)z%R~#wM({5f6lLw*wZ;V<-}O685PrB(;lxk1?%G*VD>w@mSzdCwJI!j=(fUWz z4(D>qY7?x?W3l*#vgl+faDd&=y`QC8L2YrQF=I-0^M+92D6(ue2?+}@k_Vd`% z4XS$r9rQ1{&u91X`ysx9hxysT2`L{l6AEWfxn-VJI(zD`D^c0{UY3)CnlD5jb}`Me zRSvK&om8{v+%&m|Tvv)%eYEx|9cfznQ1K6U;f%;X^FtV0u2lm~dR?Z$5Z$EdpsaX< zZSxElrwi|!9&Fvt8vaB4#GV^lLG&XI!DnX${dP3nNmo>xpmj%7%PW^FbLHMh-naKm sv~RtQ|GnmJ;`Sfv7XMft{`|vq-8?MG{`PeaV4N^`y85}Sb4q9e0Nl~&J^%m! delta 361 zcmZ3_vXFU#W4&B}Pl&6jscAw&LSSHEeSJLx1B05HnwXeaPfv4pb`p@w?p_iBq_|3g z{DS|(0K=v;I_H6+oCO|{#S9F52SAuH>slu#Q1F|li(`m~_uDDC{LKnHE!ozI|Nh(W zk+c2f7CLhO0okro zrWZSh9{t{W@Xeiuf>MKv2No>*F=PMjhAJa-pXEC?o`}A^C+|w>>hJBYwg(FvZSr1u zn$Os3WS|pKd*5|!v*{V3XW1PuUMw+hsWOUZ=Cyrz<-=3X^KFq=7CSy-zq(>^nD`fq zb4iPM&L0XrC@bm=)E)6#yF#0>e9hsOpcU#9991l?2%qvPSfM^;Ip?z@9aTydZ$2g& zzB+kFAjZehZs%F)wew`eczq-!BK&_!H_bQ5xy`-K#MHBS;!|T_7%+Ic`njxgN@xNA DW@w(^ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png index 9f70f39c0fba0fabcea0991081cadcd0bc41d1fc..1f499d89c641afb9e6576fbc27c196e37906d70c 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH00007qdHS3AL6AjMS@ zmR-Sv|*9(MArHh+a66%>OWGj*X+z9Io{JzGJ&F3N^h1O2*`Gw zGQHS2^yv52gKzFM6qFiVJg{Kdj~V-KH&hv!`z+tF@kI3PJ$YA3SATDJwLMtaXp{HK z(|pEOBLkg?+WW3+n@!IMJ zoJ(57bN*21L0M5}pzes@+7;T2GN>8Mhwc=IvI z@YTsX0x>?0c012Xubn3&#_J;?5#j$+x@o>a&TZ~>CZ?Xv6Q3Fb!+^ol)z4*}Q$iB} DY0;kL diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png index 8f016fc6eb085f2859b1e4b08302001d5d00d8ca..25eb700cab5706481e20e710b8ddef7dc539c8a5 100644 GIT binary patch delta 504 zcmVB-6z0000FbW%=J|NsC0|NsC0|NsC0|Nj8g+?b&N000SaNLh0L z01m$Z01m$aI0aKA0004SNklb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000EamT;r(_>E`PHEPfNCS;=lj) zd*p0?IR>7Yr0TsbUH|CqrwxmQC$iSB*!F08QvZ>Hy=G??$?=|!k_i;OQhKxOKtQ(Z zlB9(;4Bp`g^@;(-Ore$3c^yP?X++-LcYjVGdS@5#GTy83&&tL?$UMw`4> zp5`;Q8X4$B)ZTYp+iZG9=vj8hix*4GTdIuWnR#s=Uit8p^L$(6mBo&a*srcw947w7 z;#|@qp7V!756X%<19eCI)~?WIEMIfDC1{2E1Vb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000CARyay z%JgFA(4*g555Bq6P*7@c@xX#*KW6N|-B4v@?z4Qy#uL%E_vBqEUH!e?)%IXvqfOo` zPxBdDjSO@mYVW(QZ8kk4^ensM#fv58EmcPG%)GV_uY7pQdA=?3%3{Yy>{nMT4io=k zaV}{Q&-p{42W3T_fx07pYgcG9majS760|~nf}@JX72#7p1uN92Ea!Z7q@zly;?2h- z!&fKo2*mg}+U-0my>_0A7_X0nM1=oO>8AMxIk&mjnV5PuPkd?&3lRnl>h($(1whd0000FbW%=J|NsC0|NsC0|NsC0|Nj8g+?b&N000SaNLh0L z01m$Z01m$aI0aKA0004SNklb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000fSSo|bIu#DD+o z_sH4)atu5(N!5E>y8hAIPa75qPh_oMvF*|Hr2ZoXd(F-)lH)xcB@-xmrSxXmfq-n+ zDbtIcLyvxMJ^1EMLqVy*#RChL{g|=;c0-ksxzF+)8&5>v-jjEwboKXkSKEVyjW&6& zJk4ipH8RkNsJ-vHw%PQI(6j807cZ8Ww^SL$GxOR$yz=2G=lQnCD~lZ;v0q)WI86MD z#kr(KJm(LE9+VYz2I`LZtzDtbSia_POVA4S363fjSAsV z3}2nRBM{@`Xt(pM^xAncV!S>Q5)uACrJLp(b}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000mR-Sv|*9(MArHh+a66%>OWGj*X+z9Io{JzGJ&F3N^h1O2*`Gw zGQHS2^yv52gKzFM6qFiVJg{Kdj~V-KH&hv!`z+tF@kI3PJ$YA3SATDJwLMtaXp{HK z(|pEOBLkg?+WW3+n@!IMJ zoJ(57bN*21L0M5}pzes@+7;T2GN>8Mhwc=IvI z@YTsX0x>?0c012Xubn3&#_J;?5#j$+x@o>a&TZ~>CZ?Xv6Q3Fb!+^ol)z4*}Q$iB} D+=HJ( diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png index 21cc02660279da75123c22e7610b8b4927863e76..ac61d4fa4d845c8cad4efb1c82591c8fca40a854 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH0000PnMg}?&wf9}uHk+OidY0Ys;>8m4mMWuoW?tKeS3W%DJl__1WwGNU_Nyxvhlzi& zIG41D=lr42gR-K|K;03)wJWq4%hw!k30k2(!BNHHits6)f)(mhmUBKk(ov;U@#bTa z;j5E(1Y&#~?RK7(UOP`ljMqm(BEtWtbklr;oZH;%OiVqSCq6X>h5>`8tDnm{r-UW| D2vwhI diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png index c78517fb862a240132a24bb41b746d6ca43066d5..42c4ce711e8ac21ae02d40425e8a4ddade4f6748 100644 GIT binary patch delta 504 zcmVb}m3={^X$k6=%=YMu}nCUbkp6P459-~-n z7F{+Gm2wCVT_5BXv~oj4iM%Xwd#8I zBm4^&L3mGq_|PoIK*XM1eP74AUmK|w@D0l3K*I1F|_b6AbkUi+h4>Ggi9eA zIp4Sxl4kkFrLZNuQ9v)zN1q2wPWTt73`U~!w2+Ba%-o0a<1T5B&#Ig?U@ z&|AYqHEKO0P&;*!e4@^l9^neqas^B(z9PherQsp`3vrlP{GU_-gw}ib7pUuYC;(f6 zDL^A3*aowhL_*N-g5b5c1y}eN$h_FK1y}eN;s_Du%@Izxg4|~zCXg!J6)H+?3Tdgm uSq<&pG%MQeU;C`xVYm1vIQ|6T`TPRcH&$Xl+t&yH00004nJ@ErhQ#;j|doIt^Eo-U3d9^P-K%lj78VX7cE*@C0?8l7#w;QUA%zc*c*mxrP_MW^erK`WUyV@QsY_!RH z@fnmVl>FVdQ&MBb@ E0O81^JOBUy diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png index f36b2ef95a17a675ba6f1c5a7e536fa30133d4b6..869b0ec60720f92a3c65c89b1b3adc2911a951f6 100644 GIT binary patch delta 504 zcmZ3;yq;x(W4&&GPl&6jscA?^NJ2tFU|^uOwsw7e{r?*b{~vg&si_qe6^V(7z1gkw z=eWw<^$H9?@b;7&kmN53@(cct0vN8`nXwQk#aZAHSF+<# z{L$mC!kceX1AcJ^tX;Bg`g4Ab#GcN{8D}O6@(DbX+4`#LoAMuSamNb(h94JnjyW7z z-*PH6f11`0MbkgruP#R)FiiU){;uC)g7CwQ3MYQ5b=S^{TESVk$nuiY-Dy^{j@Cb# zc4+^HOYc7D$FNM3U8rEaAZ)uQPdS&w%=d;{KIkjdGI!sOKO)fLtte@Ee}~AVw4cY8 zZcyD5=%9bmeLlO7-w*K>Jj~AyPDuHfnNT=;$}RJ((%DmgU5U!p_p+QE)O;cOu#0Jy zt#W{M>7<%P=cdU$Z7$!=}6Pkhl+o=3ui?BnIFQ~a;+L@((5t}hUg|u2W7<@ zY@27eI9+((^kD0D*6<(VC-&Uf3Zfrz2tGS2=(nTkPP(Gn1g$%wT3)$anJf23^1i)i rqJ8Ua{O>h)6Sx0RxA@2M@aG?<>*ire_P4KdfMU(l)z4*}Q$iB}y_@Mx delta 361 zcmZ3_vXFU#W4&B}Pl&6jscAw&LSSHEeSJLx1B05HnwXf_pW`ZDH;V(ghsCE~22xxl zL4LviVSr)N8J+V$QO*L7$YKTtz5^i4n02j_6Dau2)5S5w!~5-&T>fSSo|bIu#DD+o z_sH4)atu5(N!5E>y8hAIPa75qPh_oMvF*|Hr2ZoXd(F-)lH)xcB@-xmrSxXmfq-n+ zDbtIcLyvxMJ^1EMLqVy*#RChL{g|=;c0-ksxzF+)8&5>v-jjEwboKXkSKEVyjW&6& zJk4ipH8RkNsJ-vHw%PQI(6j807cZ8Ww^SL$GxOR$yz=2G=lQnCD~lZ;v0q)WI86MD z#kr(KJm(LE9+VYz2I`LZtzDtbSia_POVA4S363fjSAsV z3}2nRBM{@`Xt(pM^xAncV!S>Q5)uACrJLp( Date: Mon, 27 Mar 2023 18:18:05 +0600 Subject: [PATCH 10/13] Revert "Perish" This reverts commit 5b0988f08e5ae8d7cdccd8d7f2a628ef249c20dc. --- .../textures/block/android_station_em.png | Bin 0 -> 487 bytes .../textures/block/batterybank_core_em.png | Bin 0 -> 166 bytes .../textures/block/chemical_generator_em.png | Bin 0 -> 200 bytes .../textures/block/drive_rack_em.png | Bin 0 -> 195 bytes .../textures/block/drive_viewer_em.png | Bin 0 -> 209 bytes .../block/gravitational_stabilizer_em.png | Bin 0 -> 261 bytes .../block/gravitational_stabilizer_idle_em.png | Bin 0 -> 192 bytes .../textures/block/item_monitor_em.png | Bin 0 -> 216 bytes .../textures/block/matter_bottler_em.png | Bin 0 -> 227 bytes .../textures/block/matter_decomposer_em.png | Bin 0 -> 221 bytes .../textures/block/matter_panel_em.png | Bin 0 -> 216 bytes .../textures/block/matter_recycler_em.png | Bin 0 -> 242 bytes .../textures/block/matter_replicator_em.png | Bin 0 -> 227 bytes .../block/matter_replicator_halted_em.png | Bin 0 -> 213 bytes .../block/matter_replicator_offline_em.png | Bin 0 -> 180 bytes .../textures/block/matter_scanner_em.png | Bin 0 -> 246 bytes .../textures/block/matterybank_core_em.png | Bin 0 -> 169 bytes .../textures/block/plate_press_em.png | Bin 0 -> 195 bytes .../textures/block/storage_power_supplier_em.png | Bin 0 -> 197 bytes 19 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png new file mode 100644 index 0000000000000000000000000000000000000000..2e734afc4fd9c7c71b0f4d0ab1359005636b9392 GIT binary patch literal 487 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0eneBK~!i%?U*}~ z!Y~Ym2`8bX-f~aCUV)>~?#!NG>y%spPC=bA71zk>cciSHI3|8D%mjTi9?LRTB-x6A zjgPL`bSw_|bn7K012Gv|cQ)(q`RGD(%2VjtuMUleUbfsT>*0ONP+!H0q9}@@D2k$_ zQqj-n6U!~NrrKR@r29Y*C1muY@t)caW77YiPsVZ}nw+%){vSZ(CNjH0=i||QEO4Od z#Xil_ST!Lum%=vFpvhhiFaL|C;(h|{^N~dZW$Mi00M0`0mIO0^ht55i#cYzcK%&l# z9%OAn5hR@{X)U=GQRFy1A;nn9$Z-e{z1SO`GoIq;BFNw`i_y?p=b)y5>lhByQc@D3 zJ%%iL0#`98a~&(nt3eeEb#0$^se)2?s>vV@9PDx$e`w5{bM`|*0nj|&AD`4}a~rY( zb$!Ly=F!7MHp=DT?c37&v&n#X%@cy-OemryaFB@lPVFl8obLlmoDhdu<-qF=R#3pP d`ETcP`vVHg@#5aAlA-_r002ovPDHLkV1mYh*@XZA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png new file mode 100644 index 0000000000000000000000000000000000000000..268923c4edad2fd02a997f4c0e400c6b53ec643d GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j10c+pb*+;VC}{2J;uzxLoh-r1%qy|bMB>l>gCFEi9pRQR z4fqNn{1`ISV`@iy0XB4uLSEsD@VqP%zfh#W5tq`Rye~t_A}hmx~Wht-ktuRe0e` z!#hW>u!-whI=rYi;Ngj!>gBH=xVO75_v6p)w>x{Ib{~7bMeO~>s3@k{>brk1&fBb7 kP_b$DKX#yzP%xwM1h@PIDTXaSMUp{6p00i_>zopr07tn%)c^nh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png new file mode 100644 index 0000000000000000000000000000000000000000..b25583f22bd9859935393a8f416d8f7b228f1b7e GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~$#S7!u+B_JSc-gMom{#iOTIAN{>5eB&31 zve(CYqCB*i#s0A$KCr>Hw!ixF#J20!+!6s6hm%ky9kKy>FVdQ&MBb@0OY(w>i_@% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png new file mode 100644 index 0000000000000000000000000000000000000000..0ea676437cad35f06d5d2e70ff618fa147c98a34 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uUY_j)~cCfr4qCE{-7?&TlUtNn{1``2&1HT;2cgHa|Au{{zqeH-JJ6=igc{1yZafL4Lvifq>!nHojn>0B3Nn{1`ISV`@iy0XB_Jc5^1#7ShP%zZf#W5tq`R%2RoDBv7Z5O+RceFEiFz=ZE zdPjrb1G&5fEI|>{0*dcV> z?wFYU7AWZH>Eak-;s3VJkPm3xk%s^FQT!5ljJ@65y+#vmX_P&16HwaD!gBY=1uua) z>lh9yPi?3OFW6--uv1mxNb;TIPUkreavZEbn8T>W&+h%g(a9QUD1)b~pUXO@geCxi CCqerF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png new file mode 100644 index 0000000000000000000000000000000000000000..ab1db4e56584b986ad53fd32021226e08d421591 GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`MFV_7T>sx-`2WCjD+9xS1_t;4yUmYH0LqvbB+3CP_L3mK;QwI2Amz>M z1{C5f@Q5sCVBp&i!i*NI!74yO7f%<*5D)LS=dAe{99Ucf=S%*MH(E4fUXoH}_~OE* zHL`|Bzj7qVG1=P-h^}1AyW-lmZ_U>kEX>o)0~i@50MT0ZGcpqn=|_reeF8F%!PC{x JWt~$(69CbuMHv79 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png new file mode 100644 index 0000000000000000000000000000000000000000..8ad97db8e80898e5d500bd2fb9530bf30831eef8 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yy8qv8ery7e_y2HU1(0Gc3Gxg6|DWOdDPEvj2F?PH$YKTtzWpG~ zXu%q+0u=P~ba4!caDRKwkc&Z)hxOu&-||uW*tTry=x(x3R`mSX@iUEqfs4UmFTt!Ag2R9yR^A%s7X!t5pj!rP2lKQ>Mz#ey_=E3N)F))78&q Iol`;+029bUeE{L}al6>d5(|L}A90%(U<}hmUvwOdAbg~8-%HZkh=d#Wzp$Pym C)j=u% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png new file mode 100644 index 0000000000000000000000000000000000000000..6b48c2cb83aa06724c66ab7c6c4b34e65e6611e4 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheq5(c3uK#Z^{D0uNm4V?u1B3hj-R8$80Ak literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png new file mode 100644 index 0000000000000000000000000000000000000000..09c99d763d0c544a593267a517324e41b06d089d GIT binary patch literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe`~f~8uK#Z^{D0tSer$sK|J^{bJx{VX0V&p!Aiv=MK)~>O8(%O`fV03O zvY3H^Z$Ah#TCfJI00n(KT^vI^ypt0Y8D1=EXlxWbb&Tsp5))&CFQc$A50fQx3KN$^ zCFAYgY_Hvsq?eN4gk$% N@O1TaS?83{1OOABKgIw6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png new file mode 100644 index 0000000000000000000000000000000000000000..a83f9bd046d862e762a1f8f640e6d8e06a8096c4 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLD46Bx;uwx7?gIb zZ-2z#_dqUBVCA={FG`F4?ssO+V!; zzPrTIjeDWI_R4$gc4}#=YKvyYT#}x6@Kj9fmc7wSP2+Q&`F7Ps zw8W#;{oCdXvkNSKd$e?ag7fOiJJ)y^4wx@3+f)CxY31UZGapLsH?Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matterybank_core_em.png new file mode 100644 index 0000000000000000000000000000000000000000..9e65bdf498bb663bbb3f000469a5be62620b5b2f GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j{UFR}!5XXr6twenaSZYBPL^P0=9O4zA~8dL_6PY>N4Wi> zL>IhR%(6h@$-jE@K)xF%UwBEg_p}|z-~bXGJdJ?{2O1g~8It%kxRoQ#Hv&y!@O1Ta JS?83{1OTgwEpq?> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png new file mode 100644 index 0000000000000000000000000000000000000000..2340c4106a9b650d56009553157a9759e9d9c5c2 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP%y&N#W5tq`Rye~t_A}hmx~9dhOhn}y8h9n zH=mZT&(l4Zsk8A?R26gdl(XL%&fk=_Sd_Eu fKO@jMC`eP-yI)_5A?2I(2at%TtDnm{r-UW|Z7G;uwkXbecq)78&qol`;+09P$PTmS$7 literal 0 HcmV?d00001 From 8928e8e31bf6e8eed9a0128cc4ba3165d1ea5521 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 27 Mar 2023 18:27:57 +0600 Subject: [PATCH 11/13] Perish 2 --- .../textures/block/batterybank_core_em.png | Bin 166 -> 0 bytes .../textures/block/chemical_generator_em.png | Bin 200 -> 0 bytes .../textures/block/drive_rack_em.png | Bin 195 -> 0 bytes .../textures/block/drive_viewer_em.png | Bin 209 -> 0 bytes .../block/gravitational_stabilizer_em.png | Bin 261 -> 0 bytes .../block/gravitational_stabilizer_idle_em.png | Bin 192 -> 0 bytes .../textures/block/item_monitor_em.png | Bin 216 -> 0 bytes .../textures/block/matter_bottler_em.png | Bin 227 -> 0 bytes .../textures/block/matter_decomposer_em.png | Bin 221 -> 0 bytes .../textures/block/matter_panel_em.png | Bin 216 -> 0 bytes .../textures/block/matter_recycler_em.png | Bin 242 -> 0 bytes .../textures/block/matter_replicator_em.png | Bin 227 -> 0 bytes .../block/matter_replicator_halted_em.png | Bin 213 -> 0 bytes .../block/matter_replicator_offline_em.png | Bin 180 -> 0 bytes .../textures/block/matter_scanner_em.png | Bin 246 -> 0 bytes .../textures/block/plate_press_em.png | Bin 195 -> 0 bytes .../textures/block/storage_power_supplier_em.png | Bin 197 -> 0 bytes 17 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/gravitational_stabilizer_idle_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_panel_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png delete mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_power_supplier_em.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_core_em.png deleted file mode 100644 index 268923c4edad2fd02a997f4c0e400c6b53ec643d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(K&H|6fVg?4j10c+pb*+;VC}{2J;uzxLoh-r1%qy|bMB>l>gCFEi9pRQR z4fqNn{1`ISV`@iy0XB4uLSEsD@VqP%zfh#W5tq`Rye~t_A}hmx~Wht-ktuRe0e` z!#hW>u!-whI=rYi;Ngj!>gBH=xVO75_v6p)w>x{Ib{~7bMeO~>s3@k{>brk1&fBb7 kP_b$DKX#yzP%xwM1h@PIDTXaSMUp{6p00i_>zopr07tn%)c^nh diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_rack_em.png deleted file mode 100644 index b25583f22bd9859935393a8f416d8f7b228f1b7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSK$uZf!>a)(7~$#S7!u+B_JSc-gMom{#iOTIAN{>5eB&31 zve(CYqCB*i#s0A$KCr>Hw!ixF#J20!+!6s6hm%ky9kKy>FVdQ&MBb@0OY(w>i_@% diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer_em.png deleted file mode 100644 index 0ea676437cad35f06d5d2e70ff618fa147c98a34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uUY_j)~cCfr4qCE{-7?&TlUtNn{1``2&1HT;2cgHa|Au{{zqeH-JJ6=igc{1yZafL4Lvifq>!nHojn>0B3Nn{1`ISV`@iy0XB_Jc5^1#7ShP%zZf#W5tq`R%2RoDBv7Z5O+RceFEiFz=ZE zdPjrb1G&5fEI|>{0*dcV> z?wFYU7AWZH>Eak-;s3VJkPm3xk%s^FQT!5ljJ@65y+#vmX_P&16HwaD!gBY=1uua) z>lh9yPi?3OFW6--uv1mxNb;TIPUkreavZEbn8T>W&+h%g(a9QUD1)b~pUXO@geCxi CCqerF diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_em.png deleted file mode 100644 index ab1db4e56584b986ad53fd32021226e08d421591..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`MFV_7T>sx-`2WCjD+9xS1_t;4yUmYH0LqvbB+3CP_L3mK;QwI2Amz>M z1{C5f@Q5sCVBp&i!i*NI!74yO7f%<*5D)LS=dAe{99Ucf=S%*MH(E4fUXoH}_~OE* zHL`|Bzj7qVG1=P-h^}1AyW-lmZ_U>kEX>o)0~i@50MT0ZGcpqn=|_reeF8F%!PC{x JWt~$(69CbuMHv79 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_em.png deleted file mode 100644 index 8ad97db8e80898e5d500bd2fb9530bf30831eef8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yy8qv8ery7e_y2HU1(0Gc3Gxg6|DWOdDPEvj2F?PH$YKTtzWpG~ zXu%q+0u=P~ba4!caDRKwkc&Z)hxOu&-||uW*tTry=x(x3R`mSX@iUEqfs4UmFTt!Ag2R9yR^A%s7X!t5pj!rP2lKQ>Mz#ey_=E3N)F))78&q Iol`;+029bUeE{L}al6>d5(|L}A90%(U<}hmUvwOdAbg~8-%HZkh=d#Wzp$Pym C)j=u% diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_em.png deleted file mode 100644 index 6b48c2cb83aa06724c66ab7c6c4b34e65e6611e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheq5(c3uK#Z^{D0uNm4V?u1B3hj-R8$80Ak diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_em.png deleted file mode 100644 index 09c99d763d0c544a593267a517324e41b06d089d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 227 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3-pQ0$S$)DaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(ehe`~f~8uK#Z^{D0tSer$sK|J^{bJx{VX0V&p!Aiv=MK)~>O8(%O`fV03O zvY3H^Z$Ah#TCfJI00n(KT^vI^ypt0Y8D1=EXlxWbb&Tsp5))&CFQc$A50fQx3KN$^ zCFAYgY_Hvsq?eN4gk$% N@O1TaS?83{1OOABKgIw6 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_em.png deleted file mode 100644 index a83f9bd046d862e762a1f8f640e6d8e06a8096c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDaPU;cPEB*=VV?2IV|apzK#qG z8~eHcB(eheoCO|{#S9F5`$3q|f;CtLD46Bx;uwx7?gIb zZ-2z#_dqUBVCA={FG`F4?ssO+V!; zzPrTIjeDWI_R4$gc4}#=YKvyYT#}x6@Kj9fmc7wSP2+Q&`F7Ps zw8W#;{oCdXvkNSKd$e?ag7fOiJJ)y^4wx@3+f)CxY31UZGapLsH?Y diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/plate_press_em.png deleted file mode 100644 index 2340c4106a9b650d56009553157a9759e9d9c5c2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`ISV`@iy0XB4uLSEsD@VqP%y&N#W5tq`Rye~t_A}hmx~9dhOhn}y8h9n zH=mZT&(l4Zsk8A?R26gdl(XL%&fk=_Sd_Eu fKO@jMC`eP-yI)_5A?2I(2at%TtDnm{r-UW|Z7G;uwkXbecq)78&qol`;+09P$PTmS$7 From 828b8d103935c67a6408180c60550a953e6c8c98 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 27 Mar 2023 18:53:55 +0600 Subject: [PATCH 12/13] Add a slight animation to Android station's holograms + LET IT GLOW --- .../models/block/android_station_working.json | 43 ++++++++++++++++-- .../textures/block/android_station.png | Bin 1220 -> 544 bytes .../textures/block/android_station_em.png | Bin 487 -> 1036 bytes .../block/android_station_em.png.mcmeta | 7 +++ 4 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json index 7a63ccca3..200020ecc 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json @@ -1,6 +1,8 @@ -{ +{ + "credit": "Made with Blockbench", "parent": "block/cube_all", - "render_type": "translucent", + "render_type": "translucent", + "texture_size": [16, 32], "textures": { "0": "overdrive_that_matters:block/android_station", "1": "overdrive_that_matters:block/android_station_em", @@ -127,11 +129,44 @@ } }, { + "name": "hologram", "from": [-1, 10, -1], "to": [17, 10, 17], "faces": { - "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}, - "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"} + "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"}, + "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#1"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "hologram", + "from": [6, 9.5, 6], + "to": [10, 9.5, 10], + "faces": { + "up": {"uv": [11, 11, 13, 12], "texture": "#1"}, + "down": {"uv": [11, 11, 13, 12], "texture": "#1"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "holotext", + "from": [1, 10.5, 3], + "to": [8, 14.5, 3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5.5, 13.5, 1]}, + "faces": { + "north": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"}, + "south": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "holotext", + "from": [8, 5.1, 12], + "to": [15, 9.1, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [5.5, 13.5, 1]}, + "faces": { + "north": {"uv": [5.5, 7.25, 2.5, 8.25], "texture": "#1"}, + "south": {"uv": [2.5, 7.25, 5.5, 8.25], "texture": "#1"} }, "forge_data": { "block_light": 15, "sky_light": 15 } } diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png index eb34ef1546f1d122a34b4201eb0f70e2b22fd797..be4d27d190e6712537f7325913d556a616acb275 100644 GIT binary patch delta 481 zcmX@YxqxMYBnLAC1A|XM>zs*-3aK^$J|V6lAt6OYMPg!N+S=L)2??gAruFspa&mHN zYHD0uT>t<7zkU05T4hUaQ-4TGZft&4dH?LjSu1*1YzG>|xqQ+hASF@~qK^d*iRql!^jsg0gIdl%#hSzk0jB{k_rOf2vUCcdgG;9#gLh z>BlD|@0_;Gepu@BrZ@Hc?NilG8s7`IdnR7~Cv>1de}e*ZoI78Nz`K^1xk2m`vafO4 z?Z5B9cc1%tiKB3Z!j_e%JbqNSnS}FVdQ&MBb@0A-Qe5C8xG delta 1183 zcmV;Q1YrB11jGrD83+ad004WAb*_;iAb$yPNLh0L01m$Z01m$aI0aKA000D8Nkl^yYHCVL5;Zk7aXWH= zK0g^Y0F|MkA*!pZqs7HV7APw#qwVc&&IQzKYHDbHex7=IdYpkLCML8*I9gjuF8+}z|z=3gz)>gp<&kt2P6`G1A$kO872UP*tD1X%#x1eYvmX=%x=t*tqO2LVw< zs;sQcM<7lf_AT++dL{IkSQ{W4P3X-eb!j(dA9Sq^fM-#GZtM|ov+?N?CqH6|fGySr zxDOYT^3!iQ`2k&P18@*U1-h|EU@()7@fnz!`v}DJ4>llil(QhDVa<2^AFxSW1%ZP4%Uvs{M&2A7GBojA)f0%Qfzb@vNs|M>a^ox5_w$p!l* zxYg%401lTQ(Iuj-jr^NI+JB_(CKdyx-@nl{Z`@1irt!k%_zb{1F${QH!T{@Yz#a0i zK-by;uXPPWY$st<_H_vmy?u)SzKmG*fDN%l0N#W}&V_$}69TVOE-3r91cJ2z*ho<$ zfUh9d%g8ShFwpBlYF5{B?AI}XXNZi~AtmjSC+-Y9<^htbvZ)%8SAQI>WMMC|Ki70g zd8XursQQV%djmQ1Wm60^L)ax|2v$Mm0!&FsOQE6#u z!DccykXsf%EYNPFpUBN!yURU9b1Kaw>c=KkTQhPrqKw?ApHitF_47A>q%k;NL>M#( zFaR$i7{&&u!5`?pP=7%8%=Lvd2EspQ5&12(u*Jv{#$ZB!!VO$VqIjS>;cg!k-^MCgCIs@H)FschKL+= z0QNu|mlQC<&k#RDajqkU`FRdm(Ze1XRG#$ezECLL4s{tl!&hKlMt*o*Mg?A>Y}O^$ ziN6e$aE;eva({Q|F+s5;K*#3uJ>Y=Y;G5mrNhPp#2Fs7JCLC{XZ>u)NJ x%XkG(vLHr?!Mdpctj0Kd1{eW{|o>C002ovPDHLkV1f`29##MV diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png index 2e734afc4fd9c7c71b0f4d0ab1359005636b9392..253476d7d4b5ec890b7488a4b7dd855abc2e816c 100644 GIT binary patch delta 980 zcmV;_11tRJ1B?ie77GCY2nGNE0Mem!c99`8e*>XOL_t(|UhSMca^o-zg_E2l<<=?p z1j!Y0lx=rrPq1~$Tp>9{YL~9|8eTk@@K7`*Qy@dj()(r<@y8+on2<~Xle-*;-Q6J+ zPvqLxi^l?UEVOQGzWpB8ZmN%b3y1y70Y|82c?f5+9=7X-ycH8d2q8DiJ^siq*I!zB zfBg6p*8$q3{wnA9(9|AG7*E=h`*h-<@lz;&#r;-!{cERT4ye|v;p%Rvk7F-b3u6|PzSmGxf8=x7$GOV_rHc@gj!kU11Td|~w4X!OS1?8C zS8y_Csaaz@*EFF<=rcTnwbUGo@cCFg4m>uvN6;c)+J^CUxjA2Et5fR6`(;_X8UJf0Es*zND~S zZP>-0B4gIy983~V)RQ=HsX)tAYpH+Re_+T85Q<$`#>NCzNG;Ket6PA3!`KU$KfwF} z56mB!dU0J8ymncjbP;0Gv55_r0H*br_H$tVfQuTT&+rV^QgbXq<_|D`fNUELUWc-- z{L~9tk?|(Q1YrJvnTGiTe@ZT-vaK+S#{zRKv~FuMe_&CFuQPvOgD`)fgmvGF2_b}# znBQGgwQ_u?U$z z!2AKSZ8Uft%DVDXFK9)^n-mj(`2%K}t>q7VeEkQIFJlf-aXZ}r0000UX59oj4|bFw6vfGakz_RwUVqfsK!@*>o%p_;l+f zB?B=TT6Z?<@A>FLbIMcb+OH0chhDbaE9>EX%TQm%ilQirq9}@@q*Bq(=M&2Bg!0`2pWMFVB(%;EsfLhhCXGk}NAJ($I8lD0si&W#>qZ9x$vohfN8 zxfN05I6Wc7Sjot72oJs38=f7wpr(N97!K4@QWBv(hAeslS1~Aa z9V^PKK@|*jZJ&0jf>L;@$si6K>~b1^Xv~~*_CrDe&^+EBpVVq|8?pj*eZ|=3(ZfVG z%H`ng+tT{8$$)sx6N2MRD552Bkcj$D?JD-1?*mJm5Qkai!0QcGP{6VIZ|8FR6$1*( V@#5aAlA-_r002ovPDHLkV1jmw&zt}N diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta new file mode 100644 index 000000000..fa950acdd --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_em.png.mcmeta @@ -0,0 +1,7 @@ +{ + "animation": { + "frametime": 16, + "width": 32, + "height": 64 + } +} \ No newline at end of file From 7d5a585897b413de31889a9061f134f6ff73c6da Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 27 Mar 2023 18:55:21 +0600 Subject: [PATCH 13/13] perish 3 --- .../assets/overdrive_that_matters/optifine/emissive.properties | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties diff --git a/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties b/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties deleted file mode 100644 index 55ac3b130..000000000 --- a/src/main/resources/assets/overdrive_that_matters/optifine/emissive.properties +++ /dev/null @@ -1 +0,0 @@ -suffix.emissive=_em \ No newline at end of file