SCREAM

Author: Waterpicker

common/build.gradle.kts

@@ -17,7 +17,7 @@ dependencies {
 
 //    modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-common-1.21.1", version = "0.0.7")
 
-    implementation(files("../libs/RareCandy-2.14.2.jar"))
+    implementation(files("../libs/RareCandy-3.0.0.jar"))
 
 //    implementation("gg.generations:RareCandy:${project.properties["rareCandy"]}"){isTransitive = false}
 
@@ -30,7 +30,7 @@ dependencies {
     modCompileOnlyApi("mezz.jei:jei-${project.properties["minecraft_version"]}-lib:${project.properties["jei"]}")
     modCompileOnlyApi("mezz.jei:jei-${project.properties["minecraft_version"]}-common-api:${project.properties["jei"]}")
     modRuntimeOnly("mezz.jei:jei-${project.properties["minecraft_version"]}-common:${project.properties["jei"]}")
-
+    modImplementation("curse.maven:irisshaders-455508:6213635")
     //Cobblemon
     implementation(kotlin("stdlib-jdk8"))
     modCompileOnly("com.cobblemon:mod:${project.properties["cobblemon_version"]}")

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

@@ -3,6 +3,7 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
+import gg.generations.rarecandy.renderer.storage.SSBOBuffer;
 
 import java.io.IOException;
 import java.nio.file.FileVisitOption;

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

@@ -24,6 +24,7 @@ import generations.gg.generations.core.generationscore.common.client.render.Rend
 import generations.gg.generations.core.generationscore.common.client.render.TimeCapsuleItemRender
 import generations.gg.generations.core.generationscore.common.client.render.block.entity.*
 import generations.gg.generations.core.generationscore.common.client.render.entity.*
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.MinecraftClientGameProvider
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ModelRegistry
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.Pipelines
@@ -46,6 +47,7 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.altar.TimeSpaceAltarBlockEntity
 import generations.gg.generations.core.generationscore.common.world.sound.WalkmonSoundManager
 import gg.generations.rarecandy.pokeutils.reader.ITextureLoader
+import gg.generations.rarecandy.renderer.components.InstanceDetails
 import gg.generations.rarecandy.renderer.rendering.RareCandy
 import gg.generations.rarecandy.renderer.rendering.RenderStage
 import net.minecraft.client.Camera
@@ -128,14 +130,14 @@ object GenerationsCoreClient {
 //            }
 //        }
 
+        InstanceDetails.size = CobblemonInstance.SIZE
+
         ITextureLoader.setInstance(GenerationsTextureLoader)
 
         implementation.registerResourceReloader(GenerationsCore.id("model_registry"), CompiledModelLoader(), emptyList())
 
         GenerationsClientMolangFunctions.addAnimationFunctions()
 
-        RareCandy.DEBUG_THREADS = true
-
         VaryingModelRepository.inbuilt("strange_ball", ::PokeBallModel)
 
         VaryingModelRepository.registerFactory(".pk", { resourceLocation, resource ->
@@ -174,10 +176,11 @@ object GenerationsCoreClient {
             addWoodType(GenerationsWoodTypes.ULTRA_JUNGLE)
             addWoodType(GenerationsWoodTypes.ULTRA_DARK)
             addWoodType(GenerationsWoodTypes.GHOST)
-            Pipelines.REGISTER.subscribe(handler = Pipelines::initGenerationsPipelines)
 
             Pipelines.onInitialize(event.resourceManager)
 
+
+
             registerScreens()
         })
 
@@ -574,7 +577,7 @@ object GenerationsCoreClient {
         RenderStateRecord.push()
 
         renderRareCandySolid()
-        renderRareCandyTransparent()
+//        renderRareCandyTransparent()
 
         RenderStateRecord.pop()
     }
@@ -595,7 +598,7 @@ object GenerationsCoreClient {
         RenderSystem.enableDepthTest()
         BufferUploader.reset()
 
-        ModelRegistry.worldRareCandy.render(stage, false)
+        ModelRegistry.worldRareCandy.render(stage)
         if (shouldRenderFpsPie()) LOGGER.warn("RareCandy render took " + (System.currentTimeMillis() - startTime) + "ms")
     }
 }

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

@@ -11,7 +11,7 @@ import generations.gg.generations.core.generationscore.common.client.model.Sprit
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ITextureWithResourceLocation
 import generations.gg.generations.core.generationscore.common.util.GenerationsUtils
 import gg.generations.rarecandy.pokeutils.reader.ITextureLoader
-import gg.generations.rarecandy.renderer.loading.ITexture
+import gg.generations.rarecandy.renderer.textures.ITexture
 import net.minecraft.client.Minecraft
 import net.minecraft.client.renderer.texture.MissingTextureAtlasSprite
 import net.minecraft.client.renderer.texture.SimpleTexture
@@ -40,15 +40,20 @@ object GenerationsTextureLoader : ITextureLoader() {
         override fun close() {
         }
         override fun bind(slot: Int) {
-            var texture = Minecraft.getInstance().textureManager.getTexture(MissingTextureAtlasSprite.getLocation())
-
             RenderSystem.activeTexture(GL13C.GL_TEXTURE0 + slot)
-            RenderSystem.bindTexture(texture.id)
+            RenderSystem.bindTexture(id)
         }
 
         override fun width(): Int = 16
 
         override fun height(): Int = 16
+        override fun getId(): Int {
+             return Minecraft.getInstance().textureManager.getTexture(MissingTextureAtlasSprite.getLocation()).id
+        }
+
+        override fun getType(): ITexture.Type? {
+            TODO("Not yet implemented")
+        }
 
     }
 
@@ -77,7 +82,7 @@ object GenerationsTextureLoader : ITextureLoader() {
     }
 
 
-    override fun getTexture(s: String?): ITexture? {
+    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
 
         return texture as ITexture
@@ -138,6 +143,14 @@ object GenerationsTextureLoader : ITextureLoader() {
         override fun height(): Int {
             TODO("Not yet implemented")
         }
+
+        override fun getType(): ITexture.Type {
+            return ITexture.Type.RGBA_BYTE
+        }
+
+        override fun close() {
+            Minecraft.getInstance().textureManager.release(location)
+        }
     }
 
     private class SimpleTextureIndependentData(override var location: ResourceLocation, private val texture: ByteArray?) : SimpleTexture(location), ITextureWithResourceLocation {
@@ -159,6 +172,14 @@ object GenerationsTextureLoader : ITextureLoader() {
             TODO("Not yet implemented")
         }
 
+        override fun close() {
+            Minecraft.getInstance().textureManager.release(location)
+        }
+
+        override fun getType(): ITexture.Type {
+            return ITexture.Type.RGBA_BYTE
+        }
+
         override fun getTextureImage(resourceManager: ResourceManager): TextureImage {
             return load()!!
         }

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

@@ -1,6 +1,7 @@
 package generations.gg.generations.core.generationscore.common.client
 
-import gg.generations.rarecandy.renderer.loading.ITexture
+import gg.generations.rarecandy.renderer.textures.ITexture
+import gg.generations.rarecandy.renderer.textures.ITexture.*
 import org.lwjgl.opengl.GL11
 import org.lwjgl.opengl.GL11C
 import org.lwjgl.opengl.GL13C
@@ -12,7 +13,7 @@ import java.io.IOException
 import java.nio.ByteBuffer
 
 class Texture(private var details: TextureDetails?) : ITexture {
-    var id: Int = 0
+    var textureId: Int = 0
 
     @JvmRecord
     data class TextureDetails(val buffer: ByteBuffer, val type: Type, val width: Int, val height: Int) :
@@ -50,11 +51,11 @@ class Texture(private var details: TextureDetails?) : ITexture {
 
     override fun bind(slot: Int) {
         if (details != null) {
-            this.id = details!!.init()
+            this.textureId = details!!.init()
             details = null
         }
 
-        assert(slot >= 0 && slot <= 31)
+        assert(slot in 0..31)
         GL13C.glActiveTexture(GL13C.GL_TEXTURE0 + slot)
         GL11C.glBindTexture(GL11C.GL_TEXTURE_2D, this.id)
     }
@@ -67,16 +68,19 @@ class Texture(private var details: TextureDetails?) : ITexture {
         return 0
     }
 
+    override fun getId(): Int {
+        return textureId;
+    }
+
+    override fun getType(): Type {
+        return Type.RGBA_BYTE;
+    }
+
     @Throws(IOException::class)
     override fun close() {
         GL11.glDeleteTextures(id)
     }
 
-    enum class Type(internal val internalFormat: Int, val format: Int, val type: Int) {
-        RGBA_BYTE(GL30.GL_RGBA8, GL30.GL_RGBA, GL30.GL_UNSIGNED_BYTE),
-        RGB_BYTE(GL30.GL_RGB8, GL30.GL_RGB, GL30.GL_UNSIGNED_BYTE)
-    }
-
     companion object {
         @Throws(IOException::class)
         fun read(imageBytes: ByteArray, name: String?): Texture {

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

@@ -14,7 +14,7 @@ import net.minecraft.world.entity.Entity
 import org.joml.Matrix4f
 
 class StatueClientDelegate(entity: StatueEntity) : StatueSideDelegate, PosableState(), CobblemonInstanceProvider {
-    override var instance = StatueInstance(Matrix4f(), Matrix4f(), null)
+    override var instance = StatueInstance()
     var currentEntity: StatueEntity = entity
 
 

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

@@ -1,9 +1,10 @@
 package generations.gg.generations.core.generationscore.common.client.model
 
+import generations.gg.generations.core.generationscore.common.client.render.rarecandy.CobblemonInstance
 import gg.generations.rarecandy.renderer.rendering.ObjectInstance
 
 interface InstanceProvider {
-    fun generateInstance(): ObjectInstance?
+    fun generateInstance(): CobblemonInstance
 
-    var instanceArray: Array<ObjectInstance?>?
+    var instanceArray: MutableList<CobblemonInstance>?
 }

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

@@ -32,7 +32,9 @@ public interface FrameProvider extends ModelProvider {
     }
 
     public interface TintProvider {
-        @Nullable Vector3f getTint();
+        default int getTint() {
+            return 0xffffffff;
+        }
     }
 
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/ModelContextProviders.java

@@ -4,19 +4,14 @@ import com.cobblemon.mod.common.client.render.models.blockbench.repository.Rende
 import generations.gg.generations.core.generationscore.common.client.render.CobblemonInstanceProvider
 import generations.gg.generations.core.generationscore.common.client.render.rarecandy.ModelRegistry
 import gg.generations.rarecandy.renderer.animation.Animation
-import gg.generations.rarecandy.renderer.components.AnimatedMeshObject
+
 import net.minecraft.resources.ResourceLocation
 
 data class RareCandyAnimation(private val model: ResourceLocation, private val name: String) {
 
     val animation: Animation?
         get() {
-            val objects = ModelRegistry[model]?.renderObject ?: return null
-            if (objects.isReady) {
-                return (objects.objects[0] as AnimatedMeshObject).animations[name]
-            }
-
-            return null
+            return ModelRegistry[model]/*?.takeIf { it.isReady }*/?.getAnimation(name)
         }
 
     fun run(
@@ -41,8 +36,12 @@ data class RareCandyAnimation(private val model: ResourceLocation, private val n
 
         instance.setAnimation(anim)
 
-        instance.matrixTransforms = anim.getFrameTransform((currentSeconds).toDouble())
-        anim.getFrameOffset(instance.currentAnimation!!)
+        val currentAnim = instance.currentAnimation!!;
+
+        currentAnim.update(currentSeconds.toDouble())
+
+        currentAnim.matrixTransforms = anim.getFrameTransform(currentAnim)
+        anim.getFrameOffset(currentAnim)
 
         return true
     }