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 877de3427..e129edac9 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -204,7 +204,6 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr } } - DataGen.decorativeCubeAll(MBlocks.DANGER_STRIPE_BLOCK) DataGen.decorativePillar(MBlocks.METAL_BEAM, "metal_beam_side", "metal_beam_top") var labLampOn: BlockModelBuilder? = null @@ -236,7 +235,7 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr itemModelProvider.block(MItems.LABORATORY_LAMP) itemModelProvider.block(MItems.LABORATORY_LAMP_INVERTED, MItems.LABORATORY_LAMP.registryName!!.path + "_unlit") - itemModelProvider.block(MItems.DANGER_STRIPE_BLOCK) + itemModelProvider.block(MItems.DANGER_STRIPE_BLOCK, MItems.DANGER_STRIPE_BLOCK.registryName!!.path + "_0") itemModelProvider.block(MItems.METAL_BEAM) blockStateProvider.exec { 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 9fb455bb9..162b70a00 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 @@ -261,12 +261,11 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.getVariantBuilder(MBlocks.METAL_JUNK).forAllStates { val generated = ArrayList() - for (suffix in arrayOf("", "_b", "_c", "_d")) { - val model = provider.models().getExistingFile(modLocation("block/metal_junk$suffix")) + for (suffix in arrayOf("_a", "_b", "_c", "_d")) { + val model = provider.models().cubeAll("block/metal_junk$suffix", modLocation("block/decorative/metal_junk$suffix")) generated.add(with(ConfiguredModel.builder()) { modelFile(model) - weight(2) return@with buildLast() }) @@ -274,7 +273,20 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { generated.add(with(ConfiguredModel.builder()) { modelFile(model) rotationY(180) - weight(2) + + return@with buildLast() + }) + } + + return@forAllStates generated.toTypedArray() + } + + provider.getVariantBuilder(MBlocks.DANGER_STRIPE_BLOCK).forAllStates { + val generated = ArrayList() + + for (suffix in arrayOf("_0", "_1")) { + generated.add(with(ConfiguredModel.builder()) { + modelFile(provider.models().cubeAll("block/danger_stripe_block$suffix", modLocation("block/decorative/danger_stripe_block$suffix"))) return@with buildLast() }) 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 021692971..bafe556be 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 @@ -20,7 +20,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { } provider.block(MItems.CARBON_FIBRE_BLOCK) - provider.block(MItems.METAL_JUNK) + provider.block(MItems.METAL_JUNK, MItems.METAL_JUNK.registryName!!.path + "_a") provider.block(MItems.METAL_MESH) provider.generatedTranslucent(MItems.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk.json b/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk.json deleted file mode 100644 index 02695dce8..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "overdrive_that_matters:block/decorative/metal_junk_a" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_b.json b/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_b.json deleted file mode 100644 index f0e21c790..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_b.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "overdrive_that_matters:block/decorative/metal_junk_b" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_c.json b/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_c.json deleted file mode 100644 index 29eebec2b..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_c.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "overdrive_that_matters:block/decorative/metal_junk_c" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_d.json b/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_d.json deleted file mode 100644 index aa4b745af..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/metal_junk_d.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "overdrive_that_matters:block/decorative/metal_junk_d" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block.png deleted file mode 100644 index c292cfe09..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/danger_stripe_block.png and /dev/null differ