diff --git a/src/main/java/gay/pridecraft/joymod/JoyMod.java b/src/main/java/gay/pridecraft/joymod/JoyMod.java index 9309e5b..f84c55b 100644 --- a/src/main/java/gay/pridecraft/joymod/JoyMod.java +++ b/src/main/java/gay/pridecraft/joymod/JoyMod.java @@ -4,6 +4,7 @@ import gay.pridecraft.joymod.entity.ModEntities; import gay.pridecraft.joymod.block.ModBlocks; import gay.pridecraft.joymod.item.ModItemGroups; import gay.pridecraft.joymod.item.ModItems; +import gay.pridecraft.joymod.painting.ModPaintings; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; import net.minecraft.entity.attribute.EntityAttributes; @@ -21,6 +22,7 @@ public class JoyMod implements ModInitializer { ModItems.registerModItems(); ModBlocks.registerModBlocks(); ModEntities.registerBlockEntities(); + ModPaintings.registerPaintings(); registerEntityAttributes(); } diff --git a/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java b/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java new file mode 100644 index 0000000..86bf905 --- /dev/null +++ b/src/main/java/gay/pridecraft/joymod/painting/ModPaintings.java @@ -0,0 +1,34 @@ +package gay.pridecraft.joymod.painting; + +import gay.pridecraft.joymod.JoyMod; +import net.minecraft.entity.decoration.painting.PaintingVariant; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.util.Identifier; + +public class ModPaintings { + public static final PaintingVariant ACE = registerPainting("ace", new PaintingVariant(32, 16)); + public static final PaintingVariant AGENDER = registerPainting("agender", new PaintingVariant(16, 16)); + public static final PaintingVariant ARO = registerPainting("aro", new PaintingVariant(32, 16)); + public static final PaintingVariant AROACE = registerPainting("aroace", new PaintingVariant(64, 48)); + public static final PaintingVariant BIGENDER = registerPainting("bigender", new PaintingVariant(16, 16)); + public static final PaintingVariant BISEXUAL = registerPainting("bisexual", new PaintingVariant(32, 32)); + public static final PaintingVariant ENBY = registerPainting("enby", new PaintingVariant(32, 32)); + public static final PaintingVariant GAY = registerPainting("gay", new PaintingVariant(32, 32)); + public static final PaintingVariant INTERSEX = registerPainting("intersex", new PaintingVariant(64, 64)); + public static final PaintingVariant LESBIAN = registerPainting("lesbian", new PaintingVariant(64, 48)); + public static final PaintingVariant MLM = registerPainting("mlm", new PaintingVariant(16, 16)); + public static final PaintingVariant PAN = registerPainting("pan", new PaintingVariant(32, 32)); + public static final PaintingVariant PROGRESS = registerPainting("progress", new PaintingVariant(64, 64)); + public static final PaintingVariant QUEER = registerPainting("queer", new PaintingVariant(16, 16)); + public static final PaintingVariant STRAIGHT_ALLY = registerPainting("straight_ally", new PaintingVariant(32, 32)); + public static final PaintingVariant TRANS = registerPainting("trans", new PaintingVariant(32, 32)); + + private static PaintingVariant registerPainting(String name, PaintingVariant paintingVariant) { + return Registry.register(Registries.PAINTING_VARIANT, new Identifier(JoyMod.MOD_ID, name), paintingVariant); + } + + public static void registerPaintings() { + JoyMod.LOGGER.info("Registering Paintings for " + JoyMod.MOD_ID); + } +} \ No newline at end of file diff --git a/src/main/resources/assets/joymod/textures/painting/ace.png b/src/main/resources/assets/joymod/textures/painting/ace.png new file mode 100644 index 0000000..7f81b7f Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/ace.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/agender.png b/src/main/resources/assets/joymod/textures/painting/agender.png new file mode 100644 index 0000000..f726e2c Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/agender.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/aro.png b/src/main/resources/assets/joymod/textures/painting/aro.png new file mode 100644 index 0000000..ec3016f Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/aro.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/aroace.png b/src/main/resources/assets/joymod/textures/painting/aroace.png new file mode 100644 index 0000000..f69916c Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/aroace.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/bigender.png b/src/main/resources/assets/joymod/textures/painting/bigender.png new file mode 100644 index 0000000..087184d Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/bigender.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/skull_and_roses.png b/src/main/resources/assets/joymod/textures/painting/bisexual.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/skull_and_roses.png rename to src/main/resources/assets/joymod/textures/painting/bisexual.png diff --git a/src/main/resources/assets/joymod/textures/painting/void.png b/src/main/resources/assets/joymod/textures/painting/enby.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/void.png rename to src/main/resources/assets/joymod/textures/painting/enby.png diff --git a/src/main/resources/assets/joymod/textures/painting/wither.png b/src/main/resources/assets/joymod/textures/painting/gay.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/wither.png rename to src/main/resources/assets/joymod/textures/painting/gay.png diff --git a/src/main/resources/assets/joymod/textures/painting/intersex.png b/src/main/resources/assets/joymod/textures/painting/intersex.png new file mode 100644 index 0000000..0a97cbe Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/intersex.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/skeleton.png b/src/main/resources/assets/joymod/textures/painting/lesbian.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/skeleton.png rename to src/main/resources/assets/joymod/textures/painting/lesbian.png diff --git a/src/main/resources/assets/joymod/textures/painting/mlm.png b/src/main/resources/assets/joymod/textures/painting/mlm.png new file mode 100644 index 0000000..8f9c5d2 Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/mlm.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/match.png b/src/main/resources/assets/joymod/textures/painting/pan.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/match.png rename to src/main/resources/assets/joymod/textures/painting/pan.png diff --git a/src/main/resources/assets/joymod/textures/painting/pigscene.png b/src/main/resources/assets/joymod/textures/painting/progress.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/pigscene.png rename to src/main/resources/assets/joymod/textures/painting/progress.png diff --git a/src/main/resources/assets/joymod/textures/painting/alban.png b/src/main/resources/assets/joymod/textures/painting/queer.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/alban.png rename to src/main/resources/assets/joymod/textures/painting/queer.png diff --git a/src/main/resources/assets/joymod/textures/painting/straight_ally.png b/src/main/resources/assets/joymod/textures/painting/straight_ally.png new file mode 100644 index 0000000..f70251d Binary files /dev/null and b/src/main/resources/assets/joymod/textures/painting/straight_ally.png differ diff --git a/src/main/resources/assets/joymod/textures/painting/stage.png b/src/main/resources/assets/joymod/textures/painting/trans.png similarity index 100% rename from src/main/resources/assets/joymod/textures/painting/stage.png rename to src/main/resources/assets/joymod/textures/painting/trans.png diff --git a/src/main/resources/assets/joymod/textures/painting/yes.png b/src/main/resources/assets/joymod/textures/painting/yes.png deleted file mode 100644 index 8d9d4f1..0000000 Binary files a/src/main/resources/assets/joymod/textures/painting/yes.png and /dev/null differ diff --git a/src/main/resources/data/minecraft/tags/painting_variant/placeable.json b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json new file mode 100644 index 0000000..fa5d11e --- /dev/null +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -0,0 +1,20 @@ +{ + "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" + ] +}