diff --git a/src/main/java/net/minecraftforge/common/DungeonHooks.java b/src/main/java/net/minecraftforge/common/DungeonHooks.java
index cfbec224b9..56425a4755 100644
--- a/src/main/java/net/minecraftforge/common/DungeonHooks.java
+++ b/src/main/java/net/minecraftforge/common/DungeonHooks.java
@@ -59,7 +59,7 @@ public class DungeonHooks
             if (type == mob.type)
             {
                 itr.remove();
-                rarity = /* mob.weight */ 0 + rarity;
+                rarity = mob.getWeight().asInt() + rarity;
                 break;
             }
         }
@@ -81,7 +81,7 @@ public class DungeonHooks
             if (name == mob.type)
             {
                 dungeonMobs.remove(mob);
-                return 0; // mob.weight;
+                return mob.getWeight().asInt();
             }
         }
         return 0;
@@ -95,7 +95,7 @@ public class DungeonHooks
     public static EntityType<?> getRandomDungeonMob(Random rand)
     {
         DungeonMob mob = WeightedRandom.getRandomItem(rand, dungeonMobs).orElseThrow();
-        return null; // mob.type;
+        return mob.type;
     }
 
 
diff --git a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java
index f5d040fcf4..eb465db098 100644
--- a/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java
+++ b/src/main/java/net/minecraftforge/resource/ResourcePackLoader.java
@@ -25,11 +25,9 @@ import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -38,12 +36,10 @@ import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.server.packs.repository.RepositorySource;
 import net.minecraft.server.packs.repository.Pack;
-import net.minecraft.server.packs.repository.Pack.PackConstructor;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.forgespi.language.IModFileInfo;
 import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.resource.PathResourcePack;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nonnull;