Walkmon

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsStorage.kt

@@ -7,4 +7,5 @@ object GenerationsStorage {
     val registry = DataManagerRegistry(GenerationsCore.MOD_ID)
 
     val ITEM_CONTENTS = registry.builder(ItemStorageData.DEFAULT).serialize(ItemStorageData.CODEC).withDataComponent().buildAndRegister("inventory")
+
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/container/GenericChestScreen.kt

@@ -6,7 +6,7 @@ import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen
 import net.minecraft.network.chat.Component
 import net.minecraft.world.entity.player.Inventory
 
-class GenericChestScreen(menu: GenericChestContainer, inventory: Inventory, title: Component) : AbstractContainerScreen<GenericChestContainer>(menu, inventory, title) {
+class GenericChestScreen(menu: GenericChestContainer<*>, inventory: Inventory, title: Component) : AbstractContainerScreen<GenericChestContainer<*>>(menu, inventory, title) {
     init {
         imageWidth = menu.guiWidth
         imageHeight = menu.guiHeight

common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/mails/MailEditScreen.java

@@ -82,10 +82,10 @@ public MailEditScreen(Player arg, ItemStack arg2, InteractionHand arg3) {
         this.owner = arg;
         this.book = arg2;
         this.hand = arg3;
-        CompoundTag compoundTag = arg2.getTag();
-        if (compoundTag != null) {
-            contents = MailViewScreen.loadPages(compoundTag);
-        }
+//        CompoundTag compoundTag = arg2.getTag();
+//        if (compoundTag != null) {
+//            contents = MailViewScreen.loadPages(compoundTag);
+//        }
 
         location = ((MailItem) arg2.getItem()).type.location;
     }
@@ -133,14 +133,14 @@ private void saveChanges(boolean publish) {
     }
 
     private void updateLocalCopy(boolean sign) {
-        this.book.set(Item)
-
-        if (!this.contents.isEmpty()) {
-            this.book.addTagElement("contents", StringTag.valueOf(this.contents));
-        }
-        if (sign) {
-            this.book.addTagElement("author", StringTag.valueOf(this.owner.getGameProfile().getName()));
-        }
+//        this.book.set(Item)
+//
+//        if (!this.contents.isEmpty()) {
+//            this.book.addTagElement("contents", StringTag.valueOf(this.contents));
+//        }
+//        if (sign) {
+//            this.book.addTagElement("author", StringTag.valueOf(this.owner.getGameProfile().getName()));
+//        }
     }
 
     @Override
@@ -163,11 +163,11 @@ public boolean charTyped(char codePoint, int modifiers) {
             return true;
         }
 
-        if (SharedConstants.isAllowedChatCharacter(codePoint)) {
-            this.pageEdit.insertText(Character.toString(codePoint));
-            this.clearDisplayCache();
-            return true;
-        }
+//        if (SharedConstants.isAllowedChatCharacter(codePoint)) {
+//            this.pageEdit.insertText(Character.toString(codePoint));
+//            this.clearDisplayCache();
+//            return true;
+//        }
         return false;
     }
 

common/src/main/java/generations/gg/generations/core/generationscore/common/client/screen/statue/StatueEditorScreen.kt

@@ -4,7 +4,7 @@ import com.cobblemon.mod.common.api.pokemon.PokemonProperties.Companion.parse
 import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
 import com.cobblemon.mod.common.client.gui.summary.widgets.ModelWidget
 import com.cobblemon.mod.common.client.render.models.blockbench.PosableState
-import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
+//import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.PokemonModelRepository
 import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
 import com.cobblemon.mod.common.entity.PoseType

common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/C2SEditMailHandler.kt

@@ -9,6 +9,7 @@ import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.entity.player.Inventory
 import java.util.*
 
+//TODO: Fix data nonsense
 object C2SEditMailHandler : ServerNetworkPacketHandler<C2SEditMailPacket> {
     override fun handle(packet: C2SEditMailPacket, server: MinecraftServer, player: ServerPlayer) {
         server.execute {
@@ -38,22 +39,22 @@ object C2SEditMailHandler : ServerNetworkPacketHandler<C2SEditMailPacket> {
         private fun updateMailContents(sender: ServerPlayer, slot: Int, contents: String) {
             val itemStack = sender.inventory.getItem(slot)
             if (itemStack.`is`(GenerationsItemTags.POKEMAIL)) {
-                itemStack.addTagElement("contents", StringTag.valueOf(contents))
+//                itemStack.addTagElement("contents", StringTag.valueOf(contents))
             }
         }
 
         private fun sealMail(sender: ServerPlayer, slot: Int, contents: String, title: String) {
             val itemStack = sender.inventory.getItem(slot)
             if (itemStack.`is`(GenerationsItemTags.POKEMAIL)) {
-                val itemStack1 = MailItem.getSealed(itemStack.item)
-                val compoundTag = itemStack.getTag()
-                if (compoundTag != null) {
-                    itemStack1.setTag(compoundTag)
-                }
-                itemStack1.addTagElement("author", StringTag.valueOf(sender.name.string))
-                itemStack1.addTagElement("contents", StringTag.valueOf(contents))
-                sender.inventory.setItem(slot, itemStack1)
-            }
+//                val itemStack1 = MailItem.getSealed(itemStack.item)
+//                val compoundTag = itemStack.getTag()
+//                if (compoundTag != null) {
+//                    itemStack1.setTag(compoundTag)
+//                }
+//                itemStack1.addTagElement("author", StringTag.valueOf(sender.name.string))
+//                itemStack1.addTagElement("contents", StringTag.valueOf(contents))
+//                sender.inventory.setItem(slot, itemStack1)
+//            }
         }
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/GenericChestContainer.kt

@@ -2,8 +2,10 @@ package generations.gg.generations.core.generationscore.common.world.container
 
 import earth.terrarium.common_storage_lib.item.impl.SimpleItemStorage
 import earth.terrarium.common_storage_lib.item.impl.vanilla.WrappedVanillaContainer
+import earth.terrarium.common_storage_lib.item.util.ItemStorageData
 import earth.terrarium.common_storage_lib.resources.item.ItemResource
 import earth.terrarium.common_storage_lib.storage.base.CommonStorage
+import earth.terrarium.common_storage_lib.storage.base.UpdateManager
 import earth.terrarium.common_storage_lib.storage.util.MenuStorageSlot
 import generations.gg.generations.core.generationscore.common.world.container.slots.LockedSlot
 import net.minecraft.network.FriendlyByteBuf
@@ -12,17 +14,17 @@ import net.minecraft.world.entity.player.Player
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.item.ItemStack
 
-open class GenericChestContainer(
+open class GenericChestContainer<T>(
     containerId: Int,
     @JvmField val playerInventory: Inventory,
-    private val container: SimpleItemStorage,
+    private val container: T,
     val inventoryWidth: Int,
     val inventoryHeight: Int,
     protected val locked: Int = -1
 ) : AbstractContainerMenu(
         GenerationsContainers.GENERIC.get(),
         containerId
-    ) {
+    ) where T: CommonStorage<ItemResource>, T: UpdateManager<ItemStorageData> {
     @JvmField
     val guiWidth: Int =  14 + this.inventoryWidth * 18
     @JvmField
@@ -32,14 +34,16 @@ open class GenericChestContainer(
 
     constructor(containerId: Int, playerInventory: Inventory, buf: FriendlyByteBuf) : this(
         containerId, playerInventory,
-        SimpleItemStorage(buf.readVarInt()),
+        SimpleItemStorage(buf.readVarInt()) as T,
         buf.readVarInt(),
         buf.readVarInt()
     )
 
     init {
 //        container.startOpen(playerInventory.player)
 
+
+
         populate(container, 8, 16, 0, inventoryHeight, inventoryWidth)
 
         this.playerInventoryX = guiWidth / 2 - 80
@@ -106,7 +110,7 @@ open class GenericChestContainer(
 //        container.stopOpen(player)
     }
 
-    fun getContainer(): SimpleItemStorage = container
+    fun getContainer(): T = container
 
     open fun save(player: Player?) {}
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/GenericContainer.kt

@@ -8,8 +8,10 @@ import com.mojang.serialization.Dynamic
 import com.mojang.serialization.codecs.RecordCodecBuilder
 import dev.architectury.registry.menu.MenuRegistry
 import earth.terrarium.common_storage_lib.item.impl.SimpleItemStorage
+import earth.terrarium.common_storage_lib.item.util.ItemStorageData
 import earth.terrarium.common_storage_lib.resources.item.ItemResource
 import earth.terrarium.common_storage_lib.storage.base.CommonStorage
+import earth.terrarium.common_storage_lib.storage.base.UpdateManager
 import generations.gg.generations.core.generationscore.common.api.data.Codecs
 import generations.gg.generations.core.generationscore.common.util.TEXT_CODEC
 import generations.gg.generations.core.generationscore.common.util.TEXT_STREAM_CODEC
@@ -39,7 +41,7 @@ import kotlin.collections.ArrayList
 
 object GenericContainer {
 
-    fun openScreen(storage: SimpleItemStorage, width: Int, height: Int, title: Component, player: Player, lockedSlot: Int = -1) {
+    fun <T> openScreen(storage: T, width: Int, height: Int, title: Component, player: Player, lockedSlot: Int = -1) where T: CommonStorage<ItemResource>, T: UpdateManager<ItemStorageData> {
         if (!player.isLocalPlayer) MenuRegistry.openExtendedMenu(
             player as ServerPlayer,
             object : MenuProvider {