fix conflicts in ProgressRenderer

OrnitheMC · Sep 30, 2024 · 81ddeae · 81ddeae
1 parent 9357d65
commit 81ddeae
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 12 deletions.
diff --git a/mappings/c0.0.22a_05#c0.0.21a.tinydiff b/mappings/c0.0.22a_05#c0.0.21a.tinydiff
@@ -112,10 +112,10 @@ c	net/minecraft/unmapped/C_8425960	net/minecraft/client/render/ProgressRenderer
 	f	Ljava/lang/String;	f_8259792	title	
 	m	(Lnet/minecraft/client/Minecraft;)V	<init>	<init>	
 		p	1		minecraft	
-	m	(Ljava/lang/String;)V	m_3915830	m_3915830	
-		p	1		p_1	
-	m	(I)V	m_1991224	m_1991224	
-		p	1		p_1	
+	m	(Ljava/lang/String;)V	m_3915830	progressStage	
+		p	1		stage	
+	m	(I)V	m_1991224	progressPercentage	
+		p	1		percentage	
 	m	(Ljava/lang/String;)V	m_1434192	m_1434192	
 		p	1		p_1	
 c	net/minecraft/unmapped/C_1774538	net/minecraft/client/Minecraft__OS	

diff --git a/mappings/in-20091231-2257#in-20091223-1459.tinydiff b/mappings/in-20091231-2257#in-20091223-1459.tinydiff
@@ -241,8 +241,8 @@ c	net/minecraft/unmapped/C_7688744
 	f	Lnet/minecraft/unmapped/C_5027199;	f_8113385	dropKey	
 	f	Lnet/minecraft/unmapped/C_5027199;	f_7595807		f_7595807
 c	net/minecraft/unmapped/C_8425960
-	m	(Ljava/lang/String;)V	m_4655768	m_4655768	
-		p	1		p_1	
+	m	(Ljava/lang/String;)V	m_4655768	progressStart	
+		p	1		title	
 c	net/minecraft/unmapped/C_9302567
 	f	F	f_7031829	shadowSize	
 	f	Lnet/minecraft/unmapped/C_3466301;	f_0998767	f_0998767	

diff --git a/mappings/in-20100105#in-20091231-2257.tinydiff b/mappings/in-20100105#in-20091231-2257.tinydiff
@@ -503,3 +503,10 @@ c	net/minecraft/unmapped/C_6942422
 		p	2		p_2	
 		p	3		p_3	
 c	net/minecraft/unmapped/C_8134817		net/minecraft/unmapped/C_8134817
+c	net/minecraft/unmapped/C_8425960
+	m	(Ljava/lang/String;)V	m_4655768	m_4655768	progressStart
+		p	1		p_1	title
+	m	(Ljava/lang/String;)V	m_3915830	m_3915830	progressStage
+		p	1		p_1	stage
+	m	(I)V	m_1991224	m_1991224	progressPercentage
+		p	1		p_1	percentage
diff --git a/mappings/inf-20100227-1433#in-20100223.tinydiff b/mappings/inf-20100227-1433#in-20100223.tinydiff
@@ -1516,8 +1516,6 @@ c	net/minecraft/unmapped/C_8425960
 	m	()V	<init>		<init>
 	m	(Ljava/io/InputStream;)Lnet/minecraft/unmapped/C_2800860;	m_3357503		m_3357503
 		p	0			p_0
-	m	(Ljava/lang/String;)V	m_3915830	progressPercentage	m_3915830
-		p	1		percentage	p_1
 c	net/minecraft/unmapped/C_8554894
 	m	()Z	m_7284382		m_7284382
 	m	()Z	m_5256523		m_5256523

diff --git a/mappings/inf-20100327#inf-20100325-1640.tinydiff b/mappings/inf-20100327#inf-20100325-1640.tinydiff
@@ -429,8 +429,8 @@ c	net/minecraft/unmapped/C_8425960
 	m	(Lnet/minecraft/unmapped/C_2800860;Ljava/io/OutputStream;)V	m_5551645	m_5551645	
 		p	0		p_0	
 		p	1		p_1	
-	m	(Ljava/lang/String;)V	m_3915830		progressPercentage
-		p	1			percentage
+	m	(Ljava/lang/String;)V	m_3915830		m_3915830
+		p	1			p_1
 	m	(Ljava/lang/String;)V	m_4655768	progressStart	m_4655768
 		p	1		title	p_1
 c	net/minecraft/unmapped/C_8905061

diff --git a/mappings/inf-20100624#inf-20100618.tinydiff b/mappings/inf-20100624#inf-20100618.tinydiff
@@ -570,11 +570,11 @@ c	net/minecraft/unmapped/C_8425960
 	m	(Lnet/minecraft/unmapped/C_2800860;Ljava/io/OutputStream;)V	m_5551645		m_5551645
 		p	0			p_0
 		p	1			p_1
-	m	(Ljava/lang/String;)V	m_4655768	start	progressStart
 	m	(Ljava/lang/String;)V	m_5570081	m_5570081	progressStage
 		p	1		p_1	stage
 	m	(I)V	m_3915830	m_3915830	progressPercentage
 		p	1		p_1	percentage
+	m	(Ljava/lang/String;)V	m_4655768	start	progressStart
 c	net/minecraft/unmapped/C_8443484
 	m	(Lnet/minecraft/unmapped/C_2627205;IIII)Z	m_8199947	m_8199947	
 		p	1		p_1	

diff --git a/mappings/inf-20100627#inf-20100625-1917.tinydiff b/mappings/inf-20100627#inf-20100625-1917.tinydiff
@@ -301,3 +301,9 @@ c	net/minecraft/unmapped/C_9232749		net/minecraft/world/WorldEventListener
 	m	(Lnet/minecraft/unmapped/C_6385858;)V	m_3338259		notifyEntityRemoved
 		p	1			entity
 	m	()V	m_0340972		notifyAmbientDarknessChanged
+c	net/minecraft/unmapped/C_8425960
+	m	(Ljava/lang/String;)V	m_5570081	progressStage	m_5570081
+		p	1		stage	p_1
+	m	(I)V	m_3915830	progressPercentage	m_3915830
+		p	1		percentage	p_1
+	m	()V	m_5266201	progressStartNoAbort	m_5266201
diff --git a/mappings/inf-20100630-1340#inf-20100629.tinydiff b/mappings/inf-20100630-1340#inf-20100629.tinydiff
@@ -1313,7 +1313,11 @@ c	net/minecraft/unmapped/C_8135468
 c	net/minecraft/unmapped/C_8425960
 	m	(Ljava/lang/String;)V	m_5266201	m_5266201	
 		p	1		p_1	
-	m	()V	m_5266201		m_5266201
+	m	()V	m_5266201		progressStartNoAbort
+	m	(Ljava/lang/String;)V	m_5570081	m_5570081	progressStage
+		p	1		p_1	stage
+	m	(I)V	m_3915830	m_3915830	progressPercentage
+		p	1		p_1	percentage
 c	net/minecraft/unmapped/C_8554894
 	f	Lnet/minecraft/unmapped/C_8554894;	f_0239110	CORAL	
 c	net/minecraft/unmapped/C_8565077