From 45185db2b1fd13b15cd57821542ed1b0fc500abd Mon Sep 17 00:00:00 2001 From: GearShocky Date: Mon, 16 May 2022 01:16:04 +0600 Subject: [PATCH] Floor tiles, vents and colorless tritanium building blocks; Storage bus, importer and exporter models (Dbot i made the models, now please make them work with cables) --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 12 ++ .../ru/dbotthepony/mc/otm/registry/MBlocks.kt | 31 +++++ .../ru/dbotthepony/mc/otm/registry/MItems.kt | 4 + .../ru/dbotthepony/mc/otm/registry/MNames.kt | 5 + .../models/block/storage_bus.json | 124 +++++++++++++++++ .../models/block/storage_exporter.json | 128 ++++++++++++++++++ .../models/block/storage_importer.json | 128 ++++++++++++++++++ .../textures/block/decorative/floor_tiles.png | Bin 0 -> 400 bytes .../decorative/tritanium_block_colorless.png | Bin 0 -> 413 bytes .../textures/block/decorative/vent.png | Bin 0 -> 573 bytes .../block/decorative/vent_alternative.png | Bin 0 -> 517 bytes .../textures/block/storage_bus.png | Bin 0 -> 237 bytes .../textures/block/storage_exporter.png | Bin 0 -> 239 bytes .../textures/block/storage_importer.png | Bin 0 -> 243 bytes 14 files changed, 432 insertions(+) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/storage_bus.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/storage_exporter.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/storage_importer.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/floor_tiles.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_block_colorless.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/vent.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/decorative/vent_alternative.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_bus.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_exporter.png create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/storage_importer.png diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 55848246b..5cb26ab11 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -131,6 +131,10 @@ object DataGen { decorativeCubeAll(MBlocks.CRATE_LIST) decorativeCubeAll(MBlocks.CARBON_FIBRE_BLOCK) decorativeCubeAll(MBlocks.TRITANIUM_BLOCK) + decorativeCubeAll(MBlocks.TRITANIUM_BLOCK_COLORLESS) + decorativeCubeAll(MBlocks.VENT) + decorativeCubeAll(MBlocks.VENT_ALTERNATIVE) + decorativeCubeAll(MBlocks.FLOOR_TILES) for (glass in MBlocks.INDUSTRIAL_GLASS_LIST) { decorativeCubeAll(glass) @@ -236,6 +240,10 @@ object DataGen { block(MItems.TRITANIUM_RAW_BLOCK) block(MItems.ITEM_MONITOR) block(MItems.TRITANIUM_BLOCK) + block(MItems.TRITANIUM_BLOCK_COLORLESS) + block(MItems.VENT) + block(MItems.VENT_ALTERNATIVE) + block(MItems.FLOOR_TILES) for (glass in MItems.INDUSTRIAL_GLASS_LIST) { block(glass) @@ -388,6 +396,10 @@ object DataGen { simpleBlock(MBlocks.CARBON_FIBRE_BLOCK) simpleBlock(MBlocks.TRITANIUM_RAW_BLOCK) simpleBlock(MBlocks.TRITANIUM_BLOCK) + simpleBlock(MBlocks.TRITANIUM_BLOCK_COLORLESS) + simpleBlock(MBlocks.VENT) + simpleBlock(MBlocks.VENT_ALTERNATIVE) + simpleBlock(MBlocks.FLOOR_TILES) simpleBlock(MBlocks.TRITANIUM_STRIPED_BLOCK) simpleBlock(MBlocks.MATTER_CABLE) simpleBlock(MBlocks.GRAVITATION_STABILIZER) 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 0692d9388..adaa9e679 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -97,6 +97,14 @@ object MBlocks { .strength(4f) ) } + val TRITANIUM_BLOCK_COLORLESS: Block by registry.register(MNames.TRITANIUM_BLOCK_COLORLESS) { Block( + BlockBehaviour.Properties.of(Material.METAL, DyeColor.WHITE) + .sound(SoundType.BASALT) + .requiresCorrectToolForDrops() + .explosionResistance(80f) + .strength(4f) + ) } + val TRITANIUM_STRIPED_BLOCK: Block by registry.register(MNames.TRITANIUM_STRIPED_BLOCK) { Block( BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_BLUE) .sound(SoundType.BASALT) @@ -113,6 +121,29 @@ object MBlocks { .strength(3f) ) } + val FLOOR_TILES: Block by registry.register(MNames.FLOOR_TILES) { Block( + BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_LIGHT_GRAY) + .sound(SoundType.STONE) + .requiresCorrectToolForDrops() + .strength(3f) + ) } + + val VENT: Block by registry.register(MNames.VENT) { Block( + BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_BLUE) + .sound(SoundType.BASALT) + .requiresCorrectToolForDrops() + .explosionResistance(80f) + .strength(4f) + ) } + + val VENT_ALTERNATIVE: Block by registry.register(MNames.VENT_ALTERNATIVE) { Block( + BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_LIGHT_BLUE) + .sound(SoundType.BASALT) + .requiresCorrectToolForDrops() + .explosionResistance(80f) + .strength(4f) + ) } + val CARGO_CRATE: Block by registry.register(MNames.CARGO_CRATE) { CargoCrateBlock(null) } val CARGO_CRATE_WHITE: Block by registry.register(MNames.CARGO_CRATE_WHITE) { CargoCrateBlock(DyeColor.WHITE) } val CARGO_CRATE_ORANGE: Block by registry.register(MNames.CARGO_CRATE_ORANGE) { CargoCrateBlock(DyeColor.ORANGE) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 6c33b2596..ce9786a7d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -291,6 +291,10 @@ object MItems { ) val TRITANIUM_BLOCK: Item by registry.register(MNames.TRITANIUM_BLOCK) { BlockItem(MBlocks.TRITANIUM_BLOCK, DEFAULT_PROPERTIES) } + val TRITANIUM_BLOCK_COLORLESS: Item by registry.register(MNames.TRITANIUM_BLOCK_COLORLESS) { BlockItem(MBlocks.TRITANIUM_BLOCK_COLORLESS, DEFAULT_PROPERTIES) } + val VENT: Item by registry.register(MNames.VENT) { BlockItem(MBlocks.VENT, DEFAULT_PROPERTIES) } + val VENT_ALTERNATIVE: Item by registry.register(MNames.VENT_ALTERNATIVE) { BlockItem(MBlocks.VENT_ALTERNATIVE, DEFAULT_PROPERTIES) } + val FLOOR_TILES: Item by registry.register(MNames.FLOOR_TILES) { BlockItem(MBlocks.FLOOR_TILES, DEFAULT_PROPERTIES) } val TRITANIUM_STRIPED_BLOCK: Item by registry.register(MNames.TRITANIUM_STRIPED_BLOCK) { BlockItem(MBlocks.TRITANIUM_STRIPED_BLOCK, DEFAULT_PROPERTIES) } val CARBON_FIBRE_BLOCK: Item by registry.register(MNames.CARBON_FIBRE_BLOCK) { BlockItem(MBlocks.CARBON_FIBRE_BLOCK, DEFAULT_PROPERTIES) } 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 bf4cff630..6209e723a 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -58,10 +58,15 @@ object MNames { // building blocks const val TRITANIUM_BLOCK = "tritanium_block" + const val TRITANIUM_BLOCK_COLORLESS = "tritanium_block_colorless" const val TRITANIUM_STRIPED_BLOCK = "tritanium_striped_block" const val CARBON_FIBRE_BLOCK = "carbon_fibre_block" + const val FLOOR_TILES = "floor_tiles" + const val VENT = "vent" + const val VENT_ALTERNATIVE = "vent_alternative" + // capabilities const val ANDROID_CAPABILITY = "android_capability" val ANDROID_CAPABILITY_RS = ResourceLocation(OverdriveThatMatters.MOD_ID, ANDROID_CAPABILITY) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/storage_bus.json b/src/main/resources/assets/overdrive_that_matters/models/block/storage_bus.json new file mode 100644 index 000000000..a2de5ab0a --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/storage_bus.json @@ -0,0 +1,124 @@ +{ + "textures": { + "0": "overdrive_that_matters:block/storage_bus", + "particle": "overdrive_that_matters:block/storage_bus" + }, + "elements": [ + { + "from": [2, 2, 0], + "to": [14, 14, 2], + "faces": { + "north": {"uv": [0, 0, 6, 12], "texture": "#0"}, + "east": {"uv": [0, 12, 6, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 6, 12], "texture": "#0"}, + "west": {"uv": [0, 12, 6, 14], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 12, 6, 14], "texture": "#0"}, + "down": {"uv": [0, 12, 6, 14], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [4, 4, 2], + "to": [12, 12, 5], + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#missing"}, + "east": {"uv": [6, 8, 10, 11], "rotation": 270, "texture": "#0"}, + "south": {"uv": [6, 0, 10, 8], "texture": "#0"}, + "west": {"uv": [6, 8, 10, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6, 8, 10, 11], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 8, 10, 11], "texture": "#0"} + } + }, + { + "from": [5, 5, 4], + "to": [11, 11, 8], + "faces": { + "north": {"uv": [0, 0, 3, 6], "texture": "#missing"}, + "east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#0"}, + "south": {"uv": [10, 0, 13, 6], "texture": "#0"}, + "west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#0"}, + "down": {"uv": [10, 6, 13, 10], "texture": "#0"} + } + }, + { + "from": [7, 11, 2], + "to": [9, 13, 6], + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#0"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#0"} + } + }, + { + "from": [7, 3, 2], + "to": [9, 5, 6], + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#0"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#0"} + } + }, + { + "from": [3, 7, 2], + "to": [5, 9, 6], + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#0"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#0"} + } + }, + { + "from": [11, 7, 2], + "to": [13, 9, 6], + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#0"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [-1.5, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/storage_exporter.json b/src/main/resources/assets/overdrive_that_matters/models/block/storage_exporter.json new file mode 100644 index 000000000..03adb6d24 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/storage_exporter.json @@ -0,0 +1,128 @@ +{ + "textures": { + "2": "overdrive_that_matters:block/storage_exporter", + "particle": "overdrive_that_matters:block/storage_exporter" + }, + "elements": [ + { + "from": [3, 3, 0], + "to": [13, 13, 2], + "faces": { + "north": {"uv": [0.5, 1, 5.5, 11], "texture": "#2"}, + "east": {"uv": [0, 12, 5, 14], "rotation": 90, "texture": "#2"}, + "south": {"uv": [0.5, 1, 5.5, 11], "texture": "#2"}, + "west": {"uv": [0, 12, 5, 14], "rotation": 270, "texture": "#2"}, + "up": {"uv": [0, 12, 5, 14], "texture": "#2"}, + "down": {"uv": [0, 12, 5, 14], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [4, 4, 2], + "to": [12, 12, 5], + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#2"}, + "east": {"uv": [6, 8, 10, 11], "rotation": 270, "texture": "#2"}, + "south": {"uv": [6, 0, 10, 8], "texture": "#2"}, + "west": {"uv": [6, 8, 10, 11], "rotation": 90, "texture": "#2"}, + "up": {"uv": [6, 8, 10, 11], "rotation": 180, "texture": "#2"}, + "down": {"uv": [6, 8, 10, 11], "texture": "#2"} + } + }, + { + "from": [5, 5, 4], + "to": [11, 11, 8], + "faces": { + "north": {"uv": [0, 0, 3, 6], "texture": "#2"}, + "east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#2"}, + "south": {"uv": [10, 0, 13, 6], "texture": "#2"}, + "west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#2"}, + "up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#2"}, + "down": {"uv": [10, 6, 13, 10], "texture": "#2"} + } + }, + { + "from": [7, 12, 3], + "to": [9, 14, 7], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 12, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "rotation": 180, "texture": "#2"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 270, "texture": "#2"}, + "south": {"uv": [13, 4, 14, 6], "rotation": 180, "texture": "#2"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 270, "texture": "#2"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#2"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#2"} + } + }, + { + "from": [7, 2, 3], + "to": [9, 6, 5], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 4, 5]}, + "faces": { + "north": {"uv": [13, 0, 14, 4], "rotation": 180, "texture": "#2"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 180, "texture": "#2"}, + "south": {"uv": [13, 0, 14, 4], "texture": "#2"}, + "west": {"uv": [14, 0, 15, 4], "texture": "#2"}, + "up": {"uv": [13, 4, 14, 6], "texture": "#2"}, + "down": {"uv": [13, 4, 14, 6], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [2, 7, 3], + "to": [4, 9, 7], + "rotation": {"angle": -45, "axis": "y", "origin": [4, 8, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#2"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#2"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#2"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 0, 14, 4], "rotation": 180, "texture": "#2"}, + "down": {"uv": [13, 0, 14, 4], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [12, 7, 3], + "to": [14, 9, 7], + "rotation": {"angle": 45, "axis": "y", "origin": [12, 8, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#2"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#2"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#2"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#2"}, + "up": {"uv": [13, 0, 14, 4], "rotation": 180, "texture": "#2"}, + "down": {"uv": [13, 0, 14, 4], "rotation": 180, "texture": "#2"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [-1.5, 1.5, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/storage_importer.json b/src/main/resources/assets/overdrive_that_matters/models/block/storage_importer.json new file mode 100644 index 000000000..4a40e0c92 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/storage_importer.json @@ -0,0 +1,128 @@ +{ + "textures": { + "1": "overdrive_that_matters:block/storage_importer", + "particle": "overdrive_that_matters:block/storage_importer" + }, + "elements": [ + { + "from": [2, 2, 0], + "to": [14, 14, 2], + "faces": { + "north": {"uv": [0, 0, 6, 12], "texture": "#1"}, + "east": {"uv": [0, 12, 6, 14], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 6, 12], "texture": "#1"}, + "west": {"uv": [0, 12, 6, 14], "rotation": 270, "texture": "#1"}, + "up": {"uv": [0, 12, 6, 14], "texture": "#1"}, + "down": {"uv": [0, 12, 6, 14], "rotation": 180, "texture": "#1"} + } + }, + { + "from": [4, 4, 2], + "to": [12, 12, 5], + "faces": { + "north": {"uv": [0, 0, 4, 8], "texture": "#1"}, + "east": {"uv": [6, 8, 10, 11], "rotation": 270, "texture": "#1"}, + "south": {"uv": [6, 0, 10, 8], "texture": "#1"}, + "west": {"uv": [6, 8, 10, 11], "rotation": 90, "texture": "#1"}, + "up": {"uv": [6, 8, 10, 11], "rotation": 180, "texture": "#1"}, + "down": {"uv": [6, 8, 10, 11], "texture": "#1"} + } + }, + { + "from": [5, 5, 4], + "to": [11, 11, 8], + "faces": { + "north": {"uv": [0, 0, 3, 6], "texture": "#1"}, + "east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#1"}, + "south": {"uv": [10, 0, 13, 6], "texture": "#1"}, + "west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#1"}, + "up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#1"}, + "down": {"uv": [10, 6, 13, 10], "texture": "#1"} + } + }, + { + "from": [7, 11, 2], + "to": [9, 13, 6], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 12, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#1"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#1"} + } + }, + { + "from": [7, 3, 2], + "to": [9, 5, 6], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 4, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#1"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#1"} + } + }, + { + "from": [3, 7, 2], + "to": [5, 9, 6], + "rotation": {"angle": 22.5, "axis": "y", "origin": [4, 8, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#1"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#1"} + } + }, + { + "from": [11, 7, 2], + "to": [13, 9, 6], + "rotation": {"angle": -22.5, "axis": "y", "origin": [12, 8, 5]}, + "faces": { + "north": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "east": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "south": {"uv": [13, 4, 14, 6], "texture": "#1"}, + "west": {"uv": [14, 0, 15, 4], "rotation": 90, "texture": "#1"}, + "up": {"uv": [13, 0, 14, 4], "texture": "#1"}, + "down": {"uv": [13, 0, 14, 4], "texture": "#1"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [-1.5, 1.5, 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/decorative/floor_tiles.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/floor_tiles.png new file mode 100644 index 0000000000000000000000000000000000000000..9fb3ee55952820e1e664d0c314d84113701d8e90 GIT binary patch literal 400 zcmV;B0dM|^P)Px#1ZP1_K>z@;j|==^1poj5U{Fj{MTv=tm6es0l$4s9nwXfFmzS58mX`kh{{8*^ z|NsBp-QC*S+S}XP&d$!**x20M+}_^a+1c69(9qxC-_g<0&(F`9nVHwu*UZe!&CSiq z%F6ru`^(GA{QUgL$jH*t(&V+M`~Uy|32;bRa{vGizW@LZzX3P}QzQTY0J%v-K~yMH zCC=G$gD?yQP(fmhHp?P5hNNl!|1T>Vz1$g%mIF}}%(r{w3~5>ba$YlH2K*KP5(|+6 z7NaT(GZuH@ZNlmzj}{Z`g}G0;aADhE$6;jF7aY}G8Z4QO*fbhu%tx%KZpRr%o1Xot zU&p?u$OOyfSl9Lc|Lf9(2VO#Ta0e72qZ1M`v-{8fb{kR~q+HnsE4)R79~<1TRwLIL uAmBRoy@)BXTxBnw?E@M%c^00004%P)Px#1ZP1_K>z@;j|==^1poj5Y*0*8MX#@~+S=OL+1cLS-q_gK+}zyV-QC;U+t$|B zv9Ym@jg5$ih=zuShlhuZjEsqiiHeGf-{0S`u(06Z;Igu^uCA{C|Nqt1)z{b8ySuyk z`udKJj;*b&tE;Pvi;MpL{=L1u`}_O-{r$7Evyal}#Q*>R32;bRa{vGizyJUazyWI3 zi3tDz0J=#;K~yMH6_DFf!$1r}eUsI&h0V5MNuiJe|NoDe2fb+IBaKDWJQR^+n4cD* z=~Fwm=a;_rZa&1bFBjD`y+&?KVSimh6(o(ACR}Co;^1v>ZZpOD7B@4a`HeOyd)w3# zfDQ%TRbpKL8=21V(}cu%Asv>qN|k|+3r2Nhc!dfY?XC_F>?l$h-ah%oh*Wmw;o@iE zBmbx6WB8GRxD#4CN#KY&QJwRcrSG4qt|H_Wg*4mi1^oR3W2OlhDS2Xb00000NkvXX Hu0mjf$HvF{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/vent.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/vent.png new file mode 100644 index 0000000000000000000000000000000000000000..a3299cbbaa98473a27562da594fa350c2c4d8043 GIT binary patch literal 573 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%Lf;0X`wFW@cu_#>W2s{(*sk0RaJ~rlx*=e!;=PAt50qCMMCj6)}00maaYt zMYY)ty;=1=IgNd}P5oAGzOngLQ90%2=H?MurM8{{g>91+6&2;><)x*iWo2b$WMrhI zqzYOm`TF|Wc?IS*PY@Lq6&Dwml#~<^5fKv;%Ws(&6ciL!P_3k-q@bXnrKP2-tE;K0 z=^K+KAt9l!udkz{qo=2*t*srHkY#0MB_}86AD2B(HHr>+F(%Rk6-a9D1u*Sl|LTMknEzpmg1s;*b3=G_SAk65n?;$V%7~XlhIEH8h z^PYPf)np*i@KD@L`3T3%w7!K0*_dxJ&53ZEaqIfe`GJ4x*Zr`Enf5Rk`M@_{OpT>wOwr$dSvH6nzt~9MI z4z?%Hl^(y9;LuEc%;2Yad*)uV-Rt_Uv$N#Q>TS4Fpt(e#mvy~nX!Y9Oi*xIO-MLSF zuTgfn_U-2J4j$!MTGQs*`7XDXI-bt6NS%Li30X`wF=H})mCMF>vA%TH`0RaJKW@e_Qra?hLetv$j`BiZR)wZ4i2}QNJ zP5oK*J=qPtIgNb1Ffh>6)YR40)zi}pOvo}eHnw#2 ziOMP0($ezx_xFrQQdd{k(9ke<_Oh_Bu(Y&%9;N*i=xojckH}&M25vqOW^~y15a=g{ z$DS^ZAsWH5eQ%4J3H}r%CJ8j8m)BDjy$kky-R3z^n6> zA1`y6;oJ1<+heV5s%(oqHVbW(b60Yb=@wDT+~@PDXOYIi3o|&E&1iGKem>X!jPXKt z@3yv6^^48KWD{=Acx@|a(z`e8KF>6VbDvkoU;k>lWl7ninkyz^(=z^N)yWiu%FV9L z*s|iY2CII+PABhcK_&HFynEu$SrprP+&uJi+h4{%3KENK<9q{v-evG~^>bP0l+XkK D2q3&H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/storage_bus.png b/src/main/resources/assets/overdrive_that_matters/textures/block/storage_bus.png new file mode 100644 index 0000000000000000000000000000000000000000..eb7c9f4f9fb913da4710ce435bc6a122f795f99d GIT binary patch literal 237 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!VDx^^%Amx6k~CayA#8@b22Z19F}xPUq=Rp zjs4tz5?O(Kp#Yx{S2Z=YgoFfBQ&XUTn3!07ef``WHx2+foCO|{#S9F5he4R}c>anM zpkRupi(`n!`P6eac^ec2SOSvR0~-BaBv>ijX8ODRkz7O9XXlEW+OC_}9M1W)@3Y`8 z2+iE9-SLe308@UZQYoWsRs(No#$u=G6E`2d=J#RY<35Jy-)#0gAB{T-p7I|Ees@4u adV)F7QOOqt&%t8$@j!Rl*Yf3(jg@y!78=N147enT!Ek z)-eZkL!*s1aMw6wU1c;>(&B!h;PK%SLq=2SbaY|4GID*0ZHspjebt7TMR@ena{I>-Mob-l<br4O{a+92T%|=1Bj? hVDpqOW)njtvxkFz)P(7W4+5=Z@O1TaS?83{1OV|=OFaMp literal 0 HcmV?d00001