Fixed Entity attribute warning on newer versions of Forge

Fixed empty include/exclude config being seen as invalid

gradle.properties

@@ -1,7 +1,7 @@
-minecraft_version=1.16.4
-forge_version=35.0.15
+minecraft_version=1.16.5
+forge_version=36.0.43
 mappings=20201028-1.16.3
-mod_version=0.8.11
+mod_version=0.8.12
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.daemon=false

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

@@ -15,6 +15,7 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.gen.Heightmap;
 import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
@@ -46,7 +47,11 @@ 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::canPenguinSpawn);
         }
-        GlobalEntityTypeAttributes.put(ADELIE_PENGUIN, AdeliePenguinEntity.getAttributes().create());
+    }
+
+    @SubscribeEvent
+    public static void addEntityAttributes(EntityAttributeCreationEvent event) {
+        event.put(ADELIE_PENGUIN, AdeliePenguinEntity.getAttributes().create());
     }
 
     @SubscribeEvent

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

@@ -32,7 +32,7 @@ public static class General {
                     .comment("Penguins should drop experience?")
                     .translation("waddles.configgui.dropExp")
                     .define("dropExp", true);
-            spawnBlocks = builder.defineList("spawn blocks", Collections.singletonList(Blocks.GRASS_BLOCK.getRegistryName().toString()),o -> ForgeRegistries.BLOCKS.getKeys().contains(new ResourceLocation(String.valueOf(o))));
+            spawnBlocks = builder.defineList("spawn blocks", Collections.singletonList(Blocks.GRASS_BLOCK.getRegistryName().toString()), o -> o instanceof String && ForgeRegistries.BLOCKS.getKeys().contains(new ResourceLocation(o.toString())));
             builder.pop();
         }
     }
@@ -52,8 +52,8 @@ public static class Spawn {
             weight = builder.defineInRange("weight", 7, 0, 100);
             builder.pop();
             builder.push("spawnable biomes");
-            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(), OCEAN.toString(), NETHER.toString()), o -> BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(String.valueOf(o))));
+            include = builder.defineList("include", Collections.singletonList(SNOWY.toString()), o -> o instanceof String && (o.equals("") || BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(o.toString()))));
+            exclude = builder.defineList("exclude", Arrays.asList(FOREST.toString(), MOUNTAIN.toString(), OCEAN.toString(), NETHER.toString()), o -> o instanceof String && (o.equals("") || BiomeDictionary.Type.getAll().contains(BiomeDictionaryHelper.getType(o.toString()))));
             builder.pop();
         }
     }

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

@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[34,)"
+loaderVersion="[36,)"
 logoFile="logo.png"
 license="GNU General Public License v3.0"
 
@@ -18,6 +18,6 @@ license="GNU General Public License v3.0"
 [[dependencies.waddles]]
     modId="forge"
     mandatory=true
-    versionRange="[34.1.21,)"
+    versionRange="[36.0.42,)"
     ordering="AFTER"
     side="BOTH"