chore: merge api-13 into api-14

Signed-off-by: Gabriel Harris-Rouquette <[email protected]>

generator/src/main/java/org/spongepowered/vanilla/generator/world/entities/EntityRegistries.java

@@ -34,7 +34,9 @@
 import net.minecraft.world.entity.animal.Panda;
 import net.minecraft.world.entity.animal.Parrot;
 import net.minecraft.world.entity.animal.Rabbit;
+import net.minecraft.world.entity.animal.Salmon;
 import net.minecraft.world.entity.animal.TropicalFish;
+import net.minecraft.world.entity.animal.axolotl.Axolotl;
 import net.minecraft.world.entity.animal.horse.Llama;
 import net.minecraft.world.entity.animal.horse.Markings;
 import net.minecraft.world.entity.animal.horse.Variant;
@@ -170,6 +172,20 @@ public static List<Generator> enumEntries(final Context context) {
                 EquipmentSlot.class,
                 "getSerializedName",
                 "sponge"
+            ),
+            new EnumEntriesValidator<>(
+                "data.type",
+                "SalmonSizes",
+                Salmon.Variant.class,
+                "getSerializedName",
+                "sponge"
+            ),
+            new EnumEntriesValidator<>(
+                "data.type",
+                "AxolotlVariants",
+                Axolotl.Variant.class,
+                "getSerializedName",
+                "sponge"
             )
         );
     }

gradle/verification-metadata.xml

@@ -334,16 +334,16 @@
             <sha256 value="69d8bf9b2a7d42c9cf1d70ad82be42f6ac6fd788918a6e1d75792ecdcc117a0b" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.18.2">
-         <artifact name="jackson-bom-2.18.2.pom">
-            <sha256 value="5247cdc301725d3f67f7ef049037289d5af709d6972bcf4b17096e4548d2956b" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="com.fasterxml.jackson" name="jackson-bom" version="2.17.2">
          <artifact name="jackson-bom-2.17.2.pom">
             <sha256 value="1f472b0bc2004d5cf421ac48871417f84189e78f35c049718387fd8b44fb9f32" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.fasterxml.jackson" name="jackson-bom" version="2.18.2">
+         <artifact name="jackson-bom-2.18.2.pom">
+            <sha256 value="5247cdc301725d3f67f7ef049037289d5af709d6972bcf4b17096e4548d2956b" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.fasterxml.jackson" name="jackson-parent" version="2.12">
          <artifact name="jackson-parent-2.12.pom">
             <sha256 value="62aa1c1679ade09f173dbf1b6c32d35c55e75800238fd5e48f13aa4337c0875b" origin="Generated by Gradle"/>

src/accessors/java/org/spongepowered/common/accessor/world/entity/animal/frog/TadpoleAccessor.java

@@ -0,0 +1,38 @@
+/*
+ * 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.accessor.world.entity.animal.frog;
+
+import net.minecraft.world.entity.animal.frog.Tadpole;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(Tadpole.class)
+public interface TadpoleAccessor {
+
+    @Accessor("age") int accessor$getAge();
+
+    @Accessor("age") void accessor$setAge(int age);
+
+}