3.1.0 - Moved effect and paradox from material to variant. Old models should still work but paradox animation and post process material effect won't work.

Author: Waterpicker

build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 }
 
 group = "gg.generations"
-version = "3.0.0"
+version = "3.1.0"
 
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 

src/library/java/gg/generations/rarecandy/pokeutils/MaterialReference.java

@@ -12,7 +12,6 @@
 public class MaterialReference {
     public String parent;
     public String shader;
-    public String effect;
 
     public CullType cull;
 
@@ -22,10 +21,9 @@ public class MaterialReference {
 
     public MaterialValues values;
 
-    public MaterialReference(String parent, String shader, String effect, CullType cull, BlendType blend, MaterialImages images, MaterialValues values) {
+    public MaterialReference(String parent, String shader, CullType cull, BlendType blend, MaterialImages images, MaterialValues values) {
         this.parent = parent;
         this.shader = shader;
-        this.effect = effect;
         this.cull = cull;
         this.blend = blend;
         this.images = images;
@@ -42,7 +40,6 @@ public void complete(Map<String, MaterialReference> materialReferenceMap) {
             else {
 
                 if (!Objects.equals(shader, reference.shader)) shader = reference.shader;
-                if (effect == null) effect = reference.effect;
                 if (!Objects.equals(cull, reference.cull)) cull = reference.cull;
                 if (!Objects.equals(blend, reference.blend)) blend = reference.blend;
 
@@ -67,31 +64,21 @@ public void complete(Map<String, MaterialReference> materialReferenceMap) {
     public static Material process(MaterialReference reference, List<String> imageNames) {
         var images = reference.images.toArray(imageNames);
 
-        int method = switch (reference.shader) {
+        int method = 0;
+        if (reference.shader != null) {
+            method = switch (reference.shader) {
                 case "layered" -> 1;
                 case "masked" -> 2;
                 default -> 0;
-        };
-
-        var effectRef = reference.effect;
-
-
-        var effect = switch (reference.effect) {
-                case "galaxy" -> 1;
-                case "pastel" -> 2;
-                case "shadow" -> 3;
-                case "sketch" -> 4;
-                case "vintage" -> 5;
-            case null, default -> 0;
-        };
+            };
+        }
 
         return new Material(
                 images,
                 reference.values,
                 reference.cull,
                 reference.blend,
-                method,
-                effect
+                method
         );
     }
 
@@ -101,8 +88,6 @@ public MaterialReference deserialize(JsonElement json, Type typeOfT, JsonDeseria
 
             String shader = null;
 
-            String effect = null;
-
             CullType cull = CullType.None;
 
             BlendType blend = BlendType.None;
@@ -150,20 +135,13 @@ public MaterialReference deserialize(JsonElement json, Type typeOfT, JsonDeseria
                     switch (shader) {
                         case "masked_paradox" -> {
                             shader = "masked";
-                            values.setUseParadox(true);
                         }
                         case "paradox", "solid_paradox" -> {
                             shader = "solid";
-                            values.setUseParadox(true);
                         }
                     }
                 }
 
-                if(jsonObject.has("effect")) {
-
-                    effect = jsonObject.getAsJsonPrimitive("effect").getAsString();
-                }
-
                 if(jsonObject.has("cull")) cull = CullType.from(jsonObject.getAsJsonPrimitive("cull").getAsString());
                 if(jsonObject.has("blend")) blend = BlendType.from(jsonObject.getAsJsonPrimitive("blend").getAsString());
                 if(jsonObject.has("images")) images.fill(jsonObject.getAsJsonObject("images"));
@@ -174,7 +152,7 @@ public MaterialReference deserialize(JsonElement json, Type typeOfT, JsonDeseria
                 }
             }
 
-            return new MaterialReference(parent, shader, effect, cull, blend, images, values);
+            return new MaterialReference(parent, shader, cull, blend, images, values);
         }
     }
 
@@ -217,7 +195,6 @@ public boolean equals(Object o) {
         // Compare simple fields
         if (!Objects.equals(parent, that.parent)) return false;
         if (!Objects.equals(shader, that.shader)) return false;
-        if (!Objects.equals(effect, that.effect)) return false;
         if (!Objects.equals(cull, that.cull)) return false;
         if (!Objects.equals(blend, that.blend)) return false;
 
@@ -229,7 +206,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hash(parent, shader, effect, cull, blend, values, images);
+        return Objects.hash(parent, shader, cull, blend, values, images);
     }
 
     // Helper method to compare images based on exact byte content of key-value pairs

src/library/java/gg/generations/rarecandy/pokeutils/PixelAsset.java

@@ -24,7 +24,9 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
 
@@ -54,17 +56,20 @@ public class PixelAsset {
                 var obj = new JsonObject();
                 if (variantDetails.material() != null) obj.addProperty("material", variantDetails.material());
                 if (variantDetails.hide() != null) obj.addProperty("hide", variantDetails.hide());
+                if (variantDetails.paradox() != null) obj.addProperty("paradox", variantDetails.paradox());
                 if (variantDetails.offset() != null && variantDetails.offset() != AnimationController.NO_OFFSET)
                     obj.add("transform", ctx.serialize(variantDetails.offset()));
 
                 return obj;
             }, (jsonElement, ctx) -> {
                 var obj = jsonElement.getAsJsonObject();
                 var material = obj.has("material") ? obj.getAsJsonPrimitive("material").getAsString() : null;
+                var effect = obj.has("effect") ? obj.getAsJsonPrimitive("effect").getAsString() : null;
+                var paradox = obj.has("paradox") ? obj.getAsJsonPrimitive("paradox").getAsBoolean() : null;
                 var hide = obj.has("hide") ? obj.getAsJsonPrimitive("hide").getAsBoolean() : null;
                 Transform offset = obj.has("offset") ? ctx.deserialize(obj.get("offset"), Transform.class) : null;
                 if(offset == null && obj.has("transform")) offset = ctx.deserialize(obj.get("transform"), Transform.class);
-                return new VariantDetails(material, hide, offset);
+                return new VariantDetails(material, effect, paradox, hide, offset);
             }))
             .registerTypeAdapter(Transform.class, new GenericJsonThing<>((transform, ctx) -> {
                 if (transform.scale().x == 1 && transform.scale().y == 1) {
@@ -214,12 +219,20 @@ public PixelAsset(Map<String, byte[]> map, String name) {
                 var json = new String(entry.getValue());
 
                 config = GSON.fromJson(json, ModelConfig.class);
+
+                config.materials.forEach((s, reference) -> {
+                    var images = reference.images;
+
+                    images.applyModelName(name);
+                });
             }
 
-            files.put(entry.getKey(), entry.getValue());
-        }
+            var key = entry.getKey();
 
+            key = key.contains(".png") ? name + "-" + key : key;
 
+            files.put(key, entry.getValue());
+        }
 
         updateSettings();
 

src/library/java/gg/generations/rarecandy/pokeutils/VariantDetails.java

@@ -2,17 +2,21 @@
 
 import gg.generations.rarecandy.renderer.animation.Transform;
 
-public record VariantDetails(String material, Boolean hide, Transform offset) {
+public record VariantDetails(String material, String effect, Boolean paradox, Boolean hide, Transform offset) {
     public VariantDetails fillIn(VariantDetails filler) {
         var newMaterial = material;
+        var newEffect = effect;
+        var newParadox = paradox;
         var newHide = hide;
         var newOffset = offset;
 
         if (newMaterial == null) newMaterial = filler.material;
+        if (newEffect == null) newEffect = filler.effect;
+        if (newParadox == null) newParadox = filler.paradox != null ? filler.paradox : false;
         if (newHide == null) newHide = filler.hide != null ? filler.hide : false;
         if (newOffset == null) newOffset = filler.offset != null ? filler.offset : null;
 
-        return new VariantDetails(newMaterial, newHide, newOffset);
+        return new VariantDetails(newMaterial, newEffect, newParadox, newHide, newOffset);
     }
 
     public VariantDetails fillIn() {

src/library/java/gg/generations/rarecandy/pokeutils/reader/ITextureLoader.java

@@ -19,8 +19,20 @@ public static void setInstance(ITextureLoader instance) {
         ITextureLoader.instance = instance;
     }
 
+    public abstract boolean contains(String name);
+
     public abstract ITexture getTexture(String name);
 
+    public ITexture getTexture(String name, String defaultName) {
+        if(contains(name)) {
+            return getTexture(name);
+        } else if(contains(defaultName)) {
+            return getTexture(defaultName);
+        } else {
+            return getDarkFallback();
+        }
+    }
+
     public abstract void register(String name, ITexture reference);
 
     public abstract void register(String id, String fileName, byte[] data);

src/library/java/gg/generations/rarecandy/renderer/components/MultiRenderObject.java

@@ -39,6 +39,8 @@ public abstract class MultiRenderObject {
     public SbboOffset vertex;
     public SbboOffset index;
     public SbboOffset draw;
+    public SbboOffset material;
+    public SbboOffset variant;
     public SbboOffset target;
 
     public SSBOBuffer instanceBuffer;
@@ -184,9 +186,9 @@ public void updateSSBOs() {
 
                 Transform transform = variant.offset();
 
-                if (instance instanceof AnimatedObjectInstance animatedInstance) {
+                var material = variant.material();
 
-                    var material = variant.material();
+                if (instance instanceof AnimatedObjectInstance animatedInstance) {
 
                     var t = animatedInstance.getTransform(material);
 
@@ -200,6 +202,8 @@ public void updateSSBOs() {
                 }
 
                 transform.upload(uvTransformBuffer);
+                uvTransformBuffer.put(instance.variant());
+                uvTransformBuffer.move(4);
             }
         }
 
@@ -230,7 +234,7 @@ private void ensureCapacity() {
         uvTransformBuffer.ensureCapacity(
                 (long) instances.size()
                         * meshes.length
-                        * Float.BYTES * 4
+                        * (Float.BYTES * 4 + Integer.BYTES * 2)
         );
     }