diff --git a/TODO.md b/TODO.md index 8c7c2e4..eeb2c9d 100644 --- a/TODO.md +++ b/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 diff --git a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java b/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java index f9f4dcc..4029f2e 100644 --- a/src/main/java/gay/pridecraft/joy/mixin/PaintingVariantsMixin.java +++ b/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 registry, CallbackInfo ci) { - register(registry, ACE, 2, 1); - register(registry, AGENDER, 1, 1); - register(registry, ARO, 2, 1); - register(registry, AROACE, 4, 3); - register(registry, BIGENDER, 1, 1); - register(registry, BISEXUAL, 2, 2); - register(registry, ENBY, 2, 2); - 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, ACE, 2,1); + register(registry, AGENDER, 1,1); + register(registry, ALLY,2,2); + register(registry, ARO, 2,1); + register(registry, AROACE, 4,3); + register(registry, BI, 2,2); + register(registry, BIGENDER, 1,1); register(registry, BIRB, 2,2); - register(registry, DEMIROMANTIC,2 ,2); - register(registry, DEMISEXUAL,2 ,2); - register(registry, FLOATING_TREES,2 ,2); - register(registry, FLOATING_BEES,2 ,2); + register(registry, DEMIROMANTIC,2,2); + register(registry, DEMISEXUAL,2,2); + register(registry, ENBY, 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 diff --git a/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java b/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java index e176e38..53e7799 100644 --- a/src/main/java/gay/pridecraft/joy/painting/ModPaintings.java +++ b/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 ACE = of("ace"); public static final RegistryKey AGENDER = of("agender"); + 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 BISEXUAL = of("bisexual"); + 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 ENBY = of("enby"); - public static final RegistryKey GAY = of("gay"); + public static final RegistryKey FLOATING_BEES = of("floating_bees"); + public static final RegistryKey FLOATING_TREES = of("floating_trees"); public static final RegistryKey INTERSEX = of("intersex"); public static final RegistryKey LESBIAN = of("lesbian"); public static final RegistryKey MLM = of("mlm"); public static final RegistryKey PAN = of("pan"); + public static final RegistryKey POLYSEXUAL = of("polysexual"); public static final RegistryKey PROGRESS = of("progress"); public static final RegistryKey QUEER = of("queer"); - public static final RegistryKey ALLY = of("ally"); + public static final RegistryKey RAINBOW = of("rainbow"); 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_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/assets/joy/textures/painting/ace.png b/src/main/resources/assets/joy/textures/painting/ace.png index 7f81b7f..b5d75e0 100644 Binary files a/src/main/resources/assets/joy/textures/painting/ace.png and b/src/main/resources/assets/joy/textures/painting/ace.png differ diff --git a/src/main/resources/assets/joy/textures/painting/agender.png b/src/main/resources/assets/joy/textures/painting/agender.png index f726e2c..9c6f87c 100644 Binary files a/src/main/resources/assets/joy/textures/painting/agender.png and b/src/main/resources/assets/joy/textures/painting/agender.png differ diff --git a/src/main/resources/assets/joy/textures/painting/ally.png b/src/main/resources/assets/joy/textures/painting/ally.png new file mode 100644 index 0000000..c43fb58 Binary files /dev/null and b/src/main/resources/assets/joy/textures/painting/ally.png differ diff --git a/src/main/resources/assets/joy/textures/painting/aro.png b/src/main/resources/assets/joy/textures/painting/aro.png index ec3016f..4e869c7 100644 Binary files a/src/main/resources/assets/joy/textures/painting/aro.png and b/src/main/resources/assets/joy/textures/painting/aro.png differ diff --git a/src/main/resources/assets/joy/textures/painting/aroace.png b/src/main/resources/assets/joy/textures/painting/aroace.png index f69916c..df2f522 100644 Binary files a/src/main/resources/assets/joy/textures/painting/aroace.png and b/src/main/resources/assets/joy/textures/painting/aroace.png differ diff --git a/src/main/resources/assets/joy/textures/painting/bi.png b/src/main/resources/assets/joy/textures/painting/bi.png new file mode 100644 index 0000000..8501c2c Binary files /dev/null and b/src/main/resources/assets/joy/textures/painting/bi.png differ diff --git a/src/main/resources/assets/joy/textures/painting/bigender.png b/src/main/resources/assets/joy/textures/painting/bigender.png index 087184d..8b03a85 100644 Binary files a/src/main/resources/assets/joy/textures/painting/bigender.png and b/src/main/resources/assets/joy/textures/painting/bigender.png differ diff --git a/src/main/resources/assets/joy/textures/painting/birb.png b/src/main/resources/assets/joy/textures/painting/birb.png index f1b5d91..9c5bfac 100644 Binary files a/src/main/resources/assets/joy/textures/painting/birb.png and b/src/main/resources/assets/joy/textures/painting/birb.png differ diff --git a/src/main/resources/assets/joy/textures/painting/bisexual.png b/src/main/resources/assets/joy/textures/painting/bisexual.png deleted file mode 100644 index 71943c9..0000000 Binary files a/src/main/resources/assets/joy/textures/painting/bisexual.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/painting/demiromantic.png b/src/main/resources/assets/joy/textures/painting/demiromantic.png index fef4d14..b45aaad 100644 Binary files a/src/main/resources/assets/joy/textures/painting/demiromantic.png and b/src/main/resources/assets/joy/textures/painting/demiromantic.png differ diff --git a/src/main/resources/assets/joy/textures/painting/demisexual.png b/src/main/resources/assets/joy/textures/painting/demisexual.png index da10c6f..f9f85f0 100644 Binary files a/src/main/resources/assets/joy/textures/painting/demisexual.png and b/src/main/resources/assets/joy/textures/painting/demisexual.png differ diff --git a/src/main/resources/assets/joy/textures/painting/enby.png b/src/main/resources/assets/joy/textures/painting/enby.png index 21e4830..5988fb9 100644 Binary files a/src/main/resources/assets/joy/textures/painting/enby.png and b/src/main/resources/assets/joy/textures/painting/enby.png differ diff --git a/src/main/resources/assets/joy/textures/painting/floating_biis.png b/src/main/resources/assets/joy/textures/painting/floating_biis.png deleted file mode 100644 index e74672b..0000000 Binary files a/src/main/resources/assets/joy/textures/painting/floating_biis.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/painting/floatingbees.png b/src/main/resources/assets/joy/textures/painting/floatingbees.png new file mode 100644 index 0000000..e5c17c1 Binary files /dev/null and b/src/main/resources/assets/joy/textures/painting/floatingbees.png differ diff --git a/src/main/resources/assets/joy/textures/painting/floatingtrees.png b/src/main/resources/assets/joy/textures/painting/floatingtrees.png index cd6c9e1..24b1d4a 100644 Binary files a/src/main/resources/assets/joy/textures/painting/floatingtrees.png and b/src/main/resources/assets/joy/textures/painting/floatingtrees.png differ diff --git a/src/main/resources/assets/joy/textures/painting/gay.png b/src/main/resources/assets/joy/textures/painting/gay.png deleted file mode 100644 index 9ed755c..0000000 Binary files a/src/main/resources/assets/joy/textures/painting/gay.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/painting/intersex.png b/src/main/resources/assets/joy/textures/painting/intersex.png index 0a97cbe..3d20c60 100644 Binary files a/src/main/resources/assets/joy/textures/painting/intersex.png and b/src/main/resources/assets/joy/textures/painting/intersex.png differ diff --git a/src/main/resources/assets/joy/textures/painting/lesbian.png b/src/main/resources/assets/joy/textures/painting/lesbian.png index 4c2d18d..f730ad9 100644 Binary files a/src/main/resources/assets/joy/textures/painting/lesbian.png and b/src/main/resources/assets/joy/textures/painting/lesbian.png differ diff --git a/src/main/resources/assets/joy/textures/painting/mlm.png b/src/main/resources/assets/joy/textures/painting/mlm.png index 8f9c5d2..6442747 100644 Binary files a/src/main/resources/assets/joy/textures/painting/mlm.png and b/src/main/resources/assets/joy/textures/painting/mlm.png differ diff --git a/src/main/resources/assets/joy/textures/painting/pan.png b/src/main/resources/assets/joy/textures/painting/pan.png index 9c1e10a..586fd44 100644 Binary files a/src/main/resources/assets/joy/textures/painting/pan.png and b/src/main/resources/assets/joy/textures/painting/pan.png differ diff --git a/src/main/resources/assets/joy/textures/painting/polysexual.png b/src/main/resources/assets/joy/textures/painting/polysexual.png new file mode 100644 index 0000000..5508d53 Binary files /dev/null and b/src/main/resources/assets/joy/textures/painting/polysexual.png differ diff --git a/src/main/resources/assets/joy/textures/painting/progress.png b/src/main/resources/assets/joy/textures/painting/progress.png index d1a95e0..7eb0292 100644 Binary files a/src/main/resources/assets/joy/textures/painting/progress.png and b/src/main/resources/assets/joy/textures/painting/progress.png differ diff --git a/src/main/resources/assets/joy/textures/painting/queer.png b/src/main/resources/assets/joy/textures/painting/queer.png index 9beb3d8..fa13af3 100644 Binary files a/src/main/resources/assets/joy/textures/painting/queer.png and b/src/main/resources/assets/joy/textures/painting/queer.png differ diff --git a/src/main/resources/assets/joy/textures/painting/rainbow.png b/src/main/resources/assets/joy/textures/painting/rainbow.png new file mode 100644 index 0000000..c3df8c8 Binary files /dev/null and b/src/main/resources/assets/joy/textures/painting/rainbow.png differ diff --git a/src/main/resources/assets/joy/textures/painting/straight_ally.png b/src/main/resources/assets/joy/textures/painting/straight_ally.png deleted file mode 100644 index f70251d..0000000 Binary files a/src/main/resources/assets/joy/textures/painting/straight_ally.png and /dev/null differ diff --git a/src/main/resources/assets/joy/textures/painting/trans.png b/src/main/resources/assets/joy/textures/painting/trans.png index eaea762..46d20ea 100644 Binary files a/src/main/resources/assets/joy/textures/painting/trans.png and b/src/main/resources/assets/joy/textures/painting/trans.png differ