Finished stablizing multiblocks hopefully and tweak curry data. Also added curry data conversion entry.

Waterpicker · Waterpicker · commit 60b5e2779df7 · 2025-05-31T22:04:36.000-05:00
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt
@@ -122,7 +122,7 @@ object GenerationsCore {
         )
 
         GenerationsDataComponents.init()
-
+        GenerationsStorage.init()
         GenerationsCoreEntityDataSerializers.init()
         GenerationsSounds.init()
         GenerationsBlocks.init()
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt
@@ -9,5 +9,7 @@ object GenerationsStorage {
     val ITEM_CONTENTS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("inventory")
     val IMBUED = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("imbued")
 
-
+    fun init() {
+        registry.init()
+    }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/datafix/ItemStackComponentizationFixMixin.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/datafix/ItemStackComponentizationFixMixin.java
@@ -1,8 +1,11 @@
 package generations.gg.generations.core.generationscore.common.mixin.datafix;
 
+import com.cobblemon.mod.common.api.berry.Flavor;
 import com.cobblemon.mod.common.pokemon.Pokemon;
 import com.mojang.serialization.DataResult;
 import com.mojang.serialization.Dynamic;
+import generations.gg.generations.core.generationscore.common.world.item.curry.CurryTasteRating;
+import generations.gg.generations.core.generationscore.common.world.item.curry.CurryType;
 import net.minecraft.util.datafix.fixes.ItemStackComponentizationFix;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -55,7 +58,17 @@ private static void fixItemStack(ItemStackComponentizationFix.ItemStackData item
     }
 
     private static void fixCurry(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic) {
-//        TODO: FINISH this
+        var curryData = dynamic.emptyMap();
+        var flavorInt = itemStackData.removeTag("flavor").asInt(-1);
+        if(flavorInt > -1) curryData = curryData.set("flavor", dynamic.createString(Flavor.values()[flavorInt].name().toLowerCase()));
+        curryData = curryData.set("type", dynamic.createString(CurryType.getEntries().get(itemStackData.removeTag("type").asInt(0)).getSerializedName()));
+        curryData = curryData.set("experience", dynamic.createInt(itemStackData.removeTag("experience").asInt(0)));
+        curryData = curryData.set("health_percentage", dynamic.createDouble(itemStackData.removeTag("healthPercentage").asDouble(0.0)));
+        curryData = curryData.set("heal_status", dynamic.createBoolean(itemStackData.removeTag("canHealStatus").asBoolean(false)));
+        curryData = curryData.set("restore_pp", dynamic.createBoolean(itemStackData.removeTag("canRestorePP").asBoolean(false)));
+        curryData = curryData.set("friendship", dynamic.createInt(itemStackData.removeTag("friendship").asInt(0)));
+        curryData = curryData.set("rating", dynamic.createString(CurryTasteRating.getEntries().get(itemStackData.removeTag("rating").asInt(0)).getSerializedName()));
+        itemStackData.setComponent("generations_core:curry_data", curryData);
     }
 
     private static void fixTM(ItemStackComponentizationFix.ItemStackData itemStackData, Dynamic<?> dynamic) {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/C2SToggleHandler.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/C2SToggleHandler.kt
@@ -1,20 +1,13 @@
 package generations.gg.generations.core.generationscore.common.network.packets
 
 import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.instanceOrNull
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.Toggleable
 import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
 
 object C2SToggleHandler : ServerNetworkPacketHandler<C2STogglePacket> {
     override fun handle(packet: C2STogglePacket, minecraftServer: MinecraftServer, player: ServerPlayer) {
-        var toggleable: Toggleable? = null
-
-        if (packet.pos != null && player.level().getBlockEntity(packet.pos) is Toggleable) {
-            toggleable = player.level().getBlockEntity(packet.pos) as Toggleable
-        } else if (player.containerMenu is Toggleable) {
-            toggleable = player.containerMenu as Toggleable
-        }
-
-        if (toggleable != null) toggleable.isToggled = !toggleable.isToggled
+        player.containerMenu.instanceOrNull<Toggleable>()?.run { isToggled = !isToggled }
     }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/CookingPotContainer.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/CookingPotContainer.kt
@@ -7,6 +7,7 @@ import earth.terrarium.common_storage_lib.storage.util.MenuStorageSlot
 import generations.gg.generations.core.generationscore.common.world.container.slots.CurryResultSlot
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryIngredient
+import generations.gg.generations.core.generationscore.common.world.level.block.entities.Toggleable
 import net.minecraft.tags.ItemTags
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
@@ -22,9 +23,8 @@ class CookingPotContainer @JvmOverloads constructor(
     id: Int,
     playerInventory: Inventory,
     storage: SimpleItemStorage = SimpleItemStorage(14),
-    data: ContainerData = SimpleContainerData(4)
-) :
-    AbstractContainerMenu(GenerationsContainers.COOKING_POT.get(), id) {
+    val data: ContainerData = SimpleContainerData(4)
+) : AbstractContainerMenu(GenerationsContainers.COOKING_POT.get(), id), Toggleable {
     init {
         addSlot(MenuStorageSlot(storage, 0, 26, 8 + 11))
         addSlot(MenuStorageSlot(storage, 1, 44, 8 + 11))
@@ -118,10 +118,14 @@ class CookingPotContainer @JvmOverloads constructor(
     }
 
     val isCooking: Boolean
-        get() = false
+        get() = data[1] == 1
 
     val cookTime: Int
-        get() = 0
+        get() = data[0]
+
+    override var isToggled: Boolean
+        get() = data[2] == 1
+        set(value) { setData(2, if (value) 1 else 0) }
 
     companion object {
         fun isBowl(obj: Any): Boolean {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/RksMachineContainer.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/RksMachineContainer.kt
@@ -22,8 +22,7 @@ class RksMachineContainer @JvmOverloads constructor(
     protected var playerInventory: Inventory,
     protected var rksMachine: Container = SimpleContainer(10),
     private val data: ContainerData = SimpleContainerData(4)
-) :
-    AbstractContainerMenu(GenerationsContainers.RKS_MACHINE.get(), id), Toggleable {
+) : AbstractContainerMenu(GenerationsContainers.RKS_MACHINE.get(), id), Toggleable {
     init {
         rksMachine.instanceOrNull<RksMachineBlockEntity>()?.addMenu(this)
 
@@ -104,7 +103,7 @@ class RksMachineContainer @JvmOverloads constructor(
 
     override var isToggled: Boolean
         get() = data[2] == 1
-        set(value) { data[2] = if (value) 1 else 0 }
+        set(value) { setData(2, if (value) 1 else 0) }
 
     val isPokemonPresent: Boolean
         get() = data[3] == 1
@@ -162,4 +161,6 @@ class RksMachineContainer @JvmOverloads constructor(
         const val DATA_WEAVE_TIME_TOAL: Int = 1
         const val NUM_DATA_VALUES: Int = 2
     }
+
+
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/curry/CurryData.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/curry/CurryData.kt
@@ -102,33 +102,18 @@ data class CurryData(
     val resourceLocation: ResourceLocation
         get() = curryType.resourceLocation
 
-    fun toNbt(): Tag {
-        val nbt = CompoundTag()
-        nbt.putInt("flavor", flavor?.ordinal ?: -1)
-        nbt.putInt("type", curryType.ordinal)
-        nbt.putInt("rating", rating.ordinal)
-        nbt.putInt("experience", experience)
-        nbt.putDouble("healthPercentage", healthPercentage)
-        nbt.putBoolean("canHealStatus", canHealStatus)
-        nbt.putBoolean("canRestorePP", canRestorePP)
-        nbt.putInt("friendship", friendship)
-
-        return nbt
-    }
-
     companion object {
         val CODEC: Codec<CurryData> = RecordCodecBuilder.create {
             it.group(
                 Codecs.enumCodec(Flavor::class.java).optionalFieldOf("flavor").forGetter { Optional.ofNullable(it.flavor) },
                 CurryType.CODEC.fieldOf("type").forGetter { it.curryType },
                 Codec.INT.fieldOf("experience").forGetter { it.experience },
-                Codec.DOUBLE.fieldOf("healthPercentage").forGetter { it.healthPercentage },
-                Codec.BOOL.fieldOf("canHealStatus").forGetter { it.canHealStatus },
-                Codec.BOOL.fieldOf("canRestorePP").forGetter { it.canRestorePP },
+                Codec.DOUBLE.fieldOf("health_percentage").forGetter { it.healthPercentage },
+                Codec.BOOL.fieldOf("heal_status").forGetter { it.canHealStatus },
+                Codec.BOOL.fieldOf("restore_pp").forGetter { it.canRestorePP },
                 Codec.INT.fieldOf("friendship").forGetter { it.friendship },
                 CurryTasteRating.CODEC.fieldOf("rating").forGetter { it.rating },
-
-                ).apply(it, ::CurryData)
+            ).apply(it, ::CurryData)
         }
 
         val STREAM_CODEC = ByteBufCodecs.fromCodecTrusted(CODEC).asRegistryFriendly()
@@ -155,34 +140,5 @@ data class CurryData(
 
             return data
         }
-
-
-        fun fromNbt(nbt: CompoundTag): CurryData {
-            val curry = CurryData()
-            if (nbt.isEmpty) {
-                return curry
-            }
-
-            val flavorId = nbt.getInt("flavor")
-            val flavor = if (flavorId == -1) null else Flavor.entries[flavorId]
-            val type = CurryType.getCurryTypeFromIndex(nbt.getInt("type"))
-            val experience = nbt.getInt("experience")
-            val healthPercentage = nbt.getDouble("healthPercentage")
-            val canHealStatus = nbt.getBoolean("canHealStatus")
-            val canRestorePP = nbt.getBoolean("canRestorePP")
-            val friendship = nbt.getInt("friendship")
-            val rating = CurryTasteRating.fromId(nbt.getInt("rating"))
-
-            return CurryData(
-                flavor,
-                type,
-                experience,
-                healthPercentage,
-                canHealStatus,
-                canRestorePP,
-                friendship,
-                rating
-            )
-        }
     }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/curry/ItemCurry.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/curry/ItemCurry.kt
@@ -98,18 +98,6 @@ class ItemCurry(properties: Properties) : Item(properties.stacksTo(64)), Pokemon
             stack.set(GenerationsDataComponents.CURRY_DATA, data)
             return stack
         }
-
-        //TODO: data -> generations_core:curry_data via world converter
-
-//        @JvmStatic
-//        fun setData(stack: ItemStack, data: CurryData) {
-//            stack.addTagElement("data", data.toNbt())
-//        }
-//
-//        @JvmStatic
-//        fun getData(stack: ItemStack): CurryData {
-//            return CurryData.fromNbt(stack.getOrCreateTagElement("data"))
-//        }
     }
 }
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/CookingPotBlockEntity.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/CookingPotBlockEntity.kt
@@ -67,17 +67,21 @@ class CookingPotBlockEntity(pos: BlockPos, state: BlockState) : ModelProvidingBl
     }
 
     private val data: ContainerData = object : ContainerData {
-        override fun get(index: Int): Int {
-            TODO("Not yet implemented")
+        override fun get(index: Int): Int = when(index) {
+            0 -> this@CookingPotBlockEntity.cookTime
+            1 -> if(this@CookingPotBlockEntity.isCooking) 1 else 0
+            2 -> if (this@CookingPotBlockEntity.isToggled) 1 else 0
+            else -> 0
         }
 
-        override fun set(index: Int, value: Int) {
-            TODO("Not yet implemented")
+        override fun set(index: Int, value: Int) = when(index) {
+            0 -> this@CookingPotBlockEntity.cookTime = value
+            1 -> this@CookingPotBlockEntity.isCooking = value == 1
+            2 -> this@CookingPotBlockEntity.isToggled = value == 1
+            else -> {}
         }
 
-        override fun getCount(): Int {
-            TODO("Not yet implemented")
-        }
+        override fun getCount(): Int = 3
     }
 
     private var customName: String? = null
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/RksMachineBlockEntity.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/RksMachineBlockEntity.kt
@@ -41,7 +41,7 @@ import net.minecraft.world.phys.Vec3
 import java.util.*
 import java.util.function.Consumer
 
-class RksMachineBlockEntity(pos: BlockPos, state: BlockState) :
+open class RksMachineBlockEntity(pos: BlockPos, state: BlockState) :
     ModelProvidingBlockEntity(GenerationsBlockEntities.RKS_MACHINE.get(), pos, state), MenuProvider,
     Container, Toggleable {
     private val dataAccess: ContainerData
@@ -251,7 +251,7 @@ class RksMachineBlockEntity(pos: BlockPos, state: BlockState) :
         }
 
     protected fun canSmelt(result: ItemStack, recipe: RksRecipe): Boolean {
-        if (recipe.matches(craftingInput, null)) {
+        if (recipe.matches(craftingInput, level!!)) {
             val outstack = output
             return if (outstack.isEmpty) {
                 true
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/generic/GenericRotatableModelBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/generic/GenericRotatableModelBlock.kt
@@ -122,8 +122,7 @@ abstract class GenericRotatableModelBlock<T>(properties: Properties, blockEntity
     }
 
     override fun playerWillDestroy(level: Level, pos: BlockPos, state: BlockState, player: Player): BlockState {
-        var pos: BlockPos = pos
-        pos = getBaseBlockPos(pos, state)
+        var position: BlockPos = getBaseBlockPos(pos, state)
         val facing: Direction = state.getValue(FACING)
 
         for (x in 0..width) {
@@ -132,14 +131,16 @@ abstract class GenericRotatableModelBlock<T>(properties: Properties, blockEntity
                     if (!validPosition(x, y, z)) continue
 
 
-                    val blockPos: BlockPos = adjustBlockPos(pos, facing, x, y, z, true)
+                    val blockPos: BlockPos = adjustBlockPos(position, facing, x, y, z, true)
+
+
 
                     level.destroyBlock(blockPos, !player.isCreative && x == baseX && y == 0 && z == baseZ)
                 }
             }
         }
 
-        return super.playerWillDestroy(level, pos, state, player)
+        return super.playerWillDestroy(level, position, state, player)
     }
 
 
@@ -222,7 +223,7 @@ abstract class GenericRotatableModelBlock<T>(properties: Properties, blockEntity
     }
 
     override fun canRender(level: Level, blockPos: BlockPos, blockState: BlockState): Boolean {
-        return getWidthValue(blockState) == baseX || getHeightValue(blockState) == 0 || getLengthValue(blockState) == baseZ
+        return getWidthValue(blockState) == baseX && getHeightValue(blockState) == 0 && getLengthValue(blockState) == baseZ
     }
 
     fun getAngle(state: BlockState): Float {
@@ -337,8 +338,7 @@ abstract class GenericRotatableModelBlock<T>(properties: Properties, blockEntity
                     val z: Int = block.getLengthValue(state)
 
                     block.adjustBlockPos(pos, facing, x, y, z, false)
-                }
-                pos
+                } else pos
             }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ object GenerationsCore {`
`122`	`122`	`)`
`123`	`123`
`124`	`124`	`GenerationsDataComponents.init()`
`125`		`-`
	`125`	`+ GenerationsStorage.init()`
`126`	`126`	`GenerationsCoreEntityDataSerializers.init()`
`127`	`127`	`GenerationsSounds.init()`
`128`	`128`	`GenerationsBlocks.init()`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,7 @@ object GenerationsStorage {`
`9`	`9`	`val ITEM_CONTENTS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("inventory")`
`10`	`10`	`val IMBUED = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("imbued")`
`11`	`11`
`12`		`-`
	`12`	`+ fun init() {`
	`13`	`+ registry.init()`
	`14`	`+ }`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,18 +98,6 @@ class ItemCurry(properties: Properties) : Item(properties.stacksTo(64)), Pokemon`
`98`	`98`	`stack.set(GenerationsDataComponents.CURRY_DATA, data)`
`99`	`99`	`return stack`
`100`	`100`	`}`
`101`		`-`
`102`		`- //TODO: data -> generations_core:curry_data via world converter`
`103`		`-`
`104`		`-// @JvmStatic`
`105`		`-// fun setData(stack: ItemStack, data: CurryData) {`
`106`		`-// stack.addTagElement("data", data.toNbt())`
`107`		`-// }`
`108`		`-//`
`109`		`-// @JvmStatic`
`110`		`-// fun getData(stack: ItemStack): CurryData {`
`111`		`-// return CurryData.fromNbt(stack.getOrCreateTagElement("data"))`
`112`		`-// }`
`113`	`101`	`}`
`114`	`102`	`}`
`115`	`103`