fix Entity.getName and getDisplayName being swapped in <=1.6.4

OrnitheMC · Nov 21, 2024 · 4a114b3 · 4a114b3
1 parent 4345310
commit 4a114b3
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/mappings/1.0.0-rc1#1.0.0-rc2-3.tinydiff b/mappings/1.0.0-rc1#1.0.0-rc2-3.tinydiff
@@ -145,7 +145,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834		getEquipmentStacks
 	m	(Z)V	m_8609807		setSneaking
 		p	1			sneaking
-	m	()Ljava/lang/String;	m_5573014		getDisplayName
+	m	()Ljava/lang/String;	m_5573014		getName
 c	net/minecraft/unmapped/C_6755599
 	m	([BIIIIIII)I	m_5989424		packChunkData
 		p	1			data

diff --git a/mappings/1.6.2-091847#13w36a-09051446.tinydiff b/mappings/1.6.2-091847#13w36a-09051446.tinydiff
@@ -2597,7 +2597,9 @@ c	net/minecraft/unmapped/C_6385858
 		p	5			z
 		p	6			block
 		p	7			power
-	m	()Lnet/minecraft/unmapped/C_2787601;	m_9806392		m_9806392
+	m	()Lnet/minecraft/unmapped/C_2787601;	m_9806392		getSoundCategory
+	m	()Ljava/lang/String;	m_5573014	getName	getDisplayName
+	m	()Ljava/lang/String;	m_6689989	getDisplayName	getName
 c	net/minecraft/unmapped/C_6391166
 	m	(Lnet/minecraft/unmapped/C_3906126;IIII)V	m_6252045	m_6252045	
 		p	1		p_1	

diff --git a/mappings/13w04a#13w05a-1538.tinydiff b/mappings/13w04a#13w05a-1538.tinydiff
@@ -114,7 +114,7 @@ c	net/minecraft/unmapped/C_5009044
 	m	()Lnet/minecraft/unmapped/C_4143404;	m_9485094		getScoreboardTeam
 	m	()Ljava/lang/String;	m_6689989		m_6689989
 c	net/minecraft/unmapped/C_6385858
-	m	()Ljava/lang/String;	m_6689989		getName
+	m	()Ljava/lang/String;	m_6689989		getDisplayName
 c	net/minecraft/unmapped/C_6664676
 	m	(Lnet/minecraft/unmapped/C_3906126;)Lnet/minecraft/unmapped/C_2074023;	m_0502820	createBlockEntity	
 		p	1		world	

diff --git a/mappings/13w41b-1523#13w42a.tinydiff b/mappings/13w41b-1523#13w42a.tinydiff
@@ -376,7 +376,7 @@ c	net/minecraft/unmapped/C_5009044
 	m	(I)Ljava/lang/String;	m_2145525		m_2145525
 		p	1			p_1
 c	net/minecraft/unmapped/C_6385858
-	m	()Lnet/minecraft/unmapped/C_2787601;	m_9806392	m_9806392	
+	m	()Lnet/minecraft/unmapped/C_2787601;	m_9806392	getSoundCategory	
 	m	()Ljava/lang/String;	m_4681035		getSwimSound
 	m	()Ljava/lang/String;	m_4340750		getSplashSound
 c	net/minecraft/unmapped/C_6616246

diff --git a/mappings/b1.7.3#b1.8-pre1-201109091357.tinydiff b/mappings/b1.7.3#b1.8-pre1-201109091357.tinydiff
@@ -1430,7 +1430,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	(Z)V	m_4619223		setSprinting
 		p	1			sprinting
 	m	()V	m_1336552		onCobwebCollision
-	m	()Ljava/lang/String;	m_5573014		getDisplayName
+	m	()Ljava/lang/String;	m_5573014		getName
 c	net/minecraft/unmapped/C_6644571
 	m	(Lnet/minecraft/unmapped/C_3906126;IIILjava/util/Random;)V	m_6779924		grow
 		p	1			p_1

diff --git a/mappings/b1.8-pre1-201109081459#b1.8-pre1-201109091357.tinydiff b/mappings/b1.8-pre1-201109081459#b1.8-pre1-201109091357.tinydiff
@@ -144,7 +144,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834		getEquipmentStacks
 	m	(Z)V	m_8609807		setSneaking
 		p	1			sneaking
-	m	()Ljava/lang/String;	m_5573014		getDisplayName
+	m	()Ljava/lang/String;	m_5573014		getName
 c	net/minecraft/unmapped/C_6755599
 	m	([BIIIIIII)I	m_5989424		packChunkData
 		p	1			data

diff --git a/mappings/b1.9-pre3-201110061350#b1.9-pre3-201110061402.tinydiff b/mappings/b1.9-pre3-201110061350#b1.9-pre3-201110061402.tinydiff
@@ -794,7 +794,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834	getEquipmentStacks	
 	m	(Z)V	m_8609807	setSneaking	
 		p	1		sneaking	
-	m	()Ljava/lang/String;	m_5573014	getDisplayName	
+	m	()Ljava/lang/String;	m_5573014	getName	
 c	net/minecraft/unmapped/C_6755599
 	m	([BIIIIIII)I	m_5989424	packChunkData	
 		p	1		data	

diff --git a/mappings/b1.9-pre3-201110061402#b1.9-pre4-201110131434.tinydiff b/mappings/b1.9-pre3-201110061402#b1.9-pre4-201110131434.tinydiff
@@ -634,7 +634,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834		getEquipmentStacks
 	m	(Z)V	m_8609807		setSneaking
 		p	1			sneaking
-	m	()Ljava/lang/String;	m_5573014		getDisplayName
+	m	()Ljava/lang/String;	m_5573014		getName
 	m	()[Lnet/minecraft/unmapped/C_6385858;	m_1414720		getParts
 c	net/minecraft/unmapped/C_6391166
 	m	(ILjava/util/Random;)I	m_6894859	m_6894859	

diff --git a/mappings/b1.9-pre6#1.0.0-rc1.tinydiff b/mappings/b1.9-pre6#1.0.0-rc1.tinydiff
@@ -875,7 +875,7 @@ c	net/minecraft/unmapped/C_6385858
 	m	()[Lnet/minecraft/unmapped/C_2750078;	m_9919834	getEquipmentStacks	
 	m	(Z)V	m_8609807	setSneaking	
 		p	1		sneaking	
-	m	()Ljava/lang/String;	m_5573014	getDisplayName	
+	m	()Ljava/lang/String;	m_5573014	getName	
 	m	(IIII)V	m_4546144		playStepSound
 		p	1			x
 		p	2			y