Scope drift is drifti

Author: Waterpicker

build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     `maven-publish`
     idea
     id("com.github.johnrengelman.shadow") version "8.1.1"
+    kotlin("jvm") version "2.0.10"
 }
 
 group = "gg.generations"
@@ -16,20 +17,17 @@ version = "2.11.25"
 java.toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 
 sourceSets {
-    val assetLoading = create("library") {
-        compileClasspath += main.get().compileClasspath
-    }
 
-    val patches = create("patches") {
+    val library = create("library") {
+        kotlin.srcDirs("src/library/java")
+        java.srcDirs("src/patches/java")
         compileClasspath += main.get().compileClasspath
     }
 
-
     main {
-        this.compileClasspath += assetLoading.output
-        this.compileClasspath += patches.output
-        this.runtimeClasspath += assetLoading.output
-        this.runtimeClasspath += patches.output
+        kotlin.srcDirs("src/main/java")
+        this.compileClasspath += library.output
+        this.runtimeClasspath += library.output
 
     }
 }
@@ -112,7 +110,6 @@ tasks {
     var rareCandy = register<ShadowJar>("rare_candy") {
         archiveBaseName.set("RareCandy")
         from(sourceSets.getByName("library").output.classesDirs)
-        from(sourceSets.getByName("patches").output.classesDirs)
 
         exclude("src/main/**", "org/lwjgl/**", "module-info.class")
 
@@ -162,11 +159,4 @@ publishing {
             }
         }
     }
-
-
-}
-
-fun mcDependency(handler: DependencyHandlerScope, group: String, name: String) {
-    handler.compileOnly("$group:$name")
-    handler.testImplementation("$group:$name")
-}
+}

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

@@ -1,4 +1,9 @@
 package gg.generations.rarecandy.pokeutils;
 
-public class AssetSource {
+import java.util.Set;
+
+public interface AssetSource {
+    byte[] get(String name);
+    boolean set(String name, byte[] data);
+    Set<String> list();
 }

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

@@ -1,4 +1,32 @@
 package gg.generations.rarecandy.pokeutils;
 
-public class MemoryAssetSource {
+import java.util.Map;
+import java.util.Set;
+
+public class MemoryAssetSource implements AssetSource {
+    private final Map<String, byte[]> files;
+
+    public MemoryAssetSource(Map<String, byte[]> files) {
+        this.files = files;
+    }
+
+    @Override
+    public byte[] get(String name) {
+        return files.get(name);
+    }
+
+    @Override
+    public boolean set(String name, byte[] data) {
+        try {
+            files.put(name, data);
+            return true;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    @Override
+    public Set<String> list() {
+        return files.keySet();
+    }
 }

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

@@ -2,7 +2,6 @@
 
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import gg.generations.rarecandy.pokeutils.codec.ModelConfigCodecs;
 import gg.generations.rarecandy.pokeutils.material.MaterialReference;
 import gg.generations.rarecandy.pokeutils.material.MeshOptions;
 import gg.generations.rarecandy.pokeutils.material.VariantDetails;
@@ -173,7 +172,7 @@ public boolean check(String animation) {
      */
     public static final Codec<ModelConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             Codec.FLOAT.optionalFieldOf("scale", 1.0f).forGetter(c -> c.scale),
-            Codecs.processing(Codecs.map(Codec.STRING, MaterialReference.CODEC), a -> a, ModelConfigCodecs::editEffects).fieldOf("materials").forGetter(c -> c.materials),
+            Codecs.map(Codec.STRING, MaterialReference.CODEC).fieldOf("materials").forGetter(c -> c.materials),
             Codecs.map(Codec.STRING, VariantDetails.CODEC).optionalFieldOf("defaultVariant",Map.of()).forGetter(c -> c.defaultVariant),
             Codecs.map(Codec.STRING, VariantParent.CODEC).optionalFieldOf("variants", Map.of()).forGetter(c -> c.variants),
             Codecs.map(Codec.STRING, HideDuringAnimation.CODEC).optionalFieldOf("hideDuringAnimation", Map.of()).forGetter(c -> c.hideDuringAnimation),