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 0a921075f..d4f75f0da 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -247,11 +247,11 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr blockModelProvider.exec { for (crate in MRegistry.CARGO_CRATES.blocks.values) { it.withExistingParent("${crate.registryName!!.path}_closed", modLocation("${MNames.CARGO_CRATE}_closed")) - .texture("texture", "block/cargo_crates/${crate.registryName!!.path}") + .texture("body", "block/cargo_crates/${crate.registryName!!.path}") .texture("particle", "block/cargo_crates/${crate.registryName!!.path}") it.withExistingParent("${crate.registryName!!.path}_open", modLocation("${MNames.CARGO_CRATE}_open")) - .texture("texture", "block/cargo_crates/${crate.registryName!!.path}") + .texture("body", "block/cargo_crates/${crate.registryName!!.path}") .texture("particle", "block/cargo_crates/${crate.registryName!!.path}") } } diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json index d055be750..826915b14 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_closed.json @@ -1,8 +1,11 @@ { + "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [16, 32], "textures": { - "texture": "overdrive_that_matters:block/cargo_crates/cargo_crate", - "particle": "overdrive_that_matters:block/cargo_crates/cargo_crate" + "particle": "overdrive_that_matters:block/cargo_crates/cargo_crate", + "body": "overdrive_that_matters:block/cargo_crates/cargo_crate", + "core": "overdrive_that_matters:block/cargo_crates/cargo_crate_core" }, "elements": [ { @@ -10,25 +13,11 @@ "from": [0, 0, 0], "to": [16, 13, 16], "faces": { - "north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, - "down": {"uv": [0, 8, 8, 12], "texture": "#texture"} - } - }, - { - "name": "inside", - "from": [2, 13, 2], - "to": [14, 15, 14], - "faces": { - "north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 6, 3], "texture": "#missing"} + "north": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "east": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "south": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "west": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "down": {"uv": [0, 0, 16, 8], "texture": "#core"} } }, { @@ -36,65 +25,13 @@ "from": [0, 13, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, - "down": {"uv": [0, 0, 8, 4], "texture": "#texture"} - } - }, - { - "from": [0, 13, 7], - "to": [0, 15, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} - } - }, - { - "from": [16, 13, 7], - "to": [16, 15, 9], - "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, - "faces": { - "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} - } - }, - { - "from": [7, 13, 16], - "to": [9, 15, 16], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, - "faces": { - "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} - } - }, - { - "from": [7, 13, 0], - "to": [9, 15, 0], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, - "faces": { - "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + "north": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "east": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "south": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "west": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#body"} } } - ] + ], + "display": {} } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json index 1cf744a25..89531631f 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cargo_crate_open.json @@ -1,8 +1,11 @@ { + "credit": "Made with Blockbench", "parent": "block/block", + "texture_size": [16, 32], "textures": { - "texture": "overdrive_that_matters:block/cargo_crates/cargo_crate", - "particle": "overdrive_that_matters:block/cargo_crates/cargo_crate" + "particle": "overdrive_that_matters:block/cargo_crates/cargo_crate", + "body": "overdrive_that_matters:block/cargo_crates/cargo_crate", + "core": "overdrive_that_matters:block/cargo_crates/cargo_crate_core" }, "elements": [ { @@ -10,12 +13,12 @@ "from": [0, 0, 0], "to": [16, 13, 16], "faces": { - "north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"}, - "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, - "down": {"uv": [0, 8, 8, 12], "texture": "#texture"} + "north": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "east": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "south": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "west": {"uv": [0, 9.5, 16, 16], "texture": "#body"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#body"}, + "down": {"uv": [0, 0, 16, 8], "texture": "#core"} } }, { @@ -23,12 +26,10 @@ "from": [2, 13, 2], "to": [14, 15, 14], "faces": { - "north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 6, 3], "texture": "#missing"} + "north": {"uv": [0, 8, 16, 9], "texture": "#core"}, + "east": {"uv": [0, 8, 16, 9], "texture": "#core"}, + "south": {"uv": [0, 8, 16, 9], "texture": "#core"}, + "west": {"uv": [0, 8, 16, 9], "texture": "#core"} } }, { @@ -36,12 +37,12 @@ "from": [0, 15, 0], "to": [16, 18, 16], "faces": { - "north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, - "down": {"uv": [0, 0, 8, 4], "texture": "#texture"} + "north": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "east": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "south": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "west": {"uv": [0, 8, 16, 9.5], "texture": "#body"}, + "up": {"uv": [0, 0, 16, 8], "texture": "#body"}, + "down": {"uv": [0, 0, 16, 8], "texture": "#body"} } }, { @@ -49,12 +50,8 @@ "to": [0, 15, 9], "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + "east": {"uv": [7, 9.5, 9, 10.5], "texture": "#body"}, + "west": {"uv": [7, 9.5, 9, 10.5], "texture": "#body"} } }, { @@ -62,12 +59,8 @@ "to": [16, 15, 9], "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]}, "faces": { - "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"} + "east": {"uv": [7, 9.5, 9, 10.5], "texture": "#body"}, + "west": {"uv": [7, 9.5, 9, 10.5], "texture": "#body"} } }, { @@ -75,12 +68,8 @@ "to": [9, 15, 16], "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, "faces": { - "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + "north": {"uv": [7, 8.5, 9, 9.5], "texture": "#body"}, + "south": {"uv": [7, 8.5, 9, 9.5], "texture": "#body"} } }, { @@ -88,13 +77,10 @@ "to": [9, 15, 0], "rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]}, "faces": { - "north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, - "up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"} + "north": {"uv": [7, 8.5, 9, 9.5], "texture": "#body"}, + "south": {"uv": [7, 8.5, 9, 9.5], "texture": "#body"} } } - ] + ], + "display": {} } \ No newline at end of file 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 9c627d98a..a7130ccc8 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate.png differ 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 351e6d1f9..513d5e3a3 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_black.png differ 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 d08bba27e..a37a08dc1 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_blue.png differ 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 8142ac08f..7a0af145f 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_core.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_core.png new file mode 100644 index 000000000..22e7af19a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_core.png differ 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 7d2724f68..3a62234ca 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_cyan.png differ 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 c4fa7b5cf..9b2399595 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_gray.png differ 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 8392f07d4..9e9108e62 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_green.png differ 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 90cf6bcc9..35e8ec3c6 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_blue.png differ 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 62e444253..32f7fd48c 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_light_gray.png differ 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 1f499d89c..16972f96e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_lime.png differ 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 25eb700ca..37b0ca179 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png index 8b47feec8..12962078b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png index 712b0e1d9..ab52ab2ec 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png index d19b09ec0..731d9dcdc 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_purple.png differ 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 ac61d4fa4..cb8f60e32 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_red.png differ 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 42c4ce711..e711e7d0b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_white.png differ 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 869b0ec60..67d2d174b 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/cargo_crates/cargo_crate_yellow.png differ