fix hopefully all remaining issues

moehreag · moehreag · commit da7d733255ad · 2023-08-14T22:22:13.000+02:00
diff --git a/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -111,6 +111,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo
 				type.draw(stack, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(stack, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.16.5/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -142,6 +142,7 @@ public class BedwarsTeamUpgrades {
 			}
 			MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/block/furnace_front_on.png"));
 			DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	});
 
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -110,6 +110,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo
 				type.draw(stack, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(stack, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.16_combat-6/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -142,6 +142,7 @@ public class BedwarsTeamUpgrades {
 			}
 			MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/block/furnace_front_on.png"));
 			DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	});
 
diff --git a/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -106,6 +106,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo
 				type.draw(stack, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(stack, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.19.2/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -78,31 +78,29 @@ public class BedwarsTeamUpgrades {
 	public final TeamUpgrade protection = new TieredUpgrade(
 		"prot", Pattern.compile("^\\b[A-Za-z0-9_§]{3,16}\\b purchased Reinforced Armor .{1,3}\\s*$"),
 		new int[]{5, 10, 20, 30}, new int[]{2, 4, 8, 16}, (graphics, x, y, width, height, upgradeLevel) -> {
-		switch (upgradeLevel){
-			case 1:
+		switch (upgradeLevel) {
+			case 1 -> {
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.IRON_CHESTPLATE), x, y);
-				DrawableHelper.enableScissor(x, y+height/2, x+width/2, y+height);
+				DrawableHelper.enableScissor(x, y + height / 2, x + width / 2, y + height);
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.DIAMOND_CHESTPLATE), x, y);
 				DrawableHelper.disableScissor();
-				break;
-			case 2:
+			}
+			case 2 -> {
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.IRON_CHESTPLATE), x, y);
-				DrawableHelper.enableScissor(x, y, x+width/2, y+height);
+				DrawableHelper.enableScissor(x, y, x + width / 2, y + height);
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.DIAMOND_CHESTPLATE), x, y);
 				DrawableHelper.disableScissor();
-				break;
-			case 3:
+			}
+			case 3 -> {
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.DIAMOND_CHESTPLATE), x, y);
-				DrawableHelper.enableScissor(x+width/2, y+height/2, x+width, y+height);
+				DrawableHelper.enableScissor(x + width / 2, y + height / 2, x + width, y + height);
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.IRON_CHESTPLATE), x, y);
 				DrawableHelper.disableScissor();
-				break;
-			case 4:
+			}
+			case 4 ->
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.DIAMOND_CHESTPLATE), x, y);
-				break;
-			default:
+			default ->
 				ItemUtil.renderGuiItemModel(BedwarsMod.getInstance().getUpgradesOverlay().getScale(), new ItemStack(Items.IRON_CHESTPLATE), x, y);
-				break;
 		}
 	});
 
@@ -140,6 +138,7 @@ public class BedwarsTeamUpgrades {
 			}
 			RenderSystem.setShaderTexture(0, new Identifier("textures/block/furnace_front_on.png"));
 			DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	});
 
diff --git a/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -106,6 +106,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo
 				type.draw(stack, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(stack, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.19.3/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -138,6 +138,7 @@ public class BedwarsTeamUpgrades {
 			}
 			RenderSystem.setShaderTexture(0, new Identifier("textures/block/furnace_front_on.png"));
 			DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	});
 
