From 52ea1102e41221735384abc3fe59f50e33ba5740 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Thu, 13 Jan 2022 16:23:07 +0700
Subject: [PATCH] Add missing datagen entries

---
 .../ru/dbotthepony/mc/otm/datagen/DataGen.kt       | 14 ++++++++------
 .../otm/datagen/items/SimpleItemModelProvider.kt   |  2 +-
 src/main/java/ru/dbotthepony/mc/otm/Registry.java  | 10 ++++++++++
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
index 32f06a027..bce247f49 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt
@@ -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)
 
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/SimpleItemModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/SimpleItemModelProvider.kt
index bd4d7bfdf..ba56eb55c 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/SimpleItemModelProvider.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/SimpleItemModelProvider.kt
@@ -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)
diff --git a/src/main/java/ru/dbotthepony/mc/otm/Registry.java b/src/main/java/ru/dbotthepony/mc/otm/Registry.java
index 0bb19614c..cee607575 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/Registry.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/Registry.java
@@ -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"));