From 6596cd0f81cc368a93be5622253096bde83522a6 Mon Sep 17 00:00:00 2001
From: SPGoding <15277496+SPGoding@users.noreply.github.com>
Date: Sun, 29 Nov 2020 16:05:30 -0600
Subject: [PATCH] Map something for experience orb (#1893)

* Map something for experience orb

* Remap method_30048
---
 .../entity/ExperienceOrbEntity.mapping          | 17 +++++++++++++++++
 mappings/net/minecraft/util/math/Box.mapping    |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
index 2b36d9ac5e..4b780abe75 100644
--- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
+++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping
@@ -1,4 +1,5 @@
 CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
+	FIELD field_27009 pickingCount I
 	FIELD field_6159 amount I
 	FIELD field_6161 health I
 	FIELD field_6162 target Lnet/minecraft/class_1657;
@@ -9,6 +10,22 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity
 		ARG 4 y
 		ARG 6 z
 		ARG 8 amount
+	METHOD method_31493 spawn (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;I)V
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 amount
+	METHOD method_31494 isMergeable (Lnet/minecraft/class_1303;)Z
+		ARG 1 other
+	METHOD method_31495 isMergeable (Lnet/minecraft/class_1303;II)Z
+		ARG 0 orb
+		ARG 1 seed
+		ARG 2 amount
+	METHOD method_31496 wasMergedIntoExistingOrb (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;I)Z
+		ARG 0 world
+		ARG 1 pos
+		ARG 2 amount
+	METHOD method_31497 merge (Lnet/minecraft/class_1303;)V
+		ARG 1 other
 	METHOD method_5917 getMendingRepairAmount (I)I
 		ARG 1 experienceAmount
 	METHOD method_5918 roundToOrbSize (I)I
diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping
index e9a8ccdf33..534cca239f 100644
--- a/mappings/net/minecraft/util/math/Box.mapping
+++ b/mappings/net/minecraft/util/math/Box.mapping
@@ -75,6 +75,10 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box
 		ARG 1 scale
 	METHOD method_19316 from (Lnet/minecraft/class_3341;)Lnet/minecraft/class_238;
 		ARG 0 mutable
+	METHOD method_30048 of (DDD)Lnet/minecraft/class_238;
+		ARG 0 x
+		ARG 2 y
+		ARG 4 z
 	METHOD method_989 offset (DDD)Lnet/minecraft/class_238;
 		ARG 1 x
 		ARG 3 y