diff --git a/paintings-2x1.xcf b/paintings-2x1.xcf new file mode 100644 index 00000000..8713987c Binary files /dev/null and b/paintings-2x1.xcf differ diff --git a/paintings-2x4.xcf b/paintings-2x4.xcf new file mode 100644 index 00000000..bafa10ea Binary files /dev/null and b/paintings-2x4.xcf differ diff --git a/paintings-3x3.xcf b/paintings-3x3.xcf new file mode 100644 index 00000000..762a8b49 Binary files /dev/null and b/paintings-3x3.xcf differ diff --git a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java index ca0a1dcd..dedf02b3 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/UEntities.java @@ -15,9 +15,11 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; +import net.minecraft.entity.decoration.painting.PaintingVariant; import net.minecraft.entity.mob.FlyingEntity; import net.minecraft.tag.BiomeTags; import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; public interface UEntities { @@ -80,5 +82,26 @@ public interface UEntities { UTradeOffers.bootstrap(); EntityBehaviour.bootstrap(); UEntityAttributes.bootstrap(); + Paintings.bootstrap(); + } + + interface Paintings { + private static void register(String id, int width, int height) { + Registry.register(Registry.PAINTING_VARIANT, RegistryKey.of(Registry.PAINTING_VARIANT_KEY, Unicopia.id(id)), new PaintingVariant(16 * width, 16 * height)); + } + + static void bootstrap() { + register("bloom", 2, 1); + register("chicken", 2, 1); + register("bells", 2, 1); + register("crystal", 3, 3); + register("harmony", 3, 3); + register("equality", 2, 4); + register("solar", 2, 4); + register("platinum", 2, 4); + register("hurricane", 2, 4); + register("pudding", 2, 4); + register("equestria", 2, 4); + } } } diff --git a/src/main/resources/assets/unicopia/textures/painting/bells.png b/src/main/resources/assets/unicopia/textures/painting/bells.png new file mode 100644 index 00000000..72ade86c Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/bells.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/bloom.png b/src/main/resources/assets/unicopia/textures/painting/bloom.png new file mode 100644 index 00000000..eee5df08 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/bloom.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/chicken.png b/src/main/resources/assets/unicopia/textures/painting/chicken.png new file mode 100644 index 00000000..3feee563 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/chicken.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/crystal.png b/src/main/resources/assets/unicopia/textures/painting/crystal.png new file mode 100644 index 00000000..c0b52803 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/crystal.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/equality.png b/src/main/resources/assets/unicopia/textures/painting/equality.png new file mode 100644 index 00000000..260253ce Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/equality.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/equestria.png b/src/main/resources/assets/unicopia/textures/painting/equestria.png new file mode 100644 index 00000000..59cc9520 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/equestria.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/harmony.png b/src/main/resources/assets/unicopia/textures/painting/harmony.png new file mode 100644 index 00000000..43302054 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/harmony.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/hurricane.png b/src/main/resources/assets/unicopia/textures/painting/hurricane.png new file mode 100644 index 00000000..bdf15480 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/hurricane.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/platinum.png b/src/main/resources/assets/unicopia/textures/painting/platinum.png new file mode 100644 index 00000000..c0a17867 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/platinum.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/pudding.png b/src/main/resources/assets/unicopia/textures/painting/pudding.png new file mode 100644 index 00000000..d39280ec Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/pudding.png differ diff --git a/src/main/resources/assets/unicopia/textures/painting/solar.png b/src/main/resources/assets/unicopia/textures/painting/solar.png new file mode 100644 index 00000000..5395d2ee Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/painting/solar.png 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 00000000..026a8096 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/painting_variant/placeable.json @@ -0,0 +1,16 @@ +{ + "replace": false, + "values": [ + "unicopia:bloom", + "unicopia:chicken", + "unicopia:bells", + "unicopia:crystal", + "unicopia:harmony", + "unicopia:equality", + "unicopia:solar", + "unicopia:platinum", + "unicopia:hurricane", + "unicopia:pudding", + "unicopia:equestria" + ] +} \ No newline at end of file