fix: paintings

TODO.md

@@ -7,7 +7,7 @@
 - [ ] All pride candles
 - [ ] All pride beds
 - [ ] All pride entity variants
-- [ ] All paintings from Pridepack
+- [X] All paintings from Pridepack
 - [ ] All splashes from Pridepack
 - [ ] Pride banners (different from Minecraft's actual banners)
 - [ ] Pride shulker boxes

src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java

@@ -16,27 +16,28 @@ import static gay.pridecraft.joy.painting.ModPaintings.*;
 public abstract class PaintingVariantsMixin {
     @Inject(method = "bootstrap", at = @At("RETURN"))
     private static void bootstrap(Registerable<PaintingVariant> registry, CallbackInfo ci) {
-        register(registry, ACE, 2, 1);
+        register(registry, ACE, 2,1);
-        register(registry, AGENDER, 1, 1);
+        register(registry, AGENDER, 1,1);
-        register(registry, ARO, 2, 1);
+        register(registry, ALLY,2,2);
-        register(registry, AROACE, 4, 3);
+        register(registry, ARO, 2,1);
-        register(registry, BIGENDER, 1, 1);
+        register(registry, AROACE, 4,3);
-        register(registry, BISEXUAL, 2, 2);
+        register(registry, BI, 2,2);
-        register(registry, ENBY, 2, 2);
+        register(registry, BIGENDER, 1,1);
-        register(registry, GAY, 2, 2);
-        register(registry, INTERSEX, 4, 4);
-        register(registry, LESBIAN, 4, 3);
-        register(registry, MLM, 1, 1);
-        register(registry, PAN, 2, 2);
-        register(registry, PROGRESS, 4, 4);
-        register(registry, QUEER, 1, 1);
-        register(registry, ALLY, 2, 2);
-        register(registry, TRANS, 2, 2);
         register(registry, BIRB, 2,2);
-        register(registry, DEMIROMANTIC,2 ,2);
+        register(registry, DEMIROMANTIC,2,2);
-        register(registry, DEMISEXUAL,2 ,2);
+        register(registry, DEMISEXUAL,2,2);
-        register(registry, FLOATING_TREES,2 ,2);
+        register(registry, ENBY, 2,2);
-        register(registry, FLOATING_BEES,2 ,2);
+        register(registry, FLOATING_TREES,2,2);
+        register(registry, FLOATING_BEES,2,2);
+        register(registry, INTERSEX, 4,4);
+        register(registry, LESBIAN, 4,3);
+        register(registry, MLM, 1,1);
+        register(registry, PAN, 2,2);
+        register(registry, POLYSEXUAL,2,2);
+        register(registry, PROGRESS, 4,4);
+        register(registry, QUEER, 1,1);
+        register(registry, RAINBOW, 2,2);
+        register(registry, TRANS, 2,2);
     }
 
     @Shadow

src/main/java/gay/pridecraft/joy/painting/ModPaintings.java

@@ -10,25 +10,26 @@ import static gay.pridecraft.joy.Joy.MOD_ID;
 public class ModPaintings {
     public static final RegistryKey<PaintingVariant> ACE =              of("ace");
     public static final RegistryKey<PaintingVariant> AGENDER =          of("agender");
+    public static final RegistryKey<PaintingVariant> ALLY =             of("ally");
     public static final RegistryKey<PaintingVariant> ARO =              of("aro");
     public static final RegistryKey<PaintingVariant> AROACE =           of("aroace");
+    public static final RegistryKey<PaintingVariant> BI =               of("bi");
     public static final RegistryKey<PaintingVariant> BIGENDER =         of("bigender");
-    public static final RegistryKey<PaintingVariant> BISEXUAL =         of("bisexual");
+    public static final RegistryKey<PaintingVariant> BIRB =             of("birb");
+    public static final RegistryKey<PaintingVariant> DEMIROMANTIC =     of("demiromantic");
+    public static final RegistryKey<PaintingVariant> DEMISEXUAL =       of("demisexual");
     public static final RegistryKey<PaintingVariant> ENBY =             of("enby");
-    public static final RegistryKey<PaintingVariant> GAY =              of("gay");
+    public static final RegistryKey<PaintingVariant> FLOATING_BEES =    of("floating_bees");
+    public static final RegistryKey<PaintingVariant> FLOATING_TREES =   of("floating_trees");
     public static final RegistryKey<PaintingVariant> INTERSEX =         of("intersex");
     public static final RegistryKey<PaintingVariant> LESBIAN =          of("lesbian");
     public static final RegistryKey<PaintingVariant> MLM =              of("mlm");
     public static final RegistryKey<PaintingVariant> PAN =              of("pan");
+    public static final RegistryKey<PaintingVariant> POLYSEXUAL =       of("polysexual");
     public static final RegistryKey<PaintingVariant> PROGRESS =         of("progress");
     public static final RegistryKey<PaintingVariant> QUEER =            of("queer");
-    public static final RegistryKey<PaintingVariant> ALLY =             of("ally");
+    public static final RegistryKey<PaintingVariant> RAINBOW =          of("rainbow");
     public static final RegistryKey<PaintingVariant> TRANS =            of("trans");
-    public static final RegistryKey<PaintingVariant> BIRB =             of("birb");
-    public static final RegistryKey<PaintingVariant> DEMIROMANTIC =     of("demiromantic");
-    public static final RegistryKey<PaintingVariant> DEMISEXUAL =       of("demisexual");
-    public static final RegistryKey<PaintingVariant> FLOATING_TREES =   of("floating_trees");
-    public static final RegistryKey<PaintingVariant> FLOATING_BEES =    of("floating_bees");
 
     private static RegistryKey<PaintingVariant> of(String id) {
         return RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Identifier.of(MOD_ID, id));