Merge branch 'api-15' into api-16

# Conflicts:
#	SpongeAPI

Author: Yeregorix

SpongeAPI

@@ -24,8 +24,10 @@
  */
 package org.spongepowered.common.data.provider.entity;
 
+import net.minecraft.core.registries.Registries;
 import net.minecraft.world.entity.animal.Chicken;
 import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.type.ChickenVariant;
 import org.spongepowered.common.data.provider.DataProviderRegistrator;
 import org.spongepowered.common.util.SpongeTicks;
 
@@ -47,6 +49,13 @@ public static void register(final DataProviderRegistrator registrator) {
                             }
                             h.eggTime = ticks;
                             return true;
+                        })
+                    .create(Keys.CHICKEN_VARIANT)
+                        .get(h -> (ChickenVariant) (Object) h.getVariant().value())
+                        .set((h, v) -> {
+                            final var holder = h.level().registryAccess().lookupOrThrow(Registries.CHICKEN_VARIANT)
+                                .wrapAsHolder((net.minecraft.world.entity.animal.ChickenVariant) (Object) v);
+                            h.setVariant(holder);
                         });
     }
     // @formatter:on

src/main/java/org/spongepowered/common/data/provider/entity/ChickenData.java

@@ -0,0 +1,51 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.data.provider.entity;
+
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.entity.animal.Cow;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.type.CowVariant;
+import org.spongepowered.common.data.provider.DataProviderRegistrator;
+
+public final class CowData {
+
+    private CowData() {
+    }
+
+    // @formatter:off
+    public static void register(final DataProviderRegistrator registrator) {
+        registrator
+                .asMutable(Cow.class)
+                    .create(Keys.COW_VARIANT)
+                        .get(h -> (CowVariant) (Object) h.getVariant().value())
+                        .set((h, v) -> {
+                            final var holder = h.level().registryAccess().lookupOrThrow(Registries.COW_VARIANT)
+                                .wrapAsHolder((net.minecraft.world.entity.animal.CowVariant) (Object) v);
+                            h.setVariant(holder);
+                        });
+    }
+    // @formatter:on
+}

src/main/java/org/spongepowered/common/data/provider/entity/CowData.java

@@ -117,6 +117,7 @@ public void registerProviders() {
         CatData.register(this.registrator);
         ChickenData.register(this.registrator);
         CommandBlockMinecartData.register(this.registrator);
+        CowData.register(this.registrator);
         CreakingData.register(this.registrator);
         CreeperData.register(this.registrator);
         DamagingProjectileData.register(this.registrator);

src/main/java/org/spongepowered/common/data/provider/entity/EntityDataProviders.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.api.minecraft.world.entity.animal;
+
+import net.minecraft.world.entity.animal.ChickenVariant;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ChickenVariant.class)
+public abstract class ChickenVariantMixin_API implements org.spongepowered.api.data.type.ChickenVariant {
+}

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/animal/ChickenVariantMixin_API.java

@@ -0,0 +1,32 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.api.minecraft.world.entity.animal;
+
+import net.minecraft.world.entity.animal.CowVariant;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(CowVariant.class)
+public abstract class CowVariantMixin_API implements org.spongepowered.api.data.type.CowVariant {
+}

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/animal/CowVariantMixin_API.java

@@ -151,7 +151,9 @@
     "minecraft.world.entity.animal.CatMixin_API",
     "minecraft.world.entity.animal.CatVariantMixin_API",
     "minecraft.world.entity.animal.ChickenMixin_API",
+    "minecraft.world.entity.animal.ChickenVariantMixin_API",
     "minecraft.world.entity.animal.CodMixin_API",
+    "minecraft.world.entity.animal.CowVariantMixin_API",
     "minecraft.world.entity.animal.DolphinMixin_API",
     "minecraft.world.entity.animal.FlyingAnimalMixin_API",
     "minecraft.world.entity.animal.Fox_VariantMixin_API",

src/mixins/resources/mixins.sponge.api.json

@@ -51,6 +51,8 @@
 import org.spongepowered.api.data.type.BoatTypes;
 import org.spongepowered.api.data.type.BodyParts;
 import org.spongepowered.api.data.type.CatTypes;
+import org.spongepowered.api.data.type.ChickenVariants;
+import org.spongepowered.api.data.type.CowVariants;
 import org.spongepowered.api.data.type.DyeColors;
 import org.spongepowered.api.data.type.FoxTypes;
 import org.spongepowered.api.data.type.FrogTypes;
@@ -964,6 +966,13 @@ public void testData(final ServerPlayer player) {
         this.checkOfferData(frog, Keys.FROG_TYPE, FrogTypes.WARM.get());
         this.checkGetData(frog, Keys.FROG_TYPE, FrogTypes.WARM.get());
 
+        this.checkOfferData(chicken, Keys.CHICKEN_VARIANT, ChickenVariants.WARM.get());
+        this.checkGetData(chicken, Keys.CHICKEN_VARIANT, ChickenVariants.WARM.get());
+
+        final Entity cow = world.createEntity(EntityTypes.COW.get(), position);
+        this.checkOfferData(cow, Keys.COW_VARIANT, CowVariants.WARM.get());
+        this.checkGetData(cow, Keys.COW_VARIANT, CowVariants.WARM.get());
+
 //        this.checkOfferData(panda, Keys.IS_UNHAPPY, true);
 
         this.checkWithData(acaciaStairs, Keys.IS_WATERLOGGED, true);