diff --git a/mappings/net/minecraft/enchantment/Enchantments.mapping b/mappings/net/minecraft/enchantment/Enchantments.mapping
new file mode 100644
index 0000000000..e44f6fe5a0
--- /dev/null
+++ b/mappings/net/minecraft/enchantment/Enchantments.mapping
@@ -0,0 +1,30 @@
+CLASS none/ahq net/minecraft/enchantment/Enchantments
+	FIELD A MENDING Lnone/ahm;
+	FIELD a PROTECTION Lnone/ahm;
+	FIELD b FIRE_PROTECTION Lnone/ahm;
+	FIELD c FEATHER_FALLING Lnone/ahm;
+	FIELD d BLAST_PROTECTION Lnone/ahm;
+	FIELD e PROJECTILE_PROTECTION Lnone/ahm;
+	FIELD f RESPIRATION Lnone/ahm;
+	FIELD g AQUA_AFFINITY Lnone/ahm;
+	FIELD h THORNS Lnone/ahm;
+	FIELD i DEPTH_STRIDER Lnone/ahm;
+	FIELD j FROST_WALKER Lnone/ahm;
+	FIELD k SHARPNESS Lnone/ahm;
+	FIELD l SMITE Lnone/ahm;
+	FIELD m BANE_OF_ARTHROPODS Lnone/ahm;
+	FIELD n KNOCKBACK Lnone/ahm;
+	FIELD o FIRE_ASPECT Lnone/ahm;
+	FIELD p LOOTING Lnone/ahm;
+	FIELD q EFFICIENCY Lnone/ahm;
+	FIELD r SILK_TOUCH Lnone/ahm;
+	FIELD s UNBREAKING Lnone/ahm;
+	FIELD t FORTUNE Lnone/ahm;
+	FIELD u POWER Lnone/ahm;
+	FIELD v PUNCH Lnone/ahm;
+	FIELD w FLAME Lnone/ahm;
+	FIELD x INFINITY Lnone/ahm;
+	FIELD y LUCK_OF_THE_SEA Lnone/ahm;
+	FIELD z LURE Lnone/ahm;
+	METHOD a getEnchantment (Ljava/lang/String;)Lnone/ahm;
+		ARG 0 name
diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping
index 0baac6f0f0..17cd7e8cc3 100644
--- a/mappings/net/minecraft/world/World.mapping
+++ b/mappings/net/minecraft/world/World.mapping
@@ -61,7 +61,9 @@ CLASS none/aiu net/minecraft/world/World
 		ARG 3 category
 		ARG 4 volume
 		ARG 5 pitch
-	METHOD a initializeWorld (Lnone/aix;)V
+	METHOD a addListener (Lnone/aiw;)V
+	METHOD a init (Lnone/aix;)V
+		ARG 0 info
 	METHOD a isValidPos (Lnone/cn;)Z
 		ARG 0 pos
 	METHOD a setBlockState (Lnone/cn;Lnone/asj;I)Z
@@ -89,6 +91,7 @@ CLASS none/aiu net/minecraft/world/World
 		ARG 1 predicate
 	METHOD b getPlayerByUuid (Ljava/util/UUID;)Lnone/aak;
 		ARG 0 uuid
+	METHOD b (Lnone/aiw;)V
 	METHOD b getBiome (Lnone/cn;)Lnone/ajh;
 	METHOD b isEmittingRedstonePower (Lnone/cn;Lnone/cu;)Z
 		ARG 0 pos
diff --git a/mappings/net/minecraft/world/WorldServer.mapping b/mappings/net/minecraft/world/WorldServer.mapping
index b9bfb59d11..8bfaad5e92 100644
--- a/mappings/net/minecraft/world/WorldServer.mapping
+++ b/mappings/net/minecraft/world/WorldServer.mapping
@@ -4,7 +4,8 @@ CLASS none/lu net/minecraft/world/WorldServer
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	METHOD a scheduleOnMainThread (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;
 	METHOD a getEntityByUuid (Ljava/util/UUID;)Lnone/se;
-	METHOD a initializeWorld (Lnone/aix;)V
+	METHOD a init (Lnone/aix;)V
+		ARG 0 info
 	METHOD a spawnEntity (Lnone/se;)Z
 		ARG 0 entity
 	METHOD aE isMainThread ()Z
diff --git a/mappings/net/minecraft/world/chunk/ChunkBatcher.mapping b/mappings/none/brk.mapping
similarity index 72%
rename from mappings/net/minecraft/world/chunk/ChunkBatcher.mapping
rename to mappings/none/brk.mapping
index 353d95cb22..75f272fa74 100644
--- a/mappings/net/minecraft/world/chunk/ChunkBatcher.mapping
+++ b/mappings/none/brk.mapping
@@ -1,4 +1,4 @@
-CLASS none/brk net/minecraft/world/chunk/ChunkBatcher
+CLASS none/brk
 	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b THREAD_FACTORY Ljava/util/concurrent/ThreadFactory;
 	FIELD d workers Ljava/util/List;
diff --git a/mappings/none/lv.mapping b/mappings/none/lv.mapping
index c8835aa81f..b145d3a2dd 100644
--- a/mappings/none/lv.mapping
+++ b/mappings/none/lv.mapping
@@ -1,4 +1,6 @@
 CLASS none/lv
+	FIELD a server Lnet/minecraft/server/MinecraftServer;
+	FIELD b world Lnone/lu;
 	METHOD a playSound (Lnone/aak;Lnone/nk;Lnone/nm;DDDFF)V
 		ARG 0 player
 		ARG 1 sound