diff --git a/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -106,6 +106,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo
 				type.draw(stack, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(stack, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.19.4/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -137,6 +137,7 @@ public class BedwarsTeamUpgrades {
 			}
 			RenderSystem.setShaderTexture(0, new Identifier("textures/block/furnace_front_on.png"));
 			DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	});
 
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -109,6 +109,7 @@ public void drawOverlay(GuiGraphics graphics, DrawPosition position, boolean edi
 				type.draw(graphics, x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(graphics, x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.20/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -130,6 +130,7 @@ public class BedwarsTeamUpgrades {
 					RenderSystem.setShaderColor(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
 				}
 				graphics.drawTexture(new Identifier("textures/block/furnace_front_on.png"), x, y, 0, 0, width, height, width, height);
+				graphics.drawShadowedText(MinecraftClient.getInstance().textRenderer, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 			}
 		}
 	);
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/TeamUpgradesOverlay.java
@@ -108,6 +108,7 @@ public void drawOverlay(DrawPosition position, boolean editMode) {
 				type.draw(x, y, 16, 16);
 				x+=17;
 			}
+			setWidth(Math.max((x - position.x()) + 1, 18));
 		} else {
 			upgrades.trap.draw(x, y, 16, 16);
 			setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/BedwarsTeamUpgrades.java
@@ -70,7 +70,7 @@ public class BedwarsTeamUpgrades {
 		3, 1, (x, y, width, height, upgradeLevel) -> {
 		if(upgradeLevel == 0){
 			Color color = Color.DARK_GRAY;
-			GlStateManager.color(color.getAlpha()/255F, color.getRed()/255F, color.getGreen()/255F, color.getBlue()/255F);
+			GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 		}
 		MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/gui/container/inventory.png"));
 		DrawableHelper.drawTexture(x, y, 7*18, 198, 18, 18, 16, 16, 256, 256);
@@ -114,10 +114,10 @@ public class BedwarsTeamUpgrades {
 		new int[]{2, 4}, new int[]{4, 6}, (x, y, width, height, upgradeLevel) -> {
 		if (upgradeLevel == 1) {
 			Color color = Color.GRAY;
-			GlStateManager.color(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+			GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 		} else if (upgradeLevel == 0) {
 			Color color = Color.DARK_GRAY;
-			GlStateManager.color(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+			GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 		}
 		MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/gui/container/inventory.png"));
 		DrawableHelper.drawTexture(x, y, 2*18, 198, 18, 18, 16, 16, 256, 256);
@@ -132,17 +132,18 @@ public class BedwarsTeamUpgrades {
 			DrawableHelper.drawTexture(x, y, 0, 0, width, height, width, height);
 		} else {
 			if(upgradeLevel == 2){
-				Color color = Color.parse("#FFFFFF00");
-				GlStateManager.color(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+				Color color = Color.parse("#FFFF00");
+				GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 			} else if (upgradeLevel == 3) {
-				Color color = Color.parse("#FF00FF00");
-				GlStateManager.color(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+				Color color = Color.parse("#00FF00");
+				GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 			} else if (upgradeLevel == 4){
-				Color color = Color.parse("#FFFF0000");
-				GlStateManager.color(color.getAlpha() / 255F, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
+				Color color = Color.parse("#FF0000");
+				GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 			}
 			MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/blocks/furnace_front_on.png"));
 			DrawableHelper.drawTexture(x, y, 0, 0, width, height, width, height);
+			MinecraftClient.getInstance().textRenderer.drawWithShadow(String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);
 		}
 	}
 	);
diff --git a/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/TrapUpgrade.java b/1.8.9/src/main/java/io/github/axolotlclient/modules/hypixel/bedwars/upgrades/TrapUpgrade.java
@@ -92,7 +92,7 @@ public boolean isPurchased() {
 	public void draw(int x, int y, int width, int height) {
 		if (traps.size() == 0) {
 			Color color = Color.DARK_GRAY;
-			GlStateManager.color(color.getAlpha()/255F, color.getRed()/255F, color.getGreen()/255F, color.getBlue()/255F);
+			GlStateManager.color(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, color.getAlpha() / 255F);
 			MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/items/barrier.png"));
 			DrawableHelper.drawTexture(x, y, 0, 0, 16, 16, 16, 16);
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo`
`111`	`111`	`type.draw(stack, x, y, 16, 16);`
`112`	`112`	`x+=17;`
`113`	`113`	`}`
	`114`	`+ setWidth(Math.max((x - position.x()) + 1, 18));`
`114`	`115`	`} else {`
`115`	`116`	`upgrades.trap.draw(stack, x, y, 16, 16);`
`116`	`117`	`setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));`
Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public class BedwarsTeamUpgrades {`
`142`	`142`	`}`
`143`	`143`	`MinecraftClient.getInstance().getTextureManager().bindTexture(new Identifier("textures/block/furnace_front_on.png"));`
`144`	`144`	`DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);`
	`145`	`+ MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);`
`145`	`146`	`}`
`146`	`147`	`});`
`147`	`148`
Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo`
`110`	`110`	`type.draw(stack, x, y, 16, 16);`
`111`	`111`	`x+=17;`
`112`	`112`	`}`
	`113`	`+ setWidth(Math.max((x - position.x()) + 1, 18));`
`113`	`114`	`} else {`
`114`	`115`	`upgrades.trap.draw(stack, x, y, 16, 16);`
`115`	`116`	`setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));`
Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,7 @@ public void drawOverlay(MatrixStack stack, DrawPosition position, boolean editMo`
`106`	`106`	`type.draw(stack, x, y, 16, 16);`
`107`	`107`	`x+=17;`
`108`	`108`	`}`
	`109`	`+ setWidth(Math.max((x - position.x()) + 1, 18));`
`109`	`110`	`} else {`
`110`	`111`	`upgrades.trap.draw(stack, x, y, 16, 16);`
`111`	`112`	`setWidth(Math.max(((x + (upgrades.trap.getTrapCount()*16)) - position.x()) + 1, getWidth()));`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,7 @@ public class BedwarsTeamUpgrades {`
`138`	`138`	`}`
`139`	`139`	`RenderSystem.setShaderTexture(0, new Identifier("textures/block/furnace_front_on.png"));`
`140`	`140`	`DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);`
	`141`	`+ MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);`
`141`	`142`	`}`
`142`	`143`	`});`
`143`	`144`
Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,7 @@ public class BedwarsTeamUpgrades {`
`137`	`137`	`}`
`138`	`138`	`RenderSystem.setShaderTexture(0, new Identifier("textures/block/furnace_front_on.png"));`
`139`	`139`	`DrawableHelper.drawTexture(graphics, x, y, 0, 0, width, height, width, height);`
	`140`	`+ MinecraftClient.getInstance().textRenderer.drawWithShadow(graphics, String.valueOf(upgradeLevel), x+width-4, y+height-6, -1);`
`140`	`141`	`}`
`141`	`142`	`});`
`142`	`143`