From 516110951dd65ad9bd7453e1e347bbd7dca012dd Mon Sep 17 00:00:00 2001 From: blryface <124838505+blryface@users.noreply.github.com> Date: Sat, 2 Nov 2024 02:24:55 -0300 Subject: [PATCH] fix: paintings --- .../joy/mixin/PaintingVariantsMixin.java | 4 +-- .../pridecraft/joy/painting/ModPaintings.java | 4 +-- .../{joymod => joy}/painting_variant/ace.json | 2 +- .../data/joy/painting_variant/agender.json | 5 +++ .../{joymod => joy}/painting_variant/aro.json | 2 +- .../painting_variant/aroace.json | 2 +- .../data/joy/painting_variant/bigender.json | 5 +++ .../painting_variant/birb.json | 2 +- .../data/joy/painting_variant/bisexual.json | 5 +++ .../painting_variant/enby.json | 2 +- .../{joymod => joy}/painting_variant/gay.json | 2 +- .../data/joy/painting_variant/intersex.json | 5 +++ .../data/joy/painting_variant/lesbian.json | 5 +++ .../{joymod => joy}/painting_variant/mlm.json | 2 +- .../{joymod => joy}/painting_variant/pan.json | 2 +- .../data/joy/painting_variant/progress.json | 5 +++ .../painting_variant/queer.json | 2 +- .../joy/painting_variant/straight_ally.json | 5 +++ .../painting_variant/trans.json | 2 +- .../data/joymod/painting_variant/agender.json | 5 --- .../joymod/painting_variant/bigender.json | 5 --- .../joymod/painting_variant/bisexual.json | 5 --- .../joymod/painting_variant/intersex.json | 5 --- .../data/joymod/painting_variant/lesbian.json | 5 --- .../joymod/painting_variant/progress.json | 5 --- .../painting_variant/straight_ally.json | 5 --- .../tags/painting_variant/placeable.json | 32 +++++++++---------- 27 files changed, 65 insertions(+), 65 deletions(-) rename src/main/resources/data/{joymod => joy}/painting_variant/ace.json (52%) create mode 100644 src/main/resources/data/joy/painting_variant/agender.json rename src/main/resources/data/{joymod => joy}/painting_variant/aro.json (52%) rename src/main/resources/data/{joymod => joy}/painting_variant/aroace.json (50%) create mode 100644 src/main/resources/data/joy/painting_variant/bigender.json rename src/main/resources/data/{joymod => joy}/painting_variant/birb.json (51%) create mode 100644 src/main/resources/data/joy/painting_variant/bisexual.json rename src/main/resources/data/{joymod => joy}/painting_variant/enby.json (51%) rename src/main/resources/data/{joymod => joy}/painting_variant/gay.json (52%) create mode 100644 src/main/resources/data/joy/painting_variant/intersex.json create mode 100644 src/main/resources/data/joy/painting_variant/lesbian.json rename src/main/resources/data/{joymod => joy}/painting_variant/mlm.json (52%) rename src/main/resources/data/{joymod => joy}/painting_variant/pan.json (52%) create mode 100644 src/main/resources/data/joy/painting_variant/progress.json rename src/main/resources/data/{joymod => joy}/painting_variant/queer.json (50%) create mode 100644 src/main/resources/data/joy/painting_variant/straight_ally.json rename src/main/resources/data/{joymod => joy}/painting_variant/trans.json (50%) delete mode 100644 src/main/resources/data/joymod/painting_variant/agender.json delete mode 100644 src/main/resources/data/joymod/painting_variant/bigender.json delete mode 100644 src/main/resources/data/joymod/painting_variant/bisexual.json delete mode 100644 src/main/resources/data/joymod/painting_variant/intersex.json delete mode 100644 src/main/resources/data/joymod/painting_variant/lesbian.json delete mode 100644 src/main/resources/data/joymod/painting_variant/progress.json delete mode 100644 src/main/resources/data/joymod/painting_variant/straight_ally.json diff --git a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java b/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java index 687f045..f9f4dcc 100644 --- a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java +++ b/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 diff --git a/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java b/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java index 1e32e13..e176e38 100644 --- a/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java +++ b/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java @@ -22,13 +22,13 @@ public class ModPaintings { public static final RegistryKey PAN = of("pan"); public static final RegistryKey PROGRESS = of("progress"); public static final RegistryKey QUEER = of("queer"); - public static final RegistryKey STRAIGHT_ALLY = of("straight_ally"); + public static final RegistryKey ALLY = of("ally"); public static final RegistryKey TRANS = of("trans"); public static final RegistryKey BIRB = of("birb"); public static final RegistryKey DEMIROMANTIC = of("demiromantic"); public static final RegistryKey DEMISEXUAL = of("demisexual"); public static final RegistryKey FLOATING_TREES = of("floating_trees"); - public static final RegistryKey FLOATING_BIIS = of("floating_biis"); + public static final RegistryKey FLOATING_BEES = of("floating_bees"); private static RegistryKey of(String id) { return RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Identifier.of(MOD_ID, id)); diff --git a/src/main/resources/data/joymod/painting_variant/ace.json b/src/main/resources/data/joy/painting_variant/ace.json similarity index 52% rename from src/main/resources/data/joymod/painting_variant/ace.json rename to src/main/resources/data/joy/painting_variant/ace.json index 29baebf..f838d95 100644 --- a/src/main/resources/data/joymod/painting_variant/ace.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/agender.json b/src/main/resources/data/joy/painting_variant/agender.json new file mode 100644 index 0000000..fd04ff9 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/agender.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:agender", + "height": 1, + "width": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/aro.json b/src/main/resources/data/joy/painting_variant/aro.json similarity index 52% rename from src/main/resources/data/joymod/painting_variant/aro.json rename to src/main/resources/data/joy/painting_variant/aro.json index ed78d68..cb34a1a 100644 --- a/src/main/resources/data/joymod/painting_variant/aro.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/aroace.json b/src/main/resources/data/joy/painting_variant/aroace.json similarity index 50% rename from src/main/resources/data/joymod/painting_variant/aroace.json rename to src/main/resources/data/joy/painting_variant/aroace.json index f31cbdd..545acbd 100644 --- a/src/main/resources/data/joymod/painting_variant/aroace.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/bigender.json b/src/main/resources/data/joy/painting_variant/bigender.json new file mode 100644 index 0000000..bd14348 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/bigender.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:bigender", + "height": 1, + "width": 1 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/birb.json b/src/main/resources/data/joy/painting_variant/birb.json similarity index 51% rename from src/main/resources/data/joymod/painting_variant/birb.json rename to src/main/resources/data/joy/painting_variant/birb.json index b351af3..2ebcb83 100644 --- a/src/main/resources/data/joymod/painting_variant/birb.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/bisexual.json b/src/main/resources/data/joy/painting_variant/bisexual.json new file mode 100644 index 0000000..33d7d90 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/bisexual.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:bisexual", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/enby.json b/src/main/resources/data/joy/painting_variant/enby.json similarity index 51% rename from src/main/resources/data/joymod/painting_variant/enby.json rename to src/main/resources/data/joy/painting_variant/enby.json index a098227..28d5410 100644 --- a/src/main/resources/data/joymod/painting_variant/enby.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/gay.json b/src/main/resources/data/joy/painting_variant/gay.json similarity index 52% rename from src/main/resources/data/joymod/painting_variant/gay.json rename to src/main/resources/data/joy/painting_variant/gay.json index f7b7794..b82bec6 100644 --- a/src/main/resources/data/joymod/painting_variant/gay.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/intersex.json b/src/main/resources/data/joy/painting_variant/intersex.json new file mode 100644 index 0000000..771b332 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/intersex.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:intersex", + "height": 4, + "width": 4 +} \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/lesbian.json b/src/main/resources/data/joy/painting_variant/lesbian.json new file mode 100644 index 0000000..6bfa731 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/lesbian.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:lesbian", + "height": 3, + "width": 4 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/mlm.json b/src/main/resources/data/joy/painting_variant/mlm.json similarity index 52% rename from src/main/resources/data/joymod/painting_variant/mlm.json rename to src/main/resources/data/joy/painting_variant/mlm.json index eed0b92..1da910e 100644 --- a/src/main/resources/data/joymod/painting_variant/mlm.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/pan.json b/src/main/resources/data/joy/painting_variant/pan.json similarity index 52% rename from src/main/resources/data/joymod/painting_variant/pan.json rename to src/main/resources/data/joy/painting_variant/pan.json index d1de4e5..227af5a 100644 --- a/src/main/resources/data/joymod/painting_variant/pan.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/progress.json b/src/main/resources/data/joy/painting_variant/progress.json new file mode 100644 index 0000000..331899c --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/progress.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:progress", + "height": 4, + "width": 4 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/queer.json b/src/main/resources/data/joy/painting_variant/queer.json similarity index 50% rename from src/main/resources/data/joymod/painting_variant/queer.json rename to src/main/resources/data/joy/painting_variant/queer.json index bd3e2d3..8b59a78 100644 --- a/src/main/resources/data/joymod/painting_variant/queer.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/straight_ally.json b/src/main/resources/data/joy/painting_variant/straight_ally.json new file mode 100644 index 0000000..cc70368 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/straight_ally.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:straight_ally", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/trans.json b/src/main/resources/data/joy/painting_variant/trans.json similarity index 50% rename from src/main/resources/data/joymod/painting_variant/trans.json rename to src/main/resources/data/joy/painting_variant/trans.json index 0b05595..12aa54c 100644 --- a/src/main/resources/data/joymod/painting_variant/trans.json +++ b/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 } \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/agender.json b/src/main/resources/data/joymod/painting_variant/agender.json deleted file mode 100644 index 329f67e..0000000 --- a/src/main/resources/data/joymod/painting_variant/agender.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:agender", - "height": 1, - "width": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/bigender.json b/src/main/resources/data/joymod/painting_variant/bigender.json deleted file mode 100644 index 5e2ffa1..0000000 --- a/src/main/resources/data/joymod/painting_variant/bigender.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:bigender", - "height": 1, - "width": 1 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/bisexual.json b/src/main/resources/data/joymod/painting_variant/bisexual.json deleted file mode 100644 index e2a8942..0000000 --- a/src/main/resources/data/joymod/painting_variant/bisexual.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:bisexual", - "height": 2, - "width": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/intersex.json b/src/main/resources/data/joymod/painting_variant/intersex.json deleted file mode 100644 index d5a3bda..0000000 --- a/src/main/resources/data/joymod/painting_variant/intersex.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:intersex", - "height": 4, - "width": 4 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/lesbian.json b/src/main/resources/data/joymod/painting_variant/lesbian.json deleted file mode 100644 index 1c21b76..0000000 --- a/src/main/resources/data/joymod/painting_variant/lesbian.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:lesbian", - "height": 3, - "width": 4 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/progress.json b/src/main/resources/data/joymod/painting_variant/progress.json deleted file mode 100644 index e827eef..0000000 --- a/src/main/resources/data/joymod/painting_variant/progress.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:progress", - "height": 4, - "width": 4 -} \ No newline at end of file diff --git a/src/main/resources/data/joymod/painting_variant/straight_ally.json b/src/main/resources/data/joymod/painting_variant/straight_ally.json deleted file mode 100644 index e9ceef9..0000000 --- a/src/main/resources/data/joymod/painting_variant/straight_ally.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joymod:straight_ally", - "height": 2, - "width": 2 -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json index 1cc4c7c..5ccc35f 100644 --- a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -1,21 +1,21 @@ { "replace": false, "values": [ - "joymod:ace", - "joymod:agender", - "joymod:aro", - "joymod:aroace", - "joymod:bigender", - "joymod:bisexual", - "joymod:enby", - "joymod:gay", - "joymod:intersex", - "joymod:lesbian", - "joymod:mlm", - "joymod:pan", - "joymod:progress", - "joymod:queer", - "joymod:straight_ally", - "joymod:trans" + "joy:ace", + "joy:agender", + "joy:aro", + "joy:aroace", + "joy:bigender", + "joy:bisexual", + "joy:enby", + "joy:gay", + "joy:intersex", + "joy:lesbian", + "joy:mlm", + "joy:pan", + "joy:progress", + "joy:queer", + "joy:straight_ally", + "joy:trans" ] }