Merge remote-tracking branch 'origin/master'

This commit is contained in:
GearShocky 2023-03-02 16:12:09 +06:00
commit d3cb715180
2 changed files with 14 additions and 2 deletions

View File

@ -1,6 +1,7 @@
package ru.dbotthepony.mc.otm.datagen
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.level.block.AnvilBlock
import net.minecraft.world.level.block.SlabBlock
import net.minecraft.world.level.block.StairBlock
import net.minecraft.world.level.block.WallBlock
@ -38,6 +39,17 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr
DataGen.decoratives(MRegistry.TRITANIUM_BLOCK)
for (anvil in MBlocks.TRITANIUM_ANVIL) {
blockStateProvider.exec {
blockStateProvider.getVariantBuilder(anvil).forAllStates {
ConfiguredModel.builder()
.modelFile(blockStateProvider.models().getExistingFile(modLocation("blocks/${anvil.registryName!!.path}")))
.rotationY(it[AnvilBlock.FACING].yRotationBlockstateNorth())
.build()
}
}
}
for ((color, block) in MRegistry.TRITANIUM_STAIRS.allBlocks) {
DataGen.decorativeStairs(block as StairBlock, MRegistry.TRITANIUM_BLOCK.allBlocks[color]!!.registryName!!.path, MRegistry.TRITANIUM_BLOCK.allBlocks[color]!!.registryName!!.path)
}

View File

@ -178,8 +178,8 @@ private fun misc(provider: MatteryLanguageProvider) {
misc("dumping_matter_registry", "Выгружаю реестр материи в %s")
misc("dumped_matter_registry", "Выгрузил реестр материи в %s")
misc("iteration", "Iteration %s")
misc("death_reason", "Decommissioned!")
misc("iteration", "Итерация %s")
misc("death_reason", "Списан!")
misc("item.blackhole_immunity", "Нейтрализует гравитационные эффекты сингулярностей")