Dyed codec.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsDecorationBlocks.kt

@@ -14,6 +14,7 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.BallDisplayBlock.DisplayState
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.generic.GenericDyedVariantBlockEntity
 import generations.gg.generations.core.generationscore.common.world.level.block.utilityblocks.DyeableBlock
+import net.minecraft.core.Holder
 import net.minecraft.core.registries.Registries
 import net.minecraft.world.item.BlockItem
 import net.minecraft.world.item.DyeColor
@@ -118,9 +119,9 @@ object GenerationsDecorationBlocks {
 
     fun <T : DyedVariantBlockEntity<*>, V : DyeableBlock<T, V>> registerDyed(
         name: String,
-        blockSupplier: (DyeColor, Map<DyeColor, Supplier<V>>) -> Supplier<V>
+        blockSupplier: (DyeColor, Map<DyeColor, Holder<Block>>) -> Supplier<V>
     ): DyedGroup<V, T> {
-        val dyeMap = HashMap<DyeColor, RegistrySupplier<V>>()
+        val dyeMap = mutableMapOf<DyeColor, Holder<Block>>()
 
         DyeColor.entries.forEach { dyeColor: DyeColor ->
             val properName = "${dyeColor.serializedName}_$name"

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/VendingMachineBlock.java

@@ -1,6 +1,8 @@
 package generations.gg.generations.core.generationscore.common.world.level.block.entities;
 
+import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.architectury.registry.registries.RegistrySupplier;
 import generations.gg.generations.core.generationscore.common.api.player.PlayerMoneyHandler;
 import generations.gg.generations.core.generationscore.common.network.packets.shop.S2COpenShopPacket;
@@ -9,6 +11,8 @@
 import generations.gg.generations.core.generationscore.common.world.level.block.utilityblocks.DyeableBlock;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.Holder;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
@@ -18,6 +22,7 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.BaseEntityBlock;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.shapes.BooleanOp;
@@ -34,7 +39,7 @@ public class VendingMachineBlock extends DyeableBlock<VendingMachineBlockEntity,
     public static GenerationsVoxelShapes.DirectionalShapes LOWER = GenerationsVoxelShapes.generateDirectionVoxelShape(Shapes.join(Shapes.join(Shapes.join(Shapes.box(0.0625, 0, 0.15625, 0.9375, 0.0625, 0.875), Shapes.box(0, 0.026875, 0.04999999999999999, 1, 1, 0.9375), BooleanOp.OR), Shapes.box(0.14687499999999998, 0.21875, 0, 0.865625, 0.546875, 0.0625), BooleanOp.OR), Shapes.box(0.15000000000000002, 0.671875, 0.01874999999999999, 0.86875, 1, 0.08124999999999999), BooleanOp.OR), Direction.SOUTH);
     public static GenerationsVoxelShapes.DirectionalShapes UPPER = GenerationsVoxelShapes.generateDirectionVoxelShape(Shapes.join(Shapes.join(Shapes.box(0.0625, 0, 0.15625, 0.9375, 0.0625, 0.875), Shapes.box(0, 0, 0.04999999999999999, 1, 1, 0.9375), BooleanOp.OR), Shapes.box(0.15000000000000002, 0, 0.01874999999999999, 0.86875, 0.84375, 0.08124999999999999), BooleanOp.OR), Direction.SOUTH);
 
-    public VendingMachineBlock(DyeColor color, Map<DyeColor, RegistrySupplier<VendingMachineBlock>> function, Properties properties) {
+    public VendingMachineBlock(DyeColor color, Map<DyeColor, Holder<Block>> function, Properties properties) {
         super(color, function, GenerationsBlockEntities.VENDING_MACHINE, properties, GenerationsBlockEntityModels.VENDING_MACHINE, 0, 1, 0);
     }
 
@@ -59,7 +64,11 @@ protected ItemInteractionResult serverUse(ItemStack stack, BlockState state, Ser
         return ItemInteractionResult.SUCCESS;
     }
 
-    public static final MapCodec<VendingMachineBlockEntity> CODEC = simpleCodec(VendingMachineBlock::new)
+    public static final MapCodec<VendingMachineBlock> CODEC = RecordCodecBuilder.<VendingMachineBlock>mapCodec(instance -> instance.group(
+            DyeColor.CODEC.fieldOf("color").forGetter(a -> a.color),
+            Codec.unboundedMap(DyeColor.CODEC, BuiltInRegistries.BLOCK.holderByNameCodec()).fieldOf("function").forGetter(a -> a.getFunction()),
+            propertiesCodec()
+    ).apply(instance, VendingMachineBlock::new));
 
     @Override
     protected MapCodec<? extends BaseEntityBlock> codec() {

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/utilityblocks/DyeableBlock.kt

@@ -1,37 +1,44 @@
 package generations.gg.generations.core.generationscore.common.world.level.block.utilityblocks
 
 import dev.architectury.registry.registries.RegistrySupplier
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.ModelProvidingBlockEntity
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.MutableBlockEntityType
 import generations.gg.generations.core.generationscore.common.world.level.block.generic.GenericRotatableModelBlock
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
+import net.minecraft.core.Holder
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerLevel
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.ItemInteractionResult
 import net.minecraft.world.entity.player.Player
+import net.minecraft.world.item.AdventureModePredicate
 import net.minecraft.world.item.DyeColor
 import net.minecraft.world.item.DyeItem
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.level.BlockGetter
 import net.minecraft.world.level.Level
 import net.minecraft.world.level.LevelReader
+import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.state.BlockState
 import net.minecraft.world.level.storage.loot.LootParams
 import net.minecraft.world.phys.BlockHitResult
-import java.util.function.BiFunction
+
+fun <T: Any> T.applyIfTrue(predicate: (T) -> Boolean, action: (T) -> T): T {
+    if(predicate.invoke(this)) return action.invoke(this)
+    return this
+}
 
 abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V>> : GenericRotatableModelBlock<T> {
     @JvmField
     val color: DyeColor
-    private val function: Map<DyeColor, RegistrySupplier<V>>
+    protected val function: Map<DyeColor, Holder<Block>>
 
     constructor(
         color: DyeColor,
-        function: Map<DyeColor, RegistrySupplier<V>>,
+        function: Map<DyeColor, Holder<Block>>,
         biFunction: RegistrySupplier<MutableBlockEntityType<T>>,
         baseBlockPosFunction: (BlockPos, BlockState) -> BlockPos,
         arg: Properties,
@@ -46,7 +53,7 @@ abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V
 
     constructor(
         color: DyeColor,
-        function: Map<DyeColor, RegistrySupplier<V>>,
+        function: Map<DyeColor, Holder<Block>>,
         biFunction: RegistrySupplier<MutableBlockEntityType<T>>,
         baseBlockPosFunction: (BlockPos, BlockState) -> BlockPos,
         arg: Properties,
@@ -58,7 +65,7 @@ abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V
 
     constructor(
         color: DyeColor,
-        function: Map<DyeColor, RegistrySupplier<V>>,
+        function: Map<DyeColor, Holder<Block>>,
         biFunction: RegistrySupplier<MutableBlockEntityType<T>>,
         arg: Properties,
         model: ResourceLocation,
@@ -72,7 +79,7 @@ abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V
 
     constructor(
         color: DyeColor,
-        function: Map<DyeColor, RegistrySupplier<V>>,
+        function: Map<DyeColor, Holder<Block>>,
         biFunction: RegistrySupplier<MutableBlockEntityType<T>>,
         arg: Properties,
         model: ResourceLocation
@@ -113,11 +120,11 @@ abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V
     }
 
     fun getItemFromDyeColor(color: DyeColor): Item {
-        return getBlockFromDyeColor(color)!!.asItem()
+        return getBlockFromDyeColor(color).asItem()
     }
 
-    fun getBlockFromDyeColor(color: DyeColor): V {
-        return function[color]!!.get()
+    fun getBlockFromDyeColor(color: DyeColor): Block {
+        return function[color]!!.value()
     }
 
     fun tryDyeColor(
@@ -147,9 +154,9 @@ abstract class DyeableBlock<T : ModelProvidingBlockEntity, V : DyeableBlock<T, V
 
                     if (!player.isCreative) heldItem.shrink(1)
 
-                    val newBlock = getBlockFromDyeColor(dyeColor)
+                    val newBlock = getBlockFromDyeColor(dyeColor).instanceOrNull<DyeableBlock<*, *>>() ?: return false //TODO: This is a stop gap due to codec(). Yea its that expansive.
 
-                    val defaultState = newBlock!!.defaultBlockState().setValue(FACING, baseState.getValue(FACING))
+                    val defaultState = newBlock.defaultBlockState().applyIfTrue({ it.hasProperty(FACING) }, { it.setValue(FACING, baseState.getValue(FACING)) } )
 
                     val dir = state.getValue(FACING)