Merge branch '1.20.2' into 1.20.4

src/main/java/com/minelittlepony/unicopia/datagen/Datagen.java

@@ -17,8 +17,10 @@
 import com.minelittlepony.unicopia.datagen.providers.recipe.URecipeProvider;
 import com.minelittlepony.unicopia.datagen.providers.tag.UBlockTagProvider;
 import com.minelittlepony.unicopia.datagen.providers.tag.UDamageTypeProvider;
+import com.minelittlepony.unicopia.datagen.providers.tag.UDimensionTypeTagProvider;
 import com.minelittlepony.unicopia.datagen.providers.tag.UEntityTypeTagProvider;
 import com.minelittlepony.unicopia.datagen.providers.tag.UItemTagProvider;
+import com.minelittlepony.unicopia.datagen.providers.tag.UPaintingVariantTagProvider;
 import com.minelittlepony.unicopia.datagen.providers.tag.UStatusEffectTagProvider;
 import com.minelittlepony.unicopia.entity.damage.UDamageTypes;
 import com.minelittlepony.unicopia.server.world.UWorldGen;
@@ -57,6 +59,8 @@ public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) {
         pack.addProvider(UDamageTypeProvider::new);
         pack.addProvider(UEntityTypeTagProvider::new);
         pack.addProvider(UStatusEffectTagProvider::new);
+        pack.addProvider(UDimensionTypeTagProvider::new);
+        pack.addProvider(UPaintingVariantTagProvider::new);
 
         pack.addProvider(UModelProvider::new);
         pack.addProvider(URecipeProvider::new);

src/main/java/com/minelittlepony/unicopia/datagen/providers/tag/UDamageTypeProvider.java

@@ -26,5 +26,29 @@ protected void configure(WrapperLookup lookup) {
         getOrCreateTagBuilder(UTags.DamageTypes.FROM_ROCKS).add(UDamageTypes.ROCK);
         getOrCreateTagBuilder(UTags.DamageTypes.FROM_HORSESHOES).add(UDamageTypes.HORSESHOE);
         getOrCreateTagBuilder(UTags.DamageTypes.BREAKS_SUNGLASSES).add(UDamageTypes.BAT_SCREECH, UDamageTypes.RAINBOOM);
+
+        getOrCreateTagBuilder(DamageTypeTags.AVOIDS_GUARDIAN_THORNS).add(
+                UDamageTypes.EXHAUSTION, UDamageTypes.ALICORN_AMULET, UDamageTypes.ZAP_APPLE, UDamageTypes.KICK, UDamageTypes.SMASH,
+                UDamageTypes.BAT_SCREECH, UDamageTypes.LOVE_DRAINING, UDamageTypes.LIFE_DRAINING, UDamageTypes.RAINBOOM, UDamageTypes.STEAMROLLER
+        );
+        getOrCreateTagBuilder(DamageTypeTags.BYPASSES_ARMOR).add(
+                UDamageTypes.EXHAUSTION, UDamageTypes.GAVITY_WELL_RECOIL, UDamageTypes.ALICORN_AMULET,
+                UDamageTypes.ZAP_APPLE, UDamageTypes.KICK, UDamageTypes.SMASH, UDamageTypes.BAT_SCREECH,
+                UDamageTypes.LOVE_DRAINING, UDamageTypes.LIFE_DRAINING, UDamageTypes.STEAMROLLER, UDamageTypes.RAINBOOM,
+                UDamageTypes.SUN, UDamageTypes.SUNLIGHT, UDamageTypes.PETRIFIED
+        );
+        getOrCreateTagBuilder(DamageTypeTags.BYPASSES_INVULNERABILITY).add(UDamageTypes.TRIBE_SWAP);
+        getOrCreateTagBuilder(DamageTypeTags.BYPASSES_SHIELD).add(
+                UDamageTypes.EXHAUSTION, UDamageTypes.BAT_SCREECH, UDamageTypes.ALICORN_AMULET,
+                UDamageTypes.LOVE_DRAINING, UDamageTypes.LIFE_DRAINING,
+                UDamageTypes.RAINBOOM, UDamageTypes.TRIBE_SWAP
+        );
+        getOrCreateTagBuilder(DamageTypeTags.IS_FIRE).add(UDamageTypes.SUN, UDamageTypes.SUNLIGHT, UDamageTypes.PETRIFIED);
+        getOrCreateTagBuilder(DamageTypeTags.IS_LIGHTNING).add(UDamageTypes.ZAP_APPLE);
+        getOrCreateTagBuilder(DamageTypeTags.WITCH_RESISTANT_TO).add(
+                UDamageTypes.EXHAUSTION, UDamageTypes.ALICORN_AMULET, UDamageTypes.ZAP_APPLE,
+                UDamageTypes.LOVE_DRAINING, UDamageTypes.LIFE_DRAINING,
+                UDamageTypes.KICK, UDamageTypes.SMASH, UDamageTypes.STEAMROLLER
+        );
     }
 }

src/main/java/com/minelittlepony/unicopia/datagen/providers/tag/UDimensionTypeTagProvider.java

@@ -0,0 +1,35 @@
+package com.minelittlepony.unicopia.datagen.providers.tag;
+
+import java.util.concurrent.CompletableFuture;
+
+import com.minelittlepony.unicopia.UTags;
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.RegistryWrapper.WrapperLookup;
+import net.minecraft.util.Identifier;
+import net.minecraft.world.dimension.DimensionType;
+
+public class UDimensionTypeTagProvider extends FabricTagProvider<DimensionType> {
+    public UDimensionTypeTagProvider(FabricDataOutput output, CompletableFuture<WrapperLookup> registriesFuture) {
+        super(output, RegistryKeys.DIMENSION_TYPE, registriesFuture);
+    }
+
+    @Override
+    protected void configure(WrapperLookup lookup) {
+        getOrCreateTagBuilder(UTags.DimensionTypes.HAS_NO_ATMOSPHERE)
+            .addOptional(new Identifier("ad_astra", "earth_orbit"))
+            .addOptional(new Identifier("ad_astra", "glacio_orbit"))
+            .addOptional(new Identifier("ad_astra", "mars_orbit"))
+            .addOptional(new Identifier("ad_astra", "mercury_orbit"))
+            .addOptional(new Identifier("ad_astra", "moon")).addOptional(new Identifier("adastra", "moon_orbit"))
+            .addOptional(new Identifier("ad_astra", "venus_orbit"))
+
+            .addOptional(new Identifier("adastra", "earth_orbit"))
+            .addOptional(new Identifier("adastra", "glacio_orbit"))
+            .addOptional(new Identifier("adastra", "mars_orbit"))
+            .addOptional(new Identifier("adastra", "mercury_orbit"))
+            .addOptional(new Identifier("adastra", "moon")).addOptional(new Identifier("adastra", "moon_orbit"))
+            .addOptional(new Identifier("adastra", "venus_orbit"));
+    }
+}

src/main/java/com/minelittlepony/unicopia/datagen/providers/tag/UPaintingVariantTagProvider.java

@@ -0,0 +1,23 @@
+package com.minelittlepony.unicopia.datagen.providers.tag;
+
+import java.util.concurrent.CompletableFuture;
+
+import com.minelittlepony.unicopia.entity.mob.UEntities;
+
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
+import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
+import net.minecraft.entity.decoration.painting.PaintingVariant;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.RegistryWrapper.WrapperLookup;
+import net.minecraft.registry.tag.PaintingVariantTags;
+
+public class UPaintingVariantTagProvider extends FabricTagProvider<PaintingVariant> {
+    public UPaintingVariantTagProvider(FabricDataOutput output, CompletableFuture<WrapperLookup> registriesFuture) {
+        super(output, RegistryKeys.PAINTING_VARIANT, registriesFuture);
+    }
+
+    @Override
+    protected void configure(WrapperLookup lookup) {
+        getOrCreateTagBuilder(PaintingVariantTags.PLACEABLE).add(UEntities.Paintings.REGISTRY.toArray(PaintingVariant[]::new));
+    }
+}

src/main/java/com/minelittlepony/unicopia/entity/mob/UEntities.java

@@ -1,5 +1,7 @@
 package com.minelittlepony.unicopia.entity.mob;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.function.Predicate;
 
 import com.minelittlepony.unicopia.Unicopia;
@@ -135,8 +137,14 @@ static void bootstrap() {
     }
 
     interface Paintings {
+        Set<PaintingVariant> REGISTRY = new HashSet<>();
+
         private static void register(String id, int width, int height) {
-            Registry.register(Registries.PAINTING_VARIANT, RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Unicopia.id(id)), new PaintingVariant(16 * width, 16 * height));
+            REGISTRY.add(Registry.register(
+                    Registries.PAINTING_VARIANT,
+                    RegistryKey.of(RegistryKeys.PAINTING_VARIANT, Unicopia.id(id)),
+                    new PaintingVariant(16 * width, 16 * height)
+            ));
         }
 
         static void bootstrap() {