Merge branch 'multiversion' into feat/sol/darkkronicle-bedwars-display

moehreag · moehreag · commit 6ae663bf0f22 · 2023-07-15T12:22:23.000+02:00
diff --git a/1.16.5/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.16.5/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.19.2/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.19.2/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.19.3/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.19.3/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.19.4/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.19.4/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.20/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java b/1.20/src/main/java/io/github/axolotlclient/mixin/PlayerListHudMixin.java
@@ -233,7 +233,7 @@ public abstract class PlayerListHudMixin {
 		),
 		ordinal = 7
 	)
-	public int axolotlclient$changeWidth(int value, GuiGraphics graphics, int scaledWindowWidth, Scoreboard scoreboard, @Nullable ScoreboardObjective objective) {
+	public int axolotlclient$changeWidth(int value) {
 		if (BedwarsMod.getInstance().isEnabled() && BedwarsMod.getInstance().blockLatencyIcon() && (BedwarsMod.getInstance().isWaiting() || BedwarsMod.getInstance().inGame())) {
 			value -= 9;
 		}
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.20/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType<?> type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();
 	}
 
@@ -115,7 +115,7 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType<?> type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/particles/Particles.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/particles/Particles.java
@@ -95,7 +95,7 @@ public void applyOptions(Particle particle) {
 	}
 
 	public int getMultiplier(ParticleType type) {
-		if (enabled.get()) {
+		if (enabled.get() && particleOptions.containsKey(type)) {
 			HashMap<String, Option<?>> options = particleOptions.get(type);
 
 			return ((IntegerOption) options.get("count")).get();
@@ -104,7 +104,7 @@ public int getMultiplier(ParticleType type) {
 	}
 
 	public boolean getAlwaysOn(ParticleType type) {
-		return enabled.get()
+		return enabled.get() && particleOptions.containsKey(type)
 			&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit"))
 			.get();
 	}
@@ -114,9 +114,8 @@ public static Particles getInstance() {
 	}
 
 	public boolean getShowParticle(ParticleType type) {
-		return enabled.get()
-			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle"))
-			.get()
+		return enabled.get() && particleOptions.containsKey(type)
+			? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()
 			: true;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void applyOptions(Particle particle) {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public int getMultiplier(ParticleType<?> type) {`
`100`		`- if (enabled.get()) {`
	`100`	`+ if (enabled.get() && particleOptions.containsKey(type)) {`
`101`	`101`	`HashMap<String, Option<?>> options = particleOptions.get(type);`
`102`	`102`
`103`	`103`	`return ((IntegerOption) options.get("count")).get();`
`@@ -106,7 +106,7 @@ public int getMultiplier(ParticleType<?> type) {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`public boolean getAlwaysOn(ParticleType<?> type) {`
`109`		`- return enabled.get()`
	`109`	`+ return enabled.get() && particleOptions.containsKey(type)`
`110`	`110`	`&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit")).get();`
`111`	`111`	`}`
`112`	`112`
`@@ -115,7 +115,7 @@ public static Particles getInstance() {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`public boolean getShowParticle(ParticleType<?> type) {`
`118`		`- return enabled.get()`
	`118`	`+ return enabled.get() && particleOptions.containsKey(type)`
`119`	`119`	`? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()`
`120`	`120`	`: true;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public abstract class PlayerListHudMixin {`
`233`	`233`	`),`
`234`	`234`	`ordinal = 7`
`235`	`235`	`)`
`236`		`- public int axolotlclient$changeWidth(int value, GuiGraphics graphics, int scaledWindowWidth, Scoreboard scoreboard, @Nullable ScoreboardObjective objective) {`
	`236`	`+ public int axolotlclient$changeWidth(int value) {`
`237`	`237`	`if (BedwarsMod.getInstance().isEnabled() && BedwarsMod.getInstance().blockLatencyIcon() && (BedwarsMod.getInstance().isWaiting() \|\| BedwarsMod.getInstance().inGame())) {`
`238`	`238`	`value -= 9;`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public void applyOptions(Particle particle) {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`public int getMultiplier(ParticleType type) {`
`98`		`- if (enabled.get()) {`
	`98`	`+ if (enabled.get() && particleOptions.containsKey(type)) {`
`99`	`99`	`HashMap<String, Option<?>> options = particleOptions.get(type);`
`100`	`100`
`101`	`101`	`return ((IntegerOption) options.get("count")).get();`
`@@ -104,7 +104,7 @@ public int getMultiplier(ParticleType type) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public boolean getAlwaysOn(ParticleType type) {`
`107`		`- return enabled.get()`
	`107`	`+ return enabled.get() && particleOptions.containsKey(type)`
`108`	`108`	`&& ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("alwaysCrit"))`
`109`	`109`	`.get();`
`110`	`110`	`}`
`@@ -114,9 +114,8 @@ public static Particles getInstance() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`public boolean getShowParticle(ParticleType type) {`
`117`		`- return enabled.get()`
`118`		`- ? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle"))`
`119`		`- .get()`
	`117`	`+ return enabled.get() && particleOptions.containsKey(type)`
	`118`	`+ ? ((BooleanOption) Particles.getInstance().particleOptions.get(type).get("showParticle")).get()`
`120`	`119`	`: true;`
`121`	`120`	`}`
`122`	`121`