diff --git a/build.gradle b/build.gradle
index 7c34363fe0..53e74074ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 	id 'maven-publish'
 }
 
-def minecraft_version = "19w39a"
+def minecraft_version = "19w40a"
 
 def ENV = System.getenv()
 // Fetch build number from Jenkins
diff --git a/mappings/net/minecraft/class_4586.mapping b/mappings/net/minecraft/class_4586.mapping
deleted file mode 100644
index 2eb956af7c..0000000000
--- a/mappings/net/minecraft/class_4586.mapping
+++ /dev/null
@@ -1 +0,0 @@
-CLASS net/minecraft/class_4586
diff --git a/mappings/net/minecraft/class_4618.mapping b/mappings/net/minecraft/class_4618.mapping
new file mode 100644
index 0000000000..a661061464
--- /dev/null
+++ b/mappings/net/minecraft/class_4618.mapping
@@ -0,0 +1 @@
+CLASS net/minecraft/class_4618
diff --git a/mappings/net/minecraft/client/gui/MapRenderer.mapping b/mappings/net/minecraft/client/gui/MapRenderer.mapping
index 2da0e462ae..91c72e2bdb 100644
--- a/mappings/net/minecraft/client/gui/MapRenderer.mapping
+++ b/mappings/net/minecraft/client/gui/MapRenderer.mapping
@@ -4,7 +4,7 @@ CLASS net/minecraft/class_330 net/minecraft/client/gui/MapRenderer
 		FIELD field_2048 texture Lnet/minecraft/class_1043;
 		FIELD field_2049 id Lnet/minecraft/class_2960;
 		METHOD method_1776 updateTexture ()V
-		METHOD method_1777 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Z)V
+		METHOD method_1777 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ZI)V
 	FIELD field_2043 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2044 MAP_ICONS_TEXTURE Lnet/minecraft/class_2960;
 	FIELD field_2045 mapTextures Ljava/util/Map;
@@ -13,5 +13,5 @@ CLASS net/minecraft/class_330 net/minecraft/client/gui/MapRenderer
 	METHOD method_1771 clearStateTextures ()V
 	METHOD method_1772 getState (Lnet/minecraft/class_330$class_331;)Lnet/minecraft/class_22;
 		ARG 1 texture
-	METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_22;Z)V
+	METHOD method_1773 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_22;ZI)V
 	METHOD method_1774 getMapTexture (Lnet/minecraft/class_22;)Lnet/minecraft/class_330$class_331;
diff --git a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping
index f65273d596..1de49784cb 100644
--- a/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping
+++ b/mappings/net/minecraft/client/render/FirstPersonRenderer.mapping
@@ -4,7 +4,6 @@ CLASS net/minecraft/class_759 net/minecraft/client/render/FirstPersonRenderer
 	FIELD field_4046 renderManager Lnet/minecraft/class_898;
 	FIELD field_4047 mainHand Lnet/minecraft/class_1799;
 	FIELD field_4048 offHand Lnet/minecraft/class_1799;
-	FIELD field_4049 MAP_BACKGROUND_TEX Lnet/minecraft/class_2960;
 	FIELD field_4050 client Lnet/minecraft/class_310;
 	FIELD field_4051 prevEquipProgressOffHand F
 	FIELD field_4052 equipProgressOffHand F
diff --git a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping
index 1dd983c3e0..b26ebe86b4 100644
--- a/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping
+++ b/mappings/net/minecraft/client/render/entity/ItemFrameEntityRenderer.mapping
@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_915 net/minecraft/client/render/entity/ItemFrameEntityRenderer
 	FIELD field_4720 itemRenderer Lnet/minecraft/class_918;
 	FIELD field_4721 NORMAL_FRAME Lnet/minecraft/class_1091;
-	FIELD field_4722 MAP_BACKGROUND_TEX Lnet/minecraft/class_2960;
 	FIELD field_4723 MAP_FRAME Lnet/minecraft/class_1091;
 	FIELD field_4724 client Lnet/minecraft/class_310;
 	METHOD <init> (Lnet/minecraft/class_898;Lnet/minecraft/class_918;)V
diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping
index e1112a6506..4e853533f5 100644
--- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping
+++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping
@@ -1,6 +1,4 @@
 CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture
-	FIELD field_5201 oldMipmap Z
-	FIELD field_5202 oldBilinear Z
 	FIELD field_5203 mipmap Z
 	FIELD field_5204 glId I
 	FIELD field_5205 bilinear Z
@@ -11,5 +9,3 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture
 	METHOD method_4528 clearGlId ()V
 	METHOD method_4624 getGlId ()I
 	METHOD method_4625 load (Lnet/minecraft/class_3300;)V
-	METHOD method_4626 pushFilter (ZZ)V
-	METHOD method_4627 popFilter ()V
diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping
index dc18fe119e..b7b08247ac 100644
--- a/mappings/net/minecraft/client/texture/TextureManager.mapping
+++ b/mappings/net/minecraft/client/texture/TextureManager.mapping
@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager
 	FIELD field_5283 dynamicIdCounters Ljava/util/Map;
-	FIELD field_5284 tickListeners Ljava/util/List;
+	FIELD field_5284 tickListeners Ljava/util/Set;
 	FIELD field_5285 MISSING_IDENTIFIER Lnet/minecraft/class_2960;
 	FIELD field_5286 textures Ljava/util/Map;
 	FIELD field_5287 resourceContainer Lnet/minecraft/class_3300;