fix: paintings

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

@@ -30,13 +30,13 @@ public abstract class PaintingVariantsMixin {
         register(registry, PAN, 2, 2);
         register(registry, PROGRESS, 4, 4);
         register(registry, QUEER, 1, 1);
-        register(registry, STRAIGHT_ALLY, 2, 2);
+        register(registry, ALLY, 2, 2);
         register(registry, TRANS, 2, 2);
         register(registry, BIRB, 2,2);
         register(registry, DEMIROMANTIC,2 ,2);
         register(registry, DEMISEXUAL,2 ,2);
         register(registry, FLOATING_TREES,2 ,2);
-        register(registry, FLOATING_BIIS,2 ,2);
+        register(registry, FLOATING_BEES,2 ,2);
     }
 
     @Shadow

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

@@ -22,13 +22,13 @@ public class ModPaintings {
     public static final RegistryKey<PaintingVariant> PAN =              of("pan");
     public static final RegistryKey<PaintingVariant> PROGRESS =         of("progress");
     public static final RegistryKey<PaintingVariant> QUEER =            of("queer");
-    public static final RegistryKey<PaintingVariant> STRAIGHT_ALLY =    of("straight_ally");
+    public static final RegistryKey<PaintingVariant> ALLY =             of("ally");
     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_BIIS =    of("floating_biis");
+    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));

src/main/resources/data/joy/painting_variant/ace.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:ace",
+  "asset_id": "joy:ace",
   "height": 1,
   "width": 2
 }

src/main/resources/data/joy/painting_variant/agender.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:agender",
+  "height": 1,
+  "width": 1
+}

src/main/resources/data/joy/painting_variant/aro.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:aro",
+  "asset_id": "joy:aro",
   "height": 1,
   "width": 2
 }

src/main/resources/data/joy/painting_variant/aroace.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:aroace",
+  "asset_id": "joy:aroace",
   "height": 3,
   "width": 4
 }

src/main/resources/data/joy/painting_variant/bigender.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:bigender",
+  "height": 1,
+  "width": 1
+}

src/main/resources/data/joy/painting_variant/birb.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:birb",
+  "asset_id": "joy:birb",
   "height": 3,
   "width": 3
 }

src/main/resources/data/joy/painting_variant/bisexual.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:bisexual",
+  "height": 2,
+  "width": 2
+}

src/main/resources/data/joy/painting_variant/enby.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:enby",
+  "asset_id": "joy:enby",
   "height": 2,
   "width": 2
 }

src/main/resources/data/joy/painting_variant/gay.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:gay",
+  "asset_id": "joy:gay",
   "height": 2,
   "width": 2
 }

src/main/resources/data/joy/painting_variant/intersex.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:intersex",
+  "height": 4,
+  "width": 4
+}

src/main/resources/data/joy/painting_variant/lesbian.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:lesbian",
+  "height": 3,
+  "width": 4
+}

src/main/resources/data/joy/painting_variant/mlm.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:mlm",
+  "asset_id": "joy:mlm",
   "height": 1,
   "width": 1
 }

src/main/resources/data/joy/painting_variant/pan.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:pan",
+  "asset_id": "joy:pan",
   "height": 2,
   "width": 2
 }

src/main/resources/data/joy/painting_variant/progress.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:progress",
+  "height": 4,
+  "width": 4
+}

src/main/resources/data/joy/painting_variant/queer.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:queer",
+  "asset_id": "joy:queer",
   "height": 1,
   "width": 1
 }

src/main/resources/data/joy/painting_variant/straight_ally.json

@@ -0,0 +1,5 @@
+{
+  "asset_id": "joy:straight_ally",
+  "height": 2,
+  "width": 2
+}

src/main/resources/data/joy/painting_variant/trans.json

@@ -1,5 +1,5 @@
 {
-  "asset_id": "joymod:trans",
+  "asset_id": "joy:trans",
   "height": 2,
   "width": 2
 }

src/main/resources/data/joymod/painting_variant/agender.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:agender",
-  "height": 1,
-  "width": 1
-}

src/main/resources/data/joymod/painting_variant/bigender.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:bigender",
-  "height": 1,
-  "width": 1
-}

src/main/resources/data/joymod/painting_variant/bisexual.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:bisexual",
-  "height": 2,
-  "width": 2
-}

src/main/resources/data/joymod/painting_variant/intersex.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:intersex",
-  "height": 4,
-  "width": 4
-}

src/main/resources/data/joymod/painting_variant/lesbian.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:lesbian",
-  "height": 3,
-  "width": 4
-}

src/main/resources/data/joymod/painting_variant/progress.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:progress",
-  "height": 4,
-  "width": 4
-}

src/main/resources/data/joymod/painting_variant/straight_ally.json

@@ -1,5 +0,0 @@
-{
-  "asset_id": "joymod:straight_ally",
-  "height": 2,
-  "width": 2
-}

src/main/resources/data/minecraft/tags/painting_variant/placeable.json

@@ -1,21 +1,21 @@
 {
   "replace": false,
   "values": [
-    "joymod:ace",
+    "joy:ace",
-    "joymod:agender",
+    "joy:agender",
-    "joymod:aro",
+    "joy:aro",
-    "joymod:aroace",
+    "joy:aroace",
-    "joymod:bigender",
+    "joy:bigender",
-    "joymod:bisexual",
+    "joy:bisexual",
-    "joymod:enby",
+    "joy:enby",
-    "joymod:gay",
+    "joy:gay",
-    "joymod:intersex",
+    "joy:intersex",
-    "joymod:lesbian",
+    "joy:lesbian",
-    "joymod:mlm",
+    "joy:mlm",
-    "joymod:pan",
+    "joy:pan",
-    "joymod:progress",
+    "joy:progress",
-    "joymod:queer",
+    "joy:queer",
-    "joymod:straight_ally",
+    "joy:straight_ally",
-    "joymod:trans"
+    "joy:trans"
   ]
 }