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 1d7daaded..3182f3a45 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.ENERGY_SERVO) + provider.block(MBlocks.COBBLESTONE_GENERATOR) provider.exec { for (crate in MRegistry.CARGO_CRATES.allBlocks.values) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index ead8fb642..c2773104a 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 @@ -122,6 +122,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.PLATE_PRESS, "plate_press_idle") provider.block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier") provider.block(MItems.MATTER_RECYCLER, "matter_recycler_working") + provider.block(MItems.COBBLESTONE_GENERATOR, "cobblestone_generator") provider.block(MItems.STORAGE_BUS) provider.block(MItems.STORAGE_IMPORTER) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json b/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json new file mode 100644 index 000000000..2f06eb12d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/cobblestone_generator.json @@ -0,0 +1,84 @@ +{ + "credit": "Made with Blockbench", + "texture_size": [32, 64], + "textures": { + "0": "overdrive_that_matters:block/cobblestone_generator", + "particle": "overdrive_that_matters:block/cobblestone_generator" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 6, 16], + "faces": { + "north": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "east": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "south": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "west": {"uv": [8, 0, 16, 1.5], "texture": "#0"}, + "up": {"uv": [0, 10, 8, 14], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 4], "texture": "#0"} + } + }, + { + "from": [4, 6, 0], + "to": [12, 16, 16], + "faces": { + "north": {"uv": [12, 4, 16, 6.5], "texture": "#0"}, + "east": {"uv": [8, 1.5, 16, 4], "texture": "#0"}, + "south": {"uv": [12, 8.5, 16, 11], "texture": "#0"}, + "west": {"uv": [8, 1.5, 16, 4], "texture": "#0"}, + "up": {"uv": [8.5, 6.5, 16, 8.5], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [1, 6, 1], + "to": [4, 15, 15], + "faces": { + "north": {"uv": [8.5, 7, 7, 9.25], "texture": "#0"}, + "south": {"uv": [7, 7, 8.5, 9.25], "texture": "#0"}, + "west": {"uv": [0, 7, 7, 9.25], "texture": "#0"}, + "up": {"uv": [0, 9.25, 7, 10], "rotation": 270, "texture": "#0"} + } + }, + { + "from": [12, 6, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [7, 4, 8.5, 6.25], "texture": "#0"}, + "east": {"uv": [0, 4, 7, 6.25], "texture": "#0"}, + "south": {"uv": [8.5, 4, 7, 6.25], "texture": "#0"}, + "up": {"uv": [0, 6.25, 7, 7], "rotation": 90, "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/models/item/tritanium_shield_blocking.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json index ee8421417..22d720b39 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_shield_blocking.json @@ -105,20 +105,20 @@ ], "display": { "thirdperson_righthand": { - "rotation": [90, 39, -40], + "rotation": [120, 0, -45], "translation": [1, -2, 0] }, "thirdperson_lefthand": { - "rotation": [90, 0, 180], - "translation": [0, -2, 4] + "rotation": [120, 0, 135], + "translation": [1, -2, 0] }, "firstperson_righthand": { - "rotation": [90, -5, -90], - "translation": [-1.75, -7, 4] + "rotation": [82, 6, -90], + "translation": [-1.5, -4.75, 4.75] }, "firstperson_lefthand": { - "rotation": [90, -5, 90], - "translation": [-1.75, -7, 4] + "rotation": [82, 6, 90], + "translation": [-1.75, -4.75, 4] }, "ground": { "rotation": [90, 0, 0], diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png new file mode 100644 index 000000000..d1c82ec86 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/cobblestone_generator.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png index d36635b4d..477a50993 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/tritanium_nugget.png differ