Processing Tree Implementation and fix for #22

.gitignore

@@ -103,6 +103,8 @@ $RECYCLE.BIN/
 
 .gradle
 build/
+bin/
+.vscode/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -120,4 +122,4 @@ runs/
 !gradle-wrapper.jar
 /run-data/
 src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
-/src/generated/
+/src/generated/

src/main/java/com/createcivilization/create_ore_deposits/registry/block/CreateOreDepositsBlocks.kt

@@ -1,8 +1,10 @@
 package com.createcivilization.create_ore_deposits.registry.block
 
 import com.createcivilization.create_ore_deposits.CreateOreDeposits.REGISTRATE
+import com.createcivilization.create_ore_deposits.registry.block.entries.cast.CastBlock
 import com.createcivilization.create_ore_deposits.registry.block.entries.deposit_drill.DepositDrillBlock
 import com.createcivilization.create_ore_deposits.registry.tag.CreateOreDepositsTags
+import com.createcivilization.create_ore_deposits.registry.item.CreateOreDepositsItems
 import com.simibubi.create.api.behaviour.movement.MovementBehaviour.movementBehaviour
 import com.simibubi.create.api.stress.BlockStressValues
 import com.simibubi.create.content.kinetics.drill.DrillMovementBehaviour
@@ -15,9 +17,10 @@ import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables
 import com.tterrag.registrate.util.entry.BlockEntry
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.Items
-
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.Blocks
+import net.minecraft.world.level.block.RotatedPillarBlock
+import net.minecraft.world.level.block.SoundType
 import net.minecraft.world.level.block.state.BlockBehaviour
 import net.minecraft.world.level.material.MapColor
 import net.minecraft.world.level.storage.loot.LootPool
@@ -39,44 +42,90 @@ data object CreateOreDepositsBlocks {
 		.transform(customItemModel())
 		.register()
 
+	@JvmField
+	val CAST: BlockEntry<CastBlock> = registerCast("cast")
+
+	@JvmField
+	val LUBRICATED_CAST: BlockEntry<CastBlock> = registerCast("lubricated_cast")
+
+	@JvmField
+	val CASTED_IRON: BlockEntry<CastBlock> = registerCast("casted_iron")
+
+	@JvmField
+	val CASTED_GOLD: BlockEntry<CastBlock> = registerCast("casted_gold")
+
+	@JvmField
+	val CASTED_COPPER: BlockEntry<CastBlock> = registerCast("casted_copper")
+
+	@JvmField
+	val CASTED_BRASS: BlockEntry<CastBlock> = registerCast("casted_brass")
+
+	@JvmField
+	val CASTED_STEEL: BlockEntry<CastBlock> = registerCast("casted_steel")
+
+	@JvmField
+	val CASTED_NETHERITE: BlockEntry<CastBlock> = registerCast("casted_netherite")
+
+	@JvmField
+	val STEEL_BLOCK: BlockEntry<Block> = REGISTRATE.block("steel_block", ::Block)
+		.initialProperties { Blocks.IRON_BLOCK }
+		.simpleItem()
+		.register()
+
 	// TEMP LOOT VALUES, CHANGE LATER.
 	// Deposits
-	val EXAMPLE_DEPOSIT: BlockEntry<Block> = registerDepositGuaranteed("example_deposit", Blocks.STONE, Items.NETHERITE_BLOCK)
-	val COAL_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("coal_ore_deposit", Blocks.COAL_ORE, Items.COAL, 3f, 0.8f)
-	val IRON_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("iron_ore_deposit", Blocks.IRON_ORE, Items.RAW_IRON, 0.8f)
-	val GOLD_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("gold_ore_deposit", Blocks.GOLD_ORE, Items.RAW_GOLD, 0.6f)
-	val COPPER_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("copper_ore_deposit", Blocks.COPPER_ORE, Items.RAW_COPPER, 0.8f)
-
+	val EXAMPLE_DEPOSIT: BlockEntry<Block> = registerDepositGuaranteed("example_deposit", Blocks.STONE, { Items.NETHERITE_BLOCK })
+	val COAL_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("coal_ore_deposit", Blocks.COAL_ORE, { CreateOreDepositsItems.UNREFINED_COAL_ORE.get() }, 3f, 0.8f)
+	val IRON_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("iron_ore_deposit", Blocks.IRON_ORE, { CreateOreDepositsItems.UNREFINED_IRON_ORE.get() }, 0.8f)
+	val GOLD_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("gold_ore_deposit", Blocks.GOLD_ORE, { CreateOreDepositsItems.UNREFINED_GOLD_ORE.get() }, 0.6f)
+	val COPPER_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("copper_ore_deposit", Blocks.COPPER_ORE, { CreateOreDepositsItems.UNREFINED_COPPER_ORE.get() }, 0.8f)
 //	val REDSTONE_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("redstone_ore_deposit", Blocks.REDSTONE_ORE, Items.REDSTONE_ORE)
-	val LAPIS_ORE_DEPOSIT: BlockEntry<Block> = registerDepositGuaranteed("lapis_ore_deposit", Blocks.LAPIS_ORE, Items.LAPIS_LAZULI)
-	val DIAMOND_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("diamond_ore_deposit", Blocks.DIAMOND_ORE, Items.DIAMOND, 0.2f)
-	val EMERALD_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("emerald_ore_deposit", Blocks.EMERALD_ORE, Items.EMERALD, 0.1f)
-	val QUARTZ_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("quartz_ore_deposit", Blocks.NETHER_QUARTZ_ORE, Items.QUARTZ, 2f, 0.9f)
-	val NETHERITE_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("netherite_ore_deposit", Blocks.ANCIENT_DEBRIS, Items.NETHERITE_SCRAP, 1f)
-//	val ZINC_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("zinc_ore_deposit", AllBlocks.ZINC_ORE.get(), AllItems.RAW_ZINC)
-	//End Deposits
+	val LAPIS_ORE_DEPOSIT: BlockEntry<Block> = registerDepositGuaranteed("lapis_ore_deposit", Blocks.LAPIS_ORE, { CreateOreDepositsItems.UNREFINED_LAPIS_ORE.get() })
+	val DIAMOND_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("diamond_ore_deposit", Blocks.DIAMOND_ORE, { CreateOreDepositsItems.UNREFINED_DIAMOND_ORE.get() }, 0.2f)
+	val EMERALD_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("emerald_ore_deposit", Blocks.EMERALD_ORE, { CreateOreDepositsItems.UNREFINED_EMERALD_ORE.get() }, 0.1f)
+	val QUARTZ_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("quartz_ore_deposit", Blocks.NETHER_QUARTZ_ORE, { CreateOreDepositsItems.UNREFINED_QUARTZ_ORE.get() }, 2f, 0.9f)
+	val NETHERITE_ORE_DEPOSIT: BlockEntry<Block> = registerDepositSingleRoll("netherite_ore_deposit", Blocks.ANCIENT_DEBRIS, { CreateOreDepositsItems.UNREFINED_NETHERITE_ORE.get() }, 1f, true)
+//	val ZINC_ORE_DEPOSIT: BlockEntry<Block> = registerDeposit("zinc_ore_deposit", AllBlocks.ZINC_ORE.get(), { CreateOreDepositsItems.UNREFINED_ZINC.get() })
+
+	private fun registerCast(blockName: String): BlockEntry<CastBlock> = REGISTRATE.block(blockName, ::CastBlock)
+		.initialProperties { Blocks.WHITE_WOOL }
+		.properties { it.noOcclusion().strength(0.5f).sound(SoundType.STONE) }
+		.loot { lootTables: RegistrateBlockLootTables, castBlock: CastBlock ->
+			lootTables.dropSelf(castBlock)
+		}
+		.simpleItem()
+		.register()
 
 	fun registerDepositGuaranteed(
 		blockName: String,
 		block: Block,
-		ore: Item,
-	): BlockEntry<Block> = registerDepositSingleRoll(blockName, block, ore, 1f)
+		ore: () -> Item,
+		isRotatedPillar: Boolean = false,
+	): BlockEntry<Block> = registerDepositSingleRoll(blockName, block, ore, 1f, isRotatedPillar)
 
 	fun registerDepositSingleRoll(
 		blockName: String,
 		block: Block,
-		ore: Item,
+		ore: () -> Item,
 		chance: Float,
-	): BlockEntry<Block> = registerDeposit(blockName, block, ore, 1f, chance)
+		isRotatedPillar: Boolean = false,
+	): BlockEntry<Block> = registerDeposit(blockName, block, ore, 1f, chance, isRotatedPillar)
 
 	fun registerDeposit(
 		blockName: String,
 		block: Block,
-		ore: Item,
+		ore: () -> Item,
 		rolls: Float,
 		chance: Float,
+		isRotatedPillar: Boolean = false,
 	): BlockEntry<Block> = REGISTRATE
-		.block(blockName) { Block(BlockBehaviour.Properties.ofFullCopy(block)) }
+		.block(blockName) {
+			if (isRotatedPillar) {
+				RotatedPillarBlock(BlockBehaviour.Properties.ofFullCopy(block))
+			} else {
+				Block(BlockBehaviour.Properties.ofFullCopy(block))
+			}
+		}
 		.simpleItem()
 		.tag(CreateOreDepositsTags.DEPOSIT)
 		.loot { lootTables: RegistrateBlockLootTables, depositBlock: Block ->
@@ -87,11 +136,11 @@ data object CreateOreDepositsBlocks {
 						LootPool.lootPool()
 							.setRolls(ConstantValue.exactly(rolls))
 							.add(
-								LootItem.lootTableItem(ore)
+								LootItem.lootTableItem(ore())
 									.`when`(LootItemRandomChanceCondition.randomChance(chance))
 							)
 					)
 			)
 		}
 		.register()
-}
+}

src/main/java/com/createcivilization/create_ore_deposits/registry/block/entries/cast/CastBlock.kt

@@ -0,0 +1,25 @@
+package com.createcivilization.create_ore_deposits.registry.block.entries.cast
+
+import net.minecraft.core.BlockPos
+import net.minecraft.world.level.BlockGetter
+import net.minecraft.world.level.block.Block
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.phys.shapes.CollisionContext
+import net.minecraft.world.phys.shapes.Shapes
+import net.minecraft.world.phys.shapes.VoxelShape
+
+class CastBlock(properties: Properties) : Block(properties) {
+
+	override fun getShape(
+		state: BlockState,
+		level: BlockGetter,
+		pos: BlockPos,
+		context: CollisionContext
+	): VoxelShape = SHAPE
+
+	companion object {
+		private fun voxel(value: Int): Double = value / 16.0
+
+		private val SHAPE: VoxelShape = Shapes.box(voxel(3), voxel(0), voxel(5), voxel(13), voxel(3), voxel(11))
+	}
+}

src/main/java/com/createcivilization/create_ore_deposits/registry/datagen/DataMapProvider.kt

@@ -17,7 +17,15 @@ class DataMapProvider(
 	override fun gather(provider: HolderLookup.Provider) {
 		builder(CreateOreDepositsDataMaps.DEPOSIT_DATA)
 			.add(CreateOreDepositsBlocks.EXAMPLE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(10, 1f), false)
+			.add(CreateOreDepositsBlocks.COAL_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(1000, 1f), false)
+			.add(CreateOreDepositsBlocks.IRON_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(700, 2f), false)
+			.add(CreateOreDepositsBlocks.GOLD_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(300, 3f), false)
+			.add(CreateOreDepositsBlocks.COPPER_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(800, 1f), false)
+			.add(CreateOreDepositsBlocks.LAPIS_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(400, 2f), false)
 			.add(CreateOreDepositsBlocks.DIAMOND_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(50, 5f), false)
+			.add(CreateOreDepositsBlocks.EMERALD_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(30, 3f), false)
+			.add(CreateOreDepositsBlocks.QUARTZ_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(400, 2f), false)
+			.add(CreateOreDepositsBlocks.NETHERITE_ORE_DEPOSIT, CreateOreDepositsDataMaps.DepositData(40, 7f), false)
 
 		builder(CreateOreDepositsDataMaps.COOLING_FACTOR_DATA)
 			.add(FluidTags.WATER, CreateOreDepositsDataMaps.CoolingFactorData(1f), false)

src/main/java/com/createcivilization/create_ore_deposits/registry/fluid/CreateOreDepositsFluids.kt

@@ -21,6 +21,79 @@ data object CreateOreDepositsFluids {
 	val SLAG: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
 		.fluid("slag", "block/fluid/slag_still".asResource(), "block/fluid/slag_flow".asResource())
 		.properties { it.viscosity(1500).density(500) }
-		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(25).explosionResistance(0f) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_IRON: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_iron", "block/fluid/molten_iron_still".asResource(), "block/fluid/molten_iron_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_GOLD: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_gold", "block/fluid/molten_gold_still".asResource(), "block/fluid/molten_gold_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val WASTE_SLURRY: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("waste_slurry", "block/fluid/waste_slurry_still".asResource(), "block/fluid/waste_slurry_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_COPPER: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_copper", "block/fluid/molten_copper_still".asResource(), "block/fluid/molten_copper_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_ZINC: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_zinc", "block/fluid/molten_zinc_still".asResource(), "block/fluid/molten_zinc_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_BRASS: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_brass", "block/fluid/molten_brass_still".asResource(), "block/fluid/molten_brass_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_STEEL: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_steel", "block/fluid/molten_steel_still".asResource(), "block/fluid/molten_steel_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_DEBRIS: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_debris", "block/fluid/molten_debris_still".asResource(), "block/fluid/molten_debris_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
+		.register()
+
+	@JvmField
+	val MOLTEN_NETHERITE: FluidEntry<BaseFlowingFluid.Flowing> = CreateOreDeposits.REGISTRATE
+		.fluid("molten_netherite", "block/fluid/molten_netherite_still".asResource(), "block/fluid/molten_netherite_flow".asResource())
+		.properties { it.viscosity(1500).density(500) }
+		.fluidProperties { it.levelDecreasePerBlock(2).tickRate(25).slopeFindDistance(3).explosionResistance(0f) }
+		.source(BaseFlowingFluid::Source)
 		.register()
-}
+}

src/main/java/com/createcivilization/create_ore_deposits/registry/item/CreateOreDepositsArmorMaterials.kt

@@ -0,0 +1,34 @@
+package com.createcivilization.create_ore_deposits.registry.item
+
+import net.minecraft.core.Holder
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.sounds.SoundEvents
+import net.minecraft.world.item.ArmorItem
+import net.minecraft.world.item.ArmorMaterial
+import net.minecraft.world.item.crafting.Ingredient
+
+import java.util.EnumMap
+
+data object CreateOreDepositsArmorMaterials {
+
+	const val STEEL_DURABILITY: Int = 30
+
+	@JvmField
+	val STEEL: Holder<ArmorMaterial> = Holder.direct(
+		ArmorMaterial(
+			EnumMap<ArmorItem.Type, Int>(ArmorItem.Type::class.java).apply {
+				put(ArmorItem.Type.BOOTS, 2)
+				put(ArmorItem.Type.LEGGINGS, 5)
+				put(ArmorItem.Type.CHESTPLATE, 7)
+				put(ArmorItem.Type.HELMET, 2)
+				put(ArmorItem.Type.BODY, 7)
+			},
+			9,
+			SoundEvents.ARMOR_EQUIP_DIAMOND,
+			{ Ingredient.of(CreateOreDepositsItems.STEEL_INGOT.get()) },
+			listOf(ArmorMaterial.Layer(ResourceLocation.withDefaultNamespace("netherite"))),
+			1.5f,
+			0.0f
+		)
+	)
+}