diff --git a/mappings/net/minecraft/block/PortalBlock.mapping b/mappings/net/minecraft/block/PortalBlock.mapping
index b612c90b8f..55d1a3df49 100644
--- a/mappings/net/minecraft/block/PortalBlock.mapping
+++ b/mappings/net/minecraft/block/PortalBlock.mapping
@@ -4,3 +4,6 @@ CLASS bpz net/minecraft/block/PortalBlock
 	FIELD c Z_SHAPE Lcsp;
 	METHOD <init> (Lbml$c;)V
 		ARG 1 settings
+	METHOD c findPortal (Lbhi;Lev;)Lbvo$b;
+		ARG 1 world
+		ARG 2 pos
diff --git a/mappings/net/minecraft/block/pattern/BlockPattern.mapping b/mappings/net/minecraft/block/pattern/BlockPattern.mapping
index 97055202db..3b9e9cfe1b 100644
--- a/mappings/net/minecraft/block/pattern/BlockPattern.mapping
+++ b/mappings/net/minecraft/block/pattern/BlockPattern.mapping
@@ -16,6 +16,14 @@ CLASS bvo net/minecraft/block/pattern/BlockPattern
 		METHOD c getUp ()Lfa;
 		METHOD d getWidth ()I
 		METHOD e getHeight ()I
+	CLASS bvo$c TeleportTarget
+		FIELD a pos Lcrv;
+		FIELD b velocity Lcrv;
+		FIELD c yaw I
+		METHOD <init> (Lcrv;Lcrv;I)V
+			ARG 1 pos
+			ARG 2 velocity
+			ARG 3 yaw
 	FIELD a pattern [[[Ljava/util/function/Predicate;
 	FIELD b depth I
 	FIELD c height I
diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping
index f710e5fae7..0e863deae8 100644
--- a/mappings/net/minecraft/entity/Entity.mapping
+++ b/mappings/net/minecraft/entity/Entity.mapping
@@ -72,7 +72,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD <init> (Laij;Lbhh;)V
 		ARG 1 type
 		ARG 2 world
-	METHOD E updatePortalCooldown ()V
+	METHOD E tickPortalCooldown ()V
 	METHOD N createSpawnPacket ()Lka;
 	METHOD R detach ()V
 	METHOD S getType ()Laij;
@@ -156,6 +156,7 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 state
 		ARG 2 multipliers
 	METHOD a changeDimension (Lbyd;)Laif;
+		ARG 1 newDimension
 	METHOD a lookAt (Lck$a;Lcrv;)V
 		ARG 1 anchor
 		ARG 2 target
@@ -210,6 +211,7 @@ CLASS aif net/minecraft/entity/Entity
 	METHOD aS getRotationVector ()Lcrv;
 	METHOD aT getRotationClient ()Lcru;
 	METHOD aU getRotationVecClient ()Lcrv;
+	METHOD aV tickPortal ()V
 	METHOD aW getDefaultPortalCooldown ()I
 	METHOD aY getItemsHand ()Ljava/lang/Iterable;
 	METHOD aZ getArmorItems ()Ljava/lang/Iterable;
@@ -324,6 +326,7 @@ CLASS aif net/minecraft/entity/Entity
 		ARG 1 player
 	METHOD c squaredDistanceTo (Lcrv;)D
 	METHOD c setInPortal (Lev;)V
+		ARG 1 pos
 	METHOD c saveSelfToTag (Lib;)Z
 	METHOD c onStoppedTrackingBy (Lvh;)V
 	METHOD c setSilent (Z)V
diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping
index 1058ca5946..9a77c7f574 100644
--- a/mappings/net/minecraft/world/PortalForcer.mapping
+++ b/mappings/net/minecraft/world/PortalForcer.mapping
@@ -1,7 +1,29 @@
 CLASS bht net/minecraft/world/PortalForcer
+	CLASS bht$a TicketInfo
+		FIELD a pos Lev;
+		FIELD b lastUsedTime J
+		METHOD <init> (Lev;J)V
+			ARG 1 pos
+			ARG 2 lastUsedTime
+	FIELD a LOGGER Lorg/apache/logging/log4j/Logger;
 	FIELD b PORTAL_BLOCK Lbpz;
 	FIELD c world Lvg;
 	FIELD d random Ljava/util/Random;
+	FIELD e ticketInfos Ljava/util/Map;
+	FIELD f activePortals Lit/unimi/dsi/fastutil/objects/Object2LongMap;
 	METHOD <init> (Lvg;)V
 		ARG 1 world
-	METHOD b tick (J)V
+	METHOD a tick (J)V
+		ARG 1 time
+	METHOD a createPortal (Laif;)Z
+		ARG 1 entity
+	METHOD a usePortal (Laif;F)Z
+	METHOD a getPortal (Lev;Lcrv;Lfa;DDZ)Lbvo$c;
+		ARG 1 pos
+		ARG 4 x
+		ARG 6 y
+		ARG 8 canActivate
+	METHOD b removeOldActivePortals (J)V
+		ARG 1 time
+	METHOD c removeOldTickets (J)V
+		ARG 1 time
diff --git a/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping b/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping
new file mode 100644
index 0000000000..2dff9aadbe
--- /dev/null
+++ b/mappings/net/minecraft/world/chunk/ColumnChunkNibbleArray.mapping
@@ -0,0 +1 @@
+CLASS ckm net/minecraft/world/chunk/ColumnChunkNibbleArray