DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Add missing datagen entries

Browse Source
This commit is contained in:
DBotThePony 2022-01-13 16:23:07 +07:00
parent b4c02e240d
commit 52ea1102e4
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
View File

@ -1,11 +1,8 @@
package ru.dbotthepony.mc.otm.datagen
import com.mojang.math.Vector3f
import net.minecraft.core.Direction
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.level.block.Block
import net.minecraftforge.client.model.generators.BlockStateProvider
import net.minecraftforge.client.model.generators.ConfiguredModel
import net.minecraftforge.eventbus.api.SubscribeEvent
import net.minecraftforge.fml.common.Mod
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent
@ -42,8 +39,8 @@ object DataGen {
blockStateProvider.block(*blocks)
}
private fun decorativeColumn(block: Block, end: String, side: String) {
blockModelProvider.decorativeColumn(block, end, side)
private fun decorativeColumn(block: Block, side: String, end: String) {
blockModelProvider.decorativeColumn(block, side, end)
blockStateProvider.block(block)
}
@ -69,7 +66,7 @@ object DataGen {
blockModelProvider.resourceCubeAll(Blocks.TRITANIUM_RAW_BLOCK)
blockModelProvider.resourceCubeAll(Blocks.DEEPSLATE_TRITANIUM_ORE)
decorativeColumn(Blocks.TRITANIUM_STRIPED_BLOCK, "tritanium_block", "tritanium_striped_block")
decorativeColumn(Blocks.TRITANIUM_STRIPED_BLOCK, "tritanium_striped_block", "tritanium_block")
with(blockModelProvider) {
lambda {
@ -133,6 +130,7 @@ object DataGen {
block(Items.TRITANIUM_STRIPED_BLOCK)
block(Items.TRITANIUM_RAW_BLOCK)
block(Items.ITEM_MONITOR)
block(Items.TRITANIUM_BLOCK)
blocks(*Items.CRATES)
@ -140,10 +138,14 @@ object DataGen {
generated(Items.PILL_ANDROID)
generated(Items.PILL_HUMANE)
generated(Items.PILL_OBLIVION)
generated(Items.PILL_HEAL)
generated(Items.NUTRIENT_PASTE)
component(Items.TRITANIUM_INGOT)
resource(Items.TRITANIUM_ORE_CLUMP)
generated(*Items.TRITANIUM_TOOLS)
generatedTiered(Items.BATTERIES, "battery_tier")
generated(Items.BATTERY_CREATIVE)

2
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/SimpleItemModelProvider.kt
View File

@ -32,7 +32,7 @@ class SimpleItemModelProvider(event: GatherDataEvent) : ItemModelProvider(event.
generated.add(ItemModelGenerated(item.registryName!!.path, texture))
}
fun generated(item: Item) = generated(item, ResourceLocation(DataGen.MOD_ID, "item/${item.registryName!!.path}"))
fun generated(vararg items: Item) = items.forEach { generated(it, ResourceLocation(DataGen.MOD_ID, "item/${it.registryName!!.path}")) }
fun generated(item: Item, prefix: String) = generated(item, ResourceLocation(DataGen.MOD_ID, "item/${prefix}${item.registryName!!.path}"))
fun component(item: Item) = generated(item, "component/")
fun components(vararg items: Item) = items.forEach(this::component)

10
src/main/java/ru/dbotthepony/mc/otm/Registry.java
View File

@ -449,6 +449,14 @@ public class Registry {
public static final PickaxeItem TRITANIUM_PICKAXE = new PickaxeItem(TRITANIUM_COMPONENT, 2, -2.8f, new Item.Properties().tab(OverdriveThatMatters.CREATIVE_TAB));
public static final HoeItem TRITANIUM_HOE = new HoeItem(TRITANIUM_COMPONENT, 0, -3.4f, new Item.Properties().tab(OverdriveThatMatters.CREATIVE_TAB));
public static final Item[] TRITANIUM_TOOLS = new Item[] {
TRITANIUM_SWORD,
TRITANIUM_SHOVEL,
TRITANIUM_AXE,
TRITANIUM_PICKAXE,
TRITANIUM_HOE
};
public static final Item MATTER_IO_PORT = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
public static final Item MATTER_TRANSFORM_MATRIX = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
public static final Item ENERGY_BUS = new Item(new Item.Properties().stacksTo(64).tab(OverdriveThatMatters.CREATIVE_TAB));
@ -501,6 +509,8 @@ public class Registry {
BASIC_CONTROL_CIRCUIT,
ADVANCED_CONTROL_CIRCUIT,
MATTER_CAPACITOR_PARTS,
MATTER_IO_PORT,
MATTER_TRANSFORM_MATRIX,
};
public static final ItemMatterCapacitor MATTER_CAPACITOR_BASIC = new ItemMatterCapacitor(new Fraction("4"));