Merge v7.46 into 1.21

Wurst-Imperium · Sep 27, 2024 · c7d8d4e · c7d8d4e
2 parents ad61d02 + de4d5f4
commit c7d8d4e
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 53 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
 	dependencies {
-		classpath "org.kohsuke:github-api:1.324"
+		classpath "org.kohsuke:github-api:1.326"
 	}
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ loader_version=0.16.5
 fabric_version=0.102.0+1.21
 
 # Mod Properties
-mod_version = v7.46pre3-MC1.21
+mod_version = v7.46-MC1.21
 maven_group = net.wurstclient
 archives_base_name = Wurst-Client
 

diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
@@ -50,7 +50,7 @@ public enum WurstClient
 	public static MinecraftClient MC;
 	public static IMinecraftClient IMC;
 
-	public static final String VERSION = "7.46pre3";
+	public static final String VERSION = "7.46";
 	public static final String MC_VERSION = "1.21";
 
 	private WurstAnalytics analytics;

diff --git a/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java
@@ -26,7 +26,7 @@ public AddAltScreen(Screen prevScreen, AltManager altManager)
 	@Override
 	protected String getDoneButtonText()
 	{
-		return "Add";
+		return getPassword().isEmpty() ? "Add Cracked Alt" : "Add Premium Alt";
 	}
 
 	@Override

diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java
@@ -73,6 +73,25 @@ public AltEditorScreen(Screen prevScreen, Text title)
 	@Override
 	public final void init()
 	{
+		nameOrEmailBox = new TextFieldWidget(textRenderer, width / 2 - 100, 60,
+			200, 20, Text.literal(""));
+		nameOrEmailBox.setMaxLength(48);
+		nameOrEmailBox.setFocused(true);
+		nameOrEmailBox.setText(getDefaultNameOrEmail());
+		addSelectableChild(nameOrEmailBox);
+
+		passwordBox = new TextFieldWidget(textRenderer, width / 2 - 100, 100,
+			200, 20, Text.literal(""));
+		passwordBox.setText(getDefaultPassword());
+		passwordBox.setRenderTextProvider((text, int_1) -> {
+			String stars = "";
+			for(int i = 0; i < text.length(); i++)
+				stars += "*";
+			return OrderedText.styledForwardsVisitedString(stars, Style.EMPTY);
+		});
+		passwordBox.setMaxLength(256);
+		addSelectableChild(passwordBox);
+
 		addDrawableChild(doneButton = ButtonWidget
 			.builder(Text.literal(getDoneButtonText()), b -> pressDoneButton())
 			.dimensions(width / 2 - 100, height / 4 + 72 + 12, 200, 20)
@@ -101,25 +120,6 @@ public final void init()
 			.dimensions((width / 2 - 100) / 2 - 64, height - 32, 128, 20)
 			.build());
 
-		nameOrEmailBox = new TextFieldWidget(textRenderer, width / 2 - 100, 60,
-			200, 20, Text.literal(""));
-		nameOrEmailBox.setMaxLength(48);
-		nameOrEmailBox.setFocused(true);
-		nameOrEmailBox.setText(getDefaultNameOrEmail());
-		addSelectableChild(nameOrEmailBox);
-
-		passwordBox = new TextFieldWidget(textRenderer, width / 2 - 100, 100,
-			200, 20, Text.literal(""));
-		passwordBox.setText(getDefaultPassword());
-		passwordBox.setRenderTextProvider((text, int_1) -> {
-			String stars = "";
-			for(int i = 0; i < text.length(); i++)
-				stars += "*";
-			return OrderedText.styledForwardsVisitedString(stars, Style.EMPTY);
-		});
-		passwordBox.setMaxLength(256);
-		addSelectableChild(passwordBox);
-
 		setFocused(nameOrEmailBox);
 	}
 
@@ -150,6 +150,7 @@ public final void tick()
 
 		doneButton.active = !nameOrEmail.isEmpty()
 			&& !(alex && passwordBox.getText().isEmpty());
+		doneButton.setMessage(Text.literal(getDoneButtonText()));
 
 		stealSkinButton.active = !alex;
 	}
@@ -358,14 +359,17 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		AltRenderer.drawAltBody(context, nameOrEmailBox.getText(),
 			width - (width / 2 - 100) / 2 - 64, height / 2 - 128, 128, 256);
 
+		String accountType = getPassword().isEmpty() ? "cracked" : "premium";
+
 		// text
 		context.drawTextWithShadow(textRenderer, "Name (for cracked alts), or",
 			width / 2 - 100, 37, 10526880);
 		context.drawTextWithShadow(textRenderer, "E-Mail (for premium alts)",
 			width / 2 - 100, 47, 10526880);
-		context.drawTextWithShadow(textRenderer,
-			"Password (leave blank for cracked alts)", width / 2 - 100, 87,
-			10526880);
+		context.drawTextWithShadow(textRenderer, "Password (for premium alts)",
+			width / 2 - 100, 87, 10526880);
+		context.drawTextWithShadow(textRenderer, "Account type: " + accountType,
+			width / 2 - 100, 127, 10526880);
 
 		String[] lines = message.split("\n");
 		for(int i = 0; i < lines.length; i++)

diff --git a/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java b/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java
@@ -24,7 +24,8 @@ public DirectLoginScreen(Screen prevScreen)
 	@Override
 	protected String getDoneButtonText()
 	{
-		return "Login";
+		return getPassword().isEmpty() ? "Change Cracked Name"
+			: "Login with Password";
 	}
 
 	@Override

diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java
@@ -49,32 +49,32 @@ public final class XRayHack extends Hack implements UpdateListener,
 		"minecraft:anvil", "minecraft:beacon", "minecraft:bone_block",
 		"minecraft:bookshelf", "minecraft:brewing_stand",
 		"minecraft:budding_amethyst", "minecraft:chain_command_block",
-		"minecraft:chest", "minecraft:clay", "minecraft:coal_block",
-		"minecraft:coal_ore", "minecraft:command_block", "minecraft:copper_ore",
-		"minecraft:crafter", "minecraft:crafting_table",
-		"minecraft:decorated_pot", "minecraft:deepslate_coal_ore",
-		"minecraft:deepslate_copper_ore", "minecraft:deepslate_diamond_ore",
-		"minecraft:deepslate_emerald_ore", "minecraft:deepslate_gold_ore",
-		"minecraft:deepslate_iron_ore", "minecraft:deepslate_lapis_ore",
-		"minecraft:deepslate_redstone_ore", "minecraft:diamond_block",
-		"minecraft:diamond_ore", "minecraft:dispenser", "minecraft:dropper",
-		"minecraft:emerald_block", "minecraft:emerald_ore",
-		"minecraft:enchanting_table", "minecraft:end_portal",
-		"minecraft:end_portal_frame", "minecraft:ender_chest",
-		"minecraft:furnace", "minecraft:glowstone", "minecraft:gold_block",
-		"minecraft:gold_ore", "minecraft:hopper", "minecraft:iron_block",
-		"minecraft:iron_ore", "minecraft:ladder", "minecraft:lapis_block",
-		"minecraft:lapis_ore", "minecraft:lava", "minecraft:lodestone",
-		"minecraft:mossy_cobblestone", "minecraft:nether_gold_ore",
-		"minecraft:nether_portal", "minecraft:nether_quartz_ore",
-		"minecraft:raw_copper_block", "minecraft:raw_gold_block",
-		"minecraft:raw_iron_block", "minecraft:redstone_block",
-		"minecraft:redstone_ore", "minecraft:repeating_command_block",
-		"minecraft:sculk_catalyst", "minecraft:sculk_sensor",
-		"minecraft:sculk_shrieker", "minecraft:spawner",
-		"minecraft:suspicious_gravel", "minecraft:suspicious_sand",
-		"minecraft:tnt", "minecraft:torch", "minecraft:trapped_chest",
-		"minecraft:trial_spawner", "minecraft:vault", "minecraft:water");
+		"minecraft:chest", "minecraft:coal_block", "minecraft:coal_ore",
+		"minecraft:command_block", "minecraft:copper_ore", "minecraft:crafter",
+		"minecraft:crafting_table", "minecraft:decorated_pot",
+		"minecraft:deepslate_coal_ore", "minecraft:deepslate_copper_ore",
+		"minecraft:deepslate_diamond_ore", "minecraft:deepslate_emerald_ore",
+		"minecraft:deepslate_gold_ore", "minecraft:deepslate_iron_ore",
+		"minecraft:deepslate_lapis_ore", "minecraft:deepslate_redstone_ore",
+		"minecraft:diamond_block", "minecraft:diamond_ore",
+		"minecraft:dispenser", "minecraft:dropper", "minecraft:emerald_block",
+		"minecraft:emerald_ore", "minecraft:enchanting_table",
+		"minecraft:end_portal", "minecraft:end_portal_frame",
+		"minecraft:ender_chest", "minecraft:furnace", "minecraft:glowstone",
+		"minecraft:gold_block", "minecraft:gold_ore", "minecraft:hopper",
+		"minecraft:iron_block", "minecraft:iron_ore", "minecraft:ladder",
+		"minecraft:lapis_block", "minecraft:lapis_ore", "minecraft:lava",
+		"minecraft:lodestone", "minecraft:mossy_cobblestone",
+		"minecraft:nether_gold_ore", "minecraft:nether_portal",
+		"minecraft:nether_quartz_ore", "minecraft:raw_copper_block",
+		"minecraft:raw_gold_block", "minecraft:raw_iron_block",
+		"minecraft:redstone_block", "minecraft:redstone_ore",
+		"minecraft:repeating_command_block", "minecraft:sculk_catalyst",
+		"minecraft:sculk_sensor", "minecraft:sculk_shrieker",
+		"minecraft:spawner", "minecraft:suspicious_gravel",
+		"minecraft:suspicious_sand", "minecraft:tnt", "minecraft:torch",
+		"minecraft:trapped_chest", "minecraft:trial_spawner", "minecraft:vault",
+		"minecraft:water");
 
 	private final CheckboxSetting onlyExposed = new CheckboxSetting(
 		"Only show exposed",