Ported to 1.16.3

gradle.properties

@@ -1,7 +1,7 @@
-minecraft_version=1.16.1
-forge_version=32.0.38
-mappings=20200514-1.16
-mod_version=0.8.7
+minecraft_version=1.16.3
+forge_version=34.0.7
+mappings=20200723-1.16.1
+mod_version=0.8.8
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false

src/main/java/com/girafi/waddles/Waddles.java

@@ -4,7 +4,6 @@
 import com.girafi.waddles.init.PenguinRegistry;
 import com.girafi.waddles.utils.ConfigurationHandler;
 import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.DeferredWorkQueue;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 import net.minecraftforge.fml.common.Mod;
@@ -26,7 +25,7 @@ public Waddles() {
     }
 
     public void setupCommon(final FMLCommonSetupEvent event) {
-        DeferredWorkQueue.runLater(PenguinRegistry::addSpawn);
+
     }
 
     public void setupClient(final FMLClientSetupEvent event) {

src/main/java/com/girafi/waddles/entity/AdeliePenguinEntity.java

@@ -18,6 +18,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
+import net.minecraft.world.server.ServerWorld;
 
 import javax.annotation.Nonnull;
 
@@ -47,7 +48,7 @@ protected void registerGoals() {
     }
 
     public static AttributeModifierMap.MutableAttribute getAttributes() {
-        return MobEntity.func_233666_p_().func_233815_a_(Attributes.field_233818_a_, 8.0D).func_233815_a_(Attributes.field_233821_d_, 0.16D);
+        return MobEntity.func_233666_p_().createMutableAttribute(Attributes.MAX_HEALTH, 8.0D).createMutableAttribute(Attributes.MOVEMENT_SPEED, 0.16D);
     }
 
     @Override
@@ -102,7 +103,7 @@ public ResourceLocation getLootTable() {
     }
 
     @Override
-    public AdeliePenguinEntity createChild(@Nonnull AgeableEntity ageable) {
+    public AgeableEntity func_241840_a(@Nonnull ServerWorld world, @Nonnull AgeableEntity ageableEntity) {
         return PenguinRegistry.ADELIE_PENGUIN.create(this.world);
     }
 

src/main/java/com/girafi/waddles/init/PenguinRegistry.java

@@ -2,8 +2,6 @@
 
 import com.girafi.waddles.Waddles;
 import com.girafi.waddles.entity.AdeliePenguinEntity;
-import com.girafi.waddles.utils.BiomeDictionaryHelper;
-import com.girafi.waddles.utils.ConfigurationHandler;
 import com.google.common.base.CaseFormat;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
@@ -18,18 +16,17 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.gen.Heightmap;
-import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.event.world.BiomeLoadingEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Set;
 
 @EventBusSubscriber(modid = Waddles.MOD_ID, bus = EventBusSubscriber.Bus.MOD)
 public class PenguinRegistry {
-    private static final List<EntityType> ENTITIES = Lists.newArrayList();
+    private static final List<EntityType<?>> ENTITIES = Lists.newArrayList();
     private static final List<Item> SPAWN_EGGS = Lists.newArrayList();
 
     public static final EntityType<AdeliePenguinEntity> ADELIE_PENGUIN = createEntity("adelie_penguin", AdeliePenguinEntity::new, 0.4F, 0.95F, 0x000000, 0xFFFFFF);
@@ -57,7 +54,7 @@ public static void registerPenguins(RegistryEvent.Register<EntityType<?>> event)
             event.getRegistry().register(entity);
             EntitySpawnPlacementRegistry.register(entity, EntitySpawnPlacementRegistry.PlacementType.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, AdeliePenguinEntity::canAnimalSpawn);
         }
-        GlobalEntityTypeAttributes.put(ADELIE_PENGUIN, AdeliePenguinEntity.getAttributes().func_233813_a_());
+        GlobalEntityTypeAttributes.put(ADELIE_PENGUIN, AdeliePenguinEntity.getAttributes().create());
     }
 
     @SubscribeEvent
@@ -68,7 +65,7 @@ public static void registerSpawnEggs(RegistryEvent.Register<Item> event) {
         }
     }
 
-    public static void addSpawn() {
+    /*public static void addSpawn() { //TODO
         List<Biome> spawnableBiomes = Lists.newArrayList();
 
         List<BiomeDictionary.Type> includeList = Arrays.asList(BiomeDictionaryHelper.toBiomeTypeArray(ConfigurationHandler.SPAWN.include.get()));
@@ -95,5 +92,5 @@ public static void addSpawn() {
         for (Biome biome : spawnableBiomes) {
             biome.getSpawns(EntityClassification.CREATURE).add(new Biome.SpawnListEntry(ADELIE_PENGUIN, ConfigurationHandler.SPAWN.weight.get(), ConfigurationHandler.SPAWN.min.get(), ConfigurationHandler.SPAWN.max.get()));
         }
-    }
+    }*/
 }

src/main/java/com/girafi/waddles/init/PenguinSpawn.java

@@ -0,0 +1,21 @@
+package com.girafi.waddles.init;
+
+import com.girafi.waddles.Waddles;
+import com.girafi.waddles.utils.ConfigurationHandler;
+import net.minecraft.entity.EntityClassification;
+import net.minecraft.world.biome.MobSpawnInfo;
+import net.minecraftforge.event.world.BiomeLoadingEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod.EventBusSubscriber(modid = Waddles.MOD_ID)
+public class PenguinSpawn {
+
+    @SubscribeEvent(priority =  EventPriority.HIGH)
+    public static void addSpawn(BiomeLoadingEvent event) {
+        if (ConfigurationHandler.SPAWN.spawnableBiomes.get().contains(event.getName().toString())) {
+            event.getSpawns().getSpawner(EntityClassification.CREATURE).add(new MobSpawnInfo.Spawners(PenguinRegistry.ADELIE_PENGUIN, ConfigurationHandler.SPAWN.weight.get(), ConfigurationHandler.SPAWN.min.get(), ConfigurationHandler.SPAWN.max.get()));
+        }
+    }
+}

src/main/java/com/girafi/waddles/utils/ConfigurationHandler.java

@@ -1,14 +1,14 @@
 package com.girafi.waddles.utils;
 
-import net.minecraftforge.common.BiomeDictionary;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.world.biome.Biomes;
 import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import static net.minecraftforge.common.BiomeDictionary.Type.*;
-
 public class ConfigurationHandler {
     public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
     public static final General GENERAL = new General(BUILDER);
@@ -36,8 +36,9 @@ public static class Spawn {
         public final ForgeConfigSpec.IntValue min;
         public final ForgeConfigSpec.IntValue max;
         public final ForgeConfigSpec.IntValue weight;
-        public final ForgeConfigSpec.ConfigValue<List<? extends String>> include;
-        public final ForgeConfigSpec.ConfigValue<List<? extends String>> exclude;
+        public final ForgeConfigSpec.ConfigValue<List<? extends String>> spawnableBiomes;
+        //public final ForgeConfigSpec.ConfigValue<List<? extends String>> include; //TODO
+        //public final ForgeConfigSpec.ConfigValue<List<? extends String>> exclude; //TODO
 
         Spawn(ForgeConfigSpec.Builder builder) {
             builder.push("spawn chances");
@@ -47,9 +48,10 @@ public static class Spawn {
             weight = builder.defineInRange("weight", 4, 0, 100);
             builder.pop();
             builder.push("spawnable biomes");
-            builder.comment("BiomeDictionary types to include & exclude.");
-            include = builder.defineList("include", Collections.singletonList(SNOWY.toString()), o -> BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(String.valueOf(o))));
-            exclude = builder.defineList("exclude", Arrays.asList(FOREST.toString(), MOUNTAIN.toString(), NETHER.toString()), o -> BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(String.valueOf(o))));
+            spawnableBiomes = builder.defineList("biomes", Arrays.asList(Biomes.SNOWY_TUNDRA.func_240901_a_().toString(), Biomes.ICE_SPIKES.func_240901_a_().toString()), o -> ForgeRegistries.BIOMES.containsKey(new ResourceLocation(String.valueOf(o))));
+            //builder.comment("BiomeDictionary types to include & exclude.");
+            //include = builder.defineList("include", Collections.singletonList(SNOWY.toString()), o -> BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(String.valueOf(o))));
+            //exclude = builder.defineList("exclude", Arrays.asList(FOREST.toString(), MOUNTAIN.toString(), NETHER.toString()), o -> BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(String.valueOf(o))));
             builder.pop();
         }
     }

src/main/resources/META-INF/mods.toml

@@ -1,6 +1,7 @@
 modLoader="javafml"
-loaderVersion="[27,)"
+loaderVersion="[34,)"
 logoFile="logo.png"
+license="GNU General Public License v3.0"
 
 [[mods]]
     modId="waddles"
@@ -17,6 +18,6 @@ logoFile="logo.png"
 [[dependencies.waddles]]
     modId="forge"
     mandatory=true
-    versionRange="[31.1,)"
+    versionRange="[34.0.5,)"
     ordering="AFTER"
     side="BOTH"

src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "Waddles resources",
-        "pack_format": 4
+        "pack_format": 6
     }
 }