diff --git a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java b/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java index eab0ab9..c22f3a4 100644 --- a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java +++ b/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java @@ -25,7 +25,7 @@ public abstract class PaintingVariantsMixin { register(registry, ALLY, 2, 2); register(registry, ARO, 2, 1); register(registry, AROACE, 4, 3); - register(registry, BI, 2, 2); + register(registry, BISEXUAL, 2, 2); register(registry, BIGENDER, 1, 1); register(registry, BIRB, 2, 2); register(registry, DEMIROMANTIC, 2, 2); diff --git a/src/main/java/gay/pridecraft/joy/registry/JoyPaintings.java b/src/main/java/gay/pridecraft/joy/registry/JoyPaintings.java index e8c1e50..0a470fd 100644 --- a/src/main/java/gay/pridecraft/joy/registry/JoyPaintings.java +++ b/src/main/java/gay/pridecraft/joy/registry/JoyPaintings.java @@ -13,9 +13,9 @@ public class JoyPaintings { public static final RegistryKey ALLY = of("ally"); public static final RegistryKey ARO = of("aro"); public static final RegistryKey AROACE = of("aroace"); - public static final RegistryKey BI = of("bi"); public static final RegistryKey BIGENDER = of("bigender"); public static final RegistryKey BIRB = of("birb"); + public static final RegistryKey BISEXUAL = of("bisexual"); public static final RegistryKey DEMIROMANTIC = of("demiromantic"); public static final RegistryKey DEMISEXUAL = of("demisexual"); public static final RegistryKey ENBY = of("enby"); diff --git a/src/main/resources/assets/joy/textures/painting/bi.png b/src/main/resources/assets/joy/textures/painting/bisexual.png similarity index 100% rename from src/main/resources/assets/joy/textures/painting/bi.png rename to src/main/resources/assets/joy/textures/painting/bisexual.png diff --git a/src/main/resources/assets/joy/textures/painting/floatingbees.png b/src/main/resources/assets/joy/textures/painting/floating_bees.png similarity index 100% rename from src/main/resources/assets/joy/textures/painting/floatingbees.png rename to src/main/resources/assets/joy/textures/painting/floating_bees.png diff --git a/src/main/resources/assets/joy/textures/painting/floatingtrees.png b/src/main/resources/assets/joy/textures/painting/floating_trees.png similarity index 100% rename from src/main/resources/assets/joy/textures/painting/floatingtrees.png rename to src/main/resources/assets/joy/textures/painting/floating_trees.png diff --git a/src/main/resources/data/joy/painting_variant/gay.json b/src/main/resources/data/joy/painting_variant/ally.json similarity index 54% rename from src/main/resources/data/joy/painting_variant/gay.json rename to src/main/resources/data/joy/painting_variant/ally.json index b82bec6..034f4b5 100644 --- a/src/main/resources/data/joy/painting_variant/gay.json +++ b/src/main/resources/data/joy/painting_variant/ally.json @@ -1,5 +1,5 @@ { - "asset_id": "joy:gay", + "asset_id": "joy:ally", "height": 2, "width": 2 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/birb.json b/src/main/resources/data/joy/painting_variant/birb.json index 2ebcb83..6bf953a 100644 --- a/src/main/resources/data/joy/painting_variant/birb.json +++ b/src/main/resources/data/joy/painting_variant/birb.json @@ -1,5 +1,5 @@ { "asset_id": "joy:birb", - "height": 3, - "width": 3 + "height": 2, + "width": 2 } \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/demiromantic.json b/src/main/resources/data/joy/painting_variant/demiromantic.json new file mode 100644 index 0000000..5f5b42a --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/demiromantic.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:demiromantic", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/demisexual.json b/src/main/resources/data/joy/painting_variant/demisexual.json new file mode 100644 index 0000000..19eaaba --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/demisexual.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:demisexual", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/floating_bees.json b/src/main/resources/data/joy/painting_variant/floating_bees.json new file mode 100644 index 0000000..d06989a --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/floating_bees.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:floating_bees", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/floating_trees.json b/src/main/resources/data/joy/painting_variant/floating_trees.json new file mode 100644 index 0000000..430c36b --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/floating_trees.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:floating_trees", + "height": 2, + "width": 2 +} \ No newline at end of file diff --git a/src/main/resources/data/joy/painting_variant/rainbow.json b/src/main/resources/data/joy/painting_variant/rainbow.json new file mode 100644 index 0000000..e6fa7a8 --- /dev/null +++ b/src/main/resources/data/joy/painting_variant/rainbow.json @@ -0,0 +1,5 @@ +{ + "asset_id": "joy:rainbow", + "height": 2, + "width": 2 +} \ 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 deleted file mode 100644 index cc70368..0000000 --- a/src/main/resources/data/joy/painting_variant/straight_ally.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "asset_id": "joy: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 5ccc35f..626759e 100644 --- a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -3,19 +3,24 @@ "values": [ "joy:ace", "joy:agender", + "joy:ally", "joy:aro", "joy:aroace", "joy:bigender", + "joy:birb", "joy:bisexual", + "joy:demiromantic", + "joy:demisexual", "joy:enby", - "joy:gay", + "joy:floating_bees", + "joy:floating_trees", "joy:intersex", "joy:lesbian", "joy:mlm", "joy:pan", "joy:progress", "joy:queer", - "joy:straight_ally", + "joy:rainbow", "joy:trans" ] }