diff --git a/src/main/kotlin/de/wulkanat/www/new_frontiers/NewFrontiers.kt b/src/main/kotlin/de/wulkanat/www/new_frontiers/NewFrontiers.kt index f79e93b..c5e4044 100644 --- a/src/main/kotlin/de/wulkanat/www/new_frontiers/NewFrontiers.kt +++ b/src/main/kotlin/de/wulkanat/www/new_frontiers/NewFrontiers.kt @@ -63,12 +63,18 @@ object NewFrontiers { @SubscribeEvent @JvmStatic - fun registerModels(even: ModelRegistryEvent) { + fun registerModels(event: ModelRegistryEvent) { for (item in Items.values()) { if (item.value.hasCustomModel) { item.value.registerModels() } } + + for (block in Blocks.values()) { + if (block.value.hasCustomModel) { + block.value.registerModels() + } + } } @SubscribeEvent diff --git a/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFBlock.kt b/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFBlock.kt index cc4df61..6e3cc40 100644 --- a/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFBlock.kt +++ b/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFBlock.kt @@ -1,15 +1,18 @@ package de.wulkanat.www.new_frontiers.abstract_helpers import de.wulkanat.www.new_frontiers.NewFrontiers +import de.wulkanat.www.new_frontiers.proxy.registerItemRenderer import net.minecraft.block.Block import net.minecraft.block.material.Material import net.minecraft.creativetab.CreativeTabs +import net.minecraft.item.Item import net.minecraft.world.World abstract class NFBlock( val hasItemBlock: Boolean = true, val collidable: Boolean = true, val tickRate: Int = 10, + val hasCustomModel: Boolean = true, material: Material, hardness: Float = 1.0F, resistance: Float = 1.0F, @@ -41,4 +44,8 @@ abstract class NFBlock( override fun tickRate(p_tickRate_1_: World): Int { return tickRate } + + fun registerModels() { + registerItemRenderer(Item.getItemFromBlock(this), 0, "inventory") + } } diff --git a/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFItem.kt b/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFItem.kt index d79afff..3aa33a3 100644 --- a/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFItem.kt +++ b/src/main/kotlin/de/wulkanat/www/new_frontiers/abstract_helpers/NFItem.kt @@ -8,7 +8,7 @@ import net.minecraft.item.Item abstract class NFItem( name: String, creativeTab: CreativeTabs = de.wulkanat.www.new_frontiers.init.CreativeTabs.NF_ITEMS.value, - val hasCustomModel: Boolean = false + val hasCustomModel: Boolean = true ) : Item() { init { setRegistryName("${NewFrontiers.MOD_ID}:$name") diff --git a/src/main/kotlin/de/wulkanat/www/new_frontiers/proxy/client-proxy.kt b/src/main/kotlin/de/wulkanat/www/new_frontiers/proxy/client-proxy.kt index e62ac5f..09d1ec2 100644 --- a/src/main/kotlin/de/wulkanat/www/new_frontiers/proxy/client-proxy.kt +++ b/src/main/kotlin/de/wulkanat/www/new_frontiers/proxy/client-proxy.kt @@ -1,5 +1,6 @@ package de.wulkanat.www.new_frontiers.proxy +import jdk.nashorn.internal.ir.Block import net.minecraft.client.renderer.block.model.ModelResourceLocation import net.minecraft.item.Item import net.minecraft.util.ResourceLocation diff --git a/src/main/resources/assets/new_frontiers/lang/en_US.lang b/src/main/resources/assets/new_frontiers/lang/en_US.lang index 97ebc18..1da810e 100644 --- a/src/main/resources/assets/new_frontiers/lang/en_US.lang +++ b/src/main/resources/assets/new_frontiers/lang/en_US.lang @@ -1,5 +1,7 @@ tile.space_teleporter.name=Space Teleporter tile.ftl_drive.name=FTL Drive +item.test_item.name=Test Item + itemGroup.nf_blocks=New Frontiers Blocks itemGroup.nf_items=New Frontiers Items