Removed CSL and attempteted to fix texture laoder issues again. Still failing ther.e

Removes the Common Storage Lib (CSL) dependency from Generations Core.

Updates the GenerationsRootSchema to correctly identify the NeoForge mod API, fixing issues related to inventory access.
This change also migrates to native item storage to resolve some issues.

Author: Waterpicker

common/build.gradle.kts

@@ -15,7 +15,7 @@ repositories {
 dependencies {
     modImplementation("net.fabricmc:fabric-loader:${project.properties["fabric_loader_version"]}")
 
-    modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-common-1.21.1", version = "0.0.7")
+//    modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-common-1.21.1", version = "0.0.7")
 
     implementation("gg.generations:RareCandy:${project.properties["rareCandy"]}"){isTransitive = false}
 

common/src/main/java/generations/gg/generations/core/generationscore/common/SimpleItemSlot.java

@@ -7,12 +7,8 @@ import com.google.gson.JsonObject
 import com.mojang.serialization.Codec
 import com.mojang.serialization.JsonOps
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import earth.terrarium.common_storage_lib.resources.item.ItemResource
 import generations.gg.generations.core.generationscore.common.api.events.CurryEvents
-import generations.gg.generations.core.generationscore.common.api.events.CurryEvents.AddEntry
 import generations.gg.generations.core.generationscore.common.util.GenerationsUtils
-import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
-import generations.gg.generations.core.generationscore.common.world.item.components.GenerationsDataComponents
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryData
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryTasteRating
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryType

common/src/main/java/generations/gg/generations/core/generationscore/common/SimpleItemStorage.java

@@ -6,8 +6,6 @@ import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.server.packs.resources.ResourceManagerReloadListener
 
 class CompiledModelLoader : ResourceManagerReloadListener {
-
-
     override fun onResourceManagerReload(resourceManager: ResourceManager) {
         GenerationsTextureLoader.initialize(resourceManager)
         SpriteRegistry.onResourceManagerReload(resourceManager)

common/src/main/java/generations/gg/generations/core/generationscore/common/api/player/CurryDex.kt

@@ -18,6 +18,7 @@ import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.blaze3d.vertex.VertexConsumer
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.GenerationsCore.LOGGER
+import generations.gg.generations.core.generationscore.common.GenerationsCore.id
 import generations.gg.generations.core.generationscore.common.client.model.GenerationsClientMolangFunctions
 import generations.gg.generations.core.generationscore.common.client.model.RareCandyBone
 import generations.gg.generations.core.generationscore.common.client.model.inventory.GenericChestItemStackRenderer
@@ -74,6 +75,7 @@ import net.minecraft.core.Holder
 import net.minecraft.network.chat.Component
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.packs.PackType
+import net.minecraft.server.packs.resources.ResourceManagerReloadListener
 import net.minecraft.util.Mth
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.entity.Entity
@@ -159,11 +161,11 @@ object GenerationsCoreClient {
         })
 //        VaryingModelRepository.registerFactory(".pk", { resourceLocation, resource) -> new Pair<>(, b -> (Bone) new ModelPart(RareCandyBone.Companion.getCUBE_LIST(), Map.of("root", new RareCandyBone(resourceLocation))}));
 
-//        GenerationsCore.implementation.registerResourceReloader(
-//                id("texture_loader"),
-//                (ResourceManagerReloadListener) resourceManager -> textureLoader.initialize(resourceManager),
-//                PackType.CLIENT_RESOURCES,
-//                emptyList());
+        GenerationsCore.implementation.registerResourceReloader(
+                id("texture_loader"),
+                GenerationsTextureLoader,
+                PackType.CLIENT_RESOURCES,
+                emptyList());
 
         PlatformEvents.CLIENT_PLAYER_LOGIN.subscribe(Priority.NORMAL, GenerationsCoreClient::onLogin)
         PlatformEvents.CLIENT_PLAYER_LOGOUT.subscribe(Priority.NORMAL, GenerationsCoreClient::onLogout)

common/src/main/java/generations/gg/generations/core/generationscore/common/client/CompiledModelLoader.kt

@@ -17,10 +17,14 @@ import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite
 import net.minecraft.client.renderer.texture.SimpleTexture
 import net.minecraft.resources.FileToIdConverter
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.packs.resources.PreparableReloadListener
 import net.minecraft.server.packs.resources.ResourceManager
+import net.minecraft.util.profiling.ProfilerFiller
 import org.lwjgl.opengl.GL13C
 import java.io.ByteArrayInputStream
 import java.io.IOException
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Executor
 import kotlin.random.Random
 
 object GenerationsTextureLoader : ITextureLoader() {
@@ -30,6 +34,7 @@ object GenerationsTextureLoader : ITextureLoader() {
     val gson = Gson()
 
 
+
     object MissingTextureProxy : ITexture {
 
         override fun close() {
@@ -48,30 +53,39 @@ object GenerationsTextureLoader : ITextureLoader() {
     }
 
     fun initialize(manager: ResourceManager) {
+        println("[GenerationsTextureLoader] >> initialize: Starting reload")
         clear()
+        println("[GenerationsTextureLoader] >> initialize: Cleared old textures")
         try {
             RARE_CANDY.listMatchingResourceStacks(manager).forEach { name, list ->
+                println("[GenerationsTextureLoader] >> Processing resource stack: $name")
                 list.forEach { resource ->
-                    val obj = resource.openAsReader().use { SpriteRegistry.GSON.fromJson(it, JsonObject::class.java) }
+                    println("[GenerationsTextureLoader] >> Reading resource: ${resource}")
+                    val obj = resource.openAsReader().use {
+                        SpriteRegistry.GSON.fromJson(it, JsonObject::class.java)
+                    }
+                    println("[GenerationsTextureLoader] >> Parsed JSON: $obj")
                     val map = GenerationsUtils.decode(CODEC, obj)
+                    println("[GenerationsTextureLoader] >> Decoded map size: ${map.size}")
 
-                    if(map.isNotEmpty()) {
+                    if (map.isNotEmpty()) {
                         map.forEach { (key, value) ->
-                            register(key, SimpleTextureEnhanced(value.let { "${it.namespace}:textures/${it.path}.png" }.asResource()))
+                            val textureLoc = "${value.namespace}:textures/${value.path}.png".asResource()
+                            println("[GenerationsTextureLoader] >> Registering texture: key=$key, location=$textureLoc")
+                            register(key, SimpleTextureEnhanced(textureLoc))
                         }
                     }
                 }
             }
-
-//            RARE_CANDY.listMatchingResources(manager).values.forEach { resouce ->
-//                resouce.openAsReader().use { GsonHelper.fromJson(gson, it, RARE_CANDY_TYPE) }.forEach { (key, value) ->
-//                    register(key, SimpleTextureEnhanced(value.asResource().let { "${it.namespace}:textures/${it.path}.png" }.asResource()))
-//                }
-//            }
-        } catch (e: Exception) { throw RuntimeException(e)
+            println("[GenerationsTextureLoader] >> initialize: Completed successfully")
+        } catch (e: Exception) {
+            println("[GenerationsTextureLoader] >> initialize: Exception encountered!")
+            e.printStackTrace()
+            throw RuntimeException(e)
         }
     }
 
+
     override fun getTexture(s: String?): ITexture? {
         val texture = REGULAR.getOrDefault(s, null)?.let { Minecraft.getInstance().textureManager.getTexture(it, null) }.takeIf { it is ITextureWithResourceLocation } ?: return MissingTextureProxy
 

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsCoreClient.kt

@@ -79,7 +79,7 @@ class GenerationsRootSchema(versionKey: Int, parent: Schema?) : Schema(versionKe
     override fun registerBlockEntities(schema: Schema): MutableMap<String, Supplier<TypeTemplate>> = mutableMapOf<String, Supplier<TypeTemplate>>().apply {
         val botarium = when(Cobblemon.implementation.modAPI) {
             ModAPI.FABRIC -> GenerationsReferences.TERRAIUM_FABRIC_INVENTORY
-            ModAPI.FORGE -> GenerationsReferences.TERRAIUM_FORGE_INVENTORY
+            ModAPI.NEOFORGE -> GenerationsReferences.TERRAIUM_FORGE_INVENTORY
             else -> throw RuntimeException("Forge isn't supported by Generations Core")
         }