diff --git a/build.gradle b/build.gradle index 4a4f915b..26e42b28 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.8.3' + id 'fabric-loom' version '0.9.+' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index d4e5726a..0d528134 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ org.gradle.jvmargs=-Xmx1G # check these on https://modmuss50.me/fabric.html and # https://www.curseforge.com/minecraft/mc-mods/fabric-api minecraft_version=1.17.1 -yarn_mappings=1.17.1+build.1 +yarn_mappings=1.17.1+build.32 loader_version=0.11.6 #Fabric api -fabric_version=0.36.1+1.17 +fabric_version=0.37.1+1.17 # Mod Properties mod_version = v7.16-MC1.17.1 diff --git a/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java index abc0cfb3..a4a9e9a1 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AddAltScreen.java @@ -31,6 +31,6 @@ public final class AddAltScreen extends AltEditorScreen protected void pressDoneButton() { altManager.add(getEmail(), getPassword(), false); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } } diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java index 0bc8c3ac..53540bc5 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java @@ -78,7 +78,7 @@ public abstract class AltEditorScreen extends Screen addDrawableChild( new ButtonWidget(width / 2 - 100, height / 4 + 120 + 12, 200, 20, - new LiteralText("Cancel"), b -> client.openScreen(prevScreen))); + new LiteralText("Cancel"), b -> client.setScreen(prevScreen))); addDrawableChild(new ButtonWidget(width / 2 - 100, height / 4 + 96 + 12, 200, 20, new LiteralText("Random Name"), diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java index 152e7a65..f62f414c 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java @@ -80,7 +80,7 @@ public final class AltManagerScreen extends Screen listGui = new ListGui(client, this, altManager.getList()); if(altManager.getList().isEmpty() && shouldAsk) - client.openScreen(new ConfirmScreen(this::confirmGenerate, + client.setScreen(new ConfirmScreen(this::confirmGenerate, new LiteralText("Your alt list is empty."), new LiteralText( "Would you like some random alts to get started?"))); @@ -89,11 +89,11 @@ public final class AltManagerScreen extends Screen addDrawableChild(new ButtonWidget(width / 2 - 50, height - 52, 100, 20, new LiteralText("Direct Login"), - b -> client.openScreen(new DirectLoginScreen(this)))); + b -> client.setScreen(new DirectLoginScreen(this)))); addDrawableChild(new ButtonWidget(width / 2 + 54, height - 52, 100, 20, new LiteralText("Add"), - b -> client.openScreen(new AddAltScreen(this, altManager)))); + b -> client.setScreen(new AddAltScreen(this, altManager)))); addDrawableChild( starButton = new ButtonWidget(width / 2 - 154, height - 28, 75, 20, @@ -107,7 +107,7 @@ public final class AltManagerScreen extends Screen new LiteralText("Delete"), b -> pressDelete())); addDrawableChild(new ButtonWidget(width / 2 + 80, height - 28, 75, 20, - new LiteralText("Cancel"), b -> client.openScreen(prevScreen))); + new LiteralText("Cancel"), b -> client.setScreen(prevScreen))); addDrawableChild(importButton = new ButtonWidget(8, 8, 50, 20, new LiteralText("Import"), b -> pressImportAlts())); @@ -184,7 +184,7 @@ public final class AltManagerScreen extends Screen if(alt.isCracked()) { LoginManager.changeCrackedName(alt.getEmail()); - client.openScreen(prevScreen); + client.setScreen(prevScreen); return; } @@ -198,7 +198,7 @@ public final class AltManagerScreen extends Screen altManager.setChecked(listGui.selected, client.getSession().getUsername()); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } private void pressFavorite() @@ -217,7 +217,7 @@ public final class AltManagerScreen extends Screen if(alt == null) return; - client.openScreen(new EditAltScreen(this, altManager, alt)); + client.setScreen(new EditAltScreen(this, altManager, alt)); } private void pressDelete() @@ -235,7 +235,7 @@ public final class AltManagerScreen extends Screen ConfirmScreen screen = new ConfirmScreen(this::confirmRemove, text, message, new LiteralText("Delete"), new LiteralText("Cancel")); - client.openScreen(screen); + client.setScreen(screen); } private void pressImportAlts() @@ -368,7 +368,7 @@ public final class AltManagerScreen extends Screen } shouldAsk = false; - client.openScreen(this); + client.setScreen(this); } private void confirmRemove(boolean confirmed) @@ -376,7 +376,7 @@ public final class AltManagerScreen extends Screen if(confirmed) altManager.remove(listGui.selected); - client.openScreen(this); + client.setScreen(this); } @Override diff --git a/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java b/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java index 8a088ddb..3b9085f3 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/DirectLoginScreen.java @@ -37,7 +37,7 @@ public final class DirectLoginScreen extends AltEditorScreen message = LoginManager.login(getEmail(), getPassword()); if(message.isEmpty()) - client.openScreen(new TitleScreen()); + client.setScreen(new TitleScreen()); else doErrorEffect(); } diff --git a/src/main/java/net/wurstclient/altmanager/screens/EditAltScreen.java b/src/main/java/net/wurstclient/altmanager/screens/EditAltScreen.java index d7c13fe4..f8f2ffa1 100644 --- a/src/main/java/net/wurstclient/altmanager/screens/EditAltScreen.java +++ b/src/main/java/net/wurstclient/altmanager/screens/EditAltScreen.java @@ -47,6 +47,6 @@ public final class EditAltScreen extends AltEditorScreen protected void pressDoneButton() { altManager.edit(editedAlt, getEmail(), getPassword()); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } } diff --git a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java index 32479f2a..bbff0c8e 100644 --- a/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/BlockComponent.java @@ -56,7 +56,7 @@ public final class BlockComponent extends Component Screen currentScreen = WurstClient.MC.currentScreen; EditBlockScreen editScreen = new EditBlockScreen(currentScreen, setting); - WurstClient.MC.openScreen(editScreen); + WurstClient.MC.setScreen(editScreen); }else if(mouseButton == 1) setting.resetToDefault(); diff --git a/src/main/java/net/wurstclient/clickgui/components/BlockListEditButton.java b/src/main/java/net/wurstclient/clickgui/components/BlockListEditButton.java index 24724339..d8cdb0a2 100644 --- a/src/main/java/net/wurstclient/clickgui/components/BlockListEditButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/BlockListEditButton.java @@ -51,7 +51,7 @@ public final class BlockListEditButton extends Component if(mouseX < getX() + getWidth() - buttonWidth - 4) return; - WurstClient.MC.openScreen( + WurstClient.MC.setScreen( new EditBlockListScreen(WurstClient.MC.currentScreen, setting)); } diff --git a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java index d841e92e..599c8690 100644 --- a/src/main/java/net/wurstclient/clickgui/components/FileComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/FileComponent.java @@ -50,7 +50,7 @@ public final class FileComponent extends Component if(mouseX < getX() + getWidth() - buttonWidth - 4) return; - WurstClient.MC.openScreen( + WurstClient.MC.setScreen( new SelectFileScreen(WurstClient.MC.currentScreen, setting)); } diff --git a/src/main/java/net/wurstclient/clickgui/components/ItemListEditButton.java b/src/main/java/net/wurstclient/clickgui/components/ItemListEditButton.java index 1f9e9ba3..fd709b2a 100644 --- a/src/main/java/net/wurstclient/clickgui/components/ItemListEditButton.java +++ b/src/main/java/net/wurstclient/clickgui/components/ItemListEditButton.java @@ -49,7 +49,7 @@ public final class ItemListEditButton extends Component if(mouseX < getX() + getWidth() - buttonWidth - 4) return; - WurstClient.MC.openScreen( + WurstClient.MC.setScreen( new EditItemListScreen(WurstClient.MC.currentScreen, setting)); } diff --git a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java index 2f09c4e9..2c8be61c 100644 --- a/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java +++ b/src/main/java/net/wurstclient/clickgui/components/SliderComponent.java @@ -65,7 +65,7 @@ public final class SliderComponent extends Component private void handleLeftClick() { if(Screen.hasControlDown()) - MC.openScreen(new EditSliderScreen(MC.currentScreen, setting)); + MC.setScreen(new EditSliderScreen(MC.currentScreen, setting)); else dragging = true; } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java index bfdbcbbe..afaa030b 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockListScreen.java @@ -79,16 +79,16 @@ public final class EditBlockListScreen extends Screen addDrawableChild(new ButtonWidget(width - 108, 8, 100, 20, new LiteralText("Reset to Defaults"), - b -> client.openScreen(new ConfirmScreen(b2 -> { + b -> client.setScreen(new ConfirmScreen(b2 -> { if(b2) blockList.resetToDefaults(); - client.openScreen(EditBlockListScreen.this); + client.setScreen(EditBlockListScreen.this); }, new LiteralText("Reset to Defaults"), new LiteralText("Are you sure?"))))); addDrawableChild( doneButton = new ButtonWidget(width / 2 - 100, height - 28, 200, 20, - new LiteralText("Done"), b -> client.openScreen(prevScreen))); + new LiteralText("Done"), b -> client.setScreen(prevScreen))); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java index 1c613300..48b5754f 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditBlockScreen.java @@ -81,7 +81,7 @@ public final class EditBlockScreen extends Screen if(block != null) setting.setBlock(block); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } @Override @@ -94,7 +94,7 @@ public final class EditBlockScreen extends Screen break; case GLFW.GLFW_KEY_ESCAPE: - client.openScreen(prevScreen); + client.setScreen(prevScreen); break; } diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java index b0563820..5ea2f38b 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditItemListScreen.java @@ -78,16 +78,16 @@ public final class EditItemListScreen extends Screen addDrawableChild(new ButtonWidget(width - 108, 8, 100, 20, new LiteralText("Reset to Defaults"), - b -> client.openScreen(new ConfirmScreen(b2 -> { + b -> client.setScreen(new ConfirmScreen(b2 -> { if(b2) itemList.resetToDefaults(); - client.openScreen(EditItemListScreen.this); + client.setScreen(EditItemListScreen.this); }, new LiteralText("Reset to Defaults"), new LiteralText("Are you sure?"))))); addDrawableChild( doneButton = new ButtonWidget(width / 2 - 100, height - 28, 200, 20, - new LiteralText("Done"), b -> client.openScreen(prevScreen))); + new LiteralText("Done"), b -> client.setScreen(prevScreen))); } @Override diff --git a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java index a8a306ac..d5573781 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/EditSliderScreen.java @@ -66,7 +66,7 @@ public final class EditSliderScreen extends Screen if(MathUtils.isDouble(value)) slider.setValue(Double.parseDouble(value)); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } @Override @@ -79,7 +79,7 @@ public final class EditSliderScreen extends Screen break; case GLFW.GLFW_KEY_ESCAPE: - client.openScreen(prevScreen); + client.setScreen(prevScreen); break; } diff --git a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java index 8babc413..327f3535 100644 --- a/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java +++ b/src/main/java/net/wurstclient/clickgui/screens/SelectFileScreen.java @@ -69,7 +69,7 @@ public final class SelectFileScreen extends Screen private void openPrevScreen() { - client.openScreen(prevScreen); + client.setScreen(prevScreen); } private void done() @@ -94,7 +94,7 @@ public final class SelectFileScreen extends Screen + "Are you sure you want to do this?"); client - .openScreen(new ConfirmScreen(this::confirmReset, title, message)); + .setScreen(new ConfirmScreen(this::confirmReset, title, message)); } private void confirmReset(boolean confirmed) @@ -102,7 +102,7 @@ public final class SelectFileScreen extends Screen if(confirmed) setting.resetFolder(); - client.openScreen(SelectFileScreen.this); + client.setScreen(SelectFileScreen.this); } @Override diff --git a/src/main/java/net/wurstclient/commands/AuthorCmd.java b/src/main/java/net/wurstclient/commands/AuthorCmd.java index 5b8d5387..90ea2306 100644 --- a/src/main/java/net/wurstclient/commands/AuthorCmd.java +++ b/src/main/java/net/wurstclient/commands/AuthorCmd.java @@ -42,6 +42,6 @@ public final class AuthorCmd extends Command "You must hold a written book in your main hand."); String author = String.join(" ", args); - heldItem.putSubTag("author", NbtString.of(author)); + heldItem.setSubNbt("author", NbtString.of(author)); } } diff --git a/src/main/java/net/wurstclient/commands/GiveCmd.java b/src/main/java/net/wurstclient/commands/GiveCmd.java index a47edb1b..c1ea853b 100644 --- a/src/main/java/net/wurstclient/commands/GiveCmd.java +++ b/src/main/java/net/wurstclient/commands/GiveCmd.java @@ -83,7 +83,7 @@ public final class GiveCmd extends Command try { NbtCompound tag = StringNbtReader.parse(nbt); - stack.setTag(tag); + stack.setNbt(tag); }catch(CommandSyntaxException e) { diff --git a/src/main/java/net/wurstclient/commands/InvseeCmd.java b/src/main/java/net/wurstclient/commands/InvseeCmd.java index 6d2c1464..69fb443d 100644 --- a/src/main/java/net/wurstclient/commands/InvseeCmd.java +++ b/src/main/java/net/wurstclient/commands/InvseeCmd.java @@ -59,7 +59,7 @@ public final class InvseeCmd extends Command implements RenderListener continue; ChatUtils.message("Showing inventory of " + otherPlayerName + "."); - MC.openScreen(new InventoryScreen(player)); + MC.setScreen(new InventoryScreen(player)); found = true; break; } diff --git a/src/main/java/net/wurstclient/commands/ModifyCmd.java b/src/main/java/net/wurstclient/commands/ModifyCmd.java index db0889c4..b8e5d94a 100644 --- a/src/main/java/net/wurstclient/commands/ModifyCmd.java +++ b/src/main/java/net/wurstclient/commands/ModifyCmd.java @@ -80,13 +80,13 @@ public final class ModifyCmd extends Command String nbt = String.join(" ", Arrays.copyOfRange(args, 1, args.length)); nbt = nbt.replace("$", "\u00a7").replace("\u00a7\u00a7", "$"); - if(!stack.hasTag()) - stack.setTag(new NbtCompound()); + if(!stack.hasNbt()) + stack.setNbt(new NbtCompound()); try { NbtCompound tag = StringNbtReader.parse(nbt); - stack.getTag().copyFrom(tag); + stack.getNbt().copyFrom(tag); }catch(CommandSyntaxException e) { @@ -103,7 +103,7 @@ public final class ModifyCmd extends Command try { NbtCompound tag = StringNbtReader.parse(nbt); - stack.setTag(tag); + stack.setNbt(tag); }catch(CommandSyntaxException e) { @@ -117,7 +117,7 @@ public final class ModifyCmd extends Command if(args.length > 2) throw new CmdSyntaxError(); - NbtPath path = parseNbtPath(stack.getTag(), args[1]); + NbtPath path = parseNbtPath(stack.getNbt(), args[1]); if(path == null) throw new CmdError("The path does not exist."); diff --git a/src/main/java/net/wurstclient/commands/PotionCmd.java b/src/main/java/net/wurstclient/commands/PotionCmd.java index a8a72335..33e4bb4f 100644 --- a/src/main/java/net/wurstclient/commands/PotionCmd.java +++ b/src/main/java/net/wurstclient/commands/PotionCmd.java @@ -89,7 +89,7 @@ public final class PotionCmd extends Command NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", effects); - stack.setTag(nbt); + stack.setNbt(nbt); ChatUtils.message("Potion modified."); } @@ -141,7 +141,7 @@ public final class PotionCmd extends Command NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", newEffects); - stack.setTag(nbt); + stack.setNbt(nbt); ChatUtils.message("Effect removed."); } diff --git a/src/main/java/net/wurstclient/commands/ViewNbtCmd.java b/src/main/java/net/wurstclient/commands/ViewNbtCmd.java index fd7309d3..4276ed2f 100644 --- a/src/main/java/net/wurstclient/commands/ViewNbtCmd.java +++ b/src/main/java/net/wurstclient/commands/ViewNbtCmd.java @@ -34,7 +34,7 @@ public final class ViewNbtCmd extends Command if(stack.isEmpty()) throw new CmdError("You must hold an item in your main hand."); - NbtCompound tag = stack.getTag(); + NbtCompound tag = stack.getNbt(); String nbt = tag == null ? "" : tag.asString(); switch(String.join(" ", args).toLowerCase()) diff --git a/src/main/java/net/wurstclient/hacks/AutoRespawnHack.java b/src/main/java/net/wurstclient/hacks/AutoRespawnHack.java index 668a3957..52bf4fa5 100644 --- a/src/main/java/net/wurstclient/hacks/AutoRespawnHack.java +++ b/src/main/java/net/wurstclient/hacks/AutoRespawnHack.java @@ -37,6 +37,6 @@ public final class AutoRespawnHack extends Hack implements DeathListener public void onDeath() { MC.player.requestRespawn(); - MC.openScreen(null); + MC.setScreen(null); } } diff --git a/src/main/java/net/wurstclient/hacks/ClickGuiHack.java b/src/main/java/net/wurstclient/hacks/ClickGuiHack.java index 250ddd20..bee98441 100644 --- a/src/main/java/net/wurstclient/hacks/ClickGuiHack.java +++ b/src/main/java/net/wurstclient/hacks/ClickGuiHack.java @@ -52,7 +52,7 @@ public final class ClickGuiHack extends Hack @Override public void onEnable() { - MC.openScreen(new ClickGuiScreen(WURST.getGui())); + MC.setScreen(new ClickGuiScreen(WURST.getGui())); setEnabled(false); } diff --git a/src/main/java/net/wurstclient/hacks/CrashChestHack.java b/src/main/java/net/wurstclient/hacks/CrashChestHack.java index eb1cb71e..1864fb45 100644 --- a/src/main/java/net/wurstclient/hacks/CrashChestHack.java +++ b/src/main/java/net/wurstclient/hacks/CrashChestHack.java @@ -57,7 +57,7 @@ public final class CrashChestHack extends Hack for(int i = 0; i < 40000; i++) nbtList.add(new NbtList()); nbtCompound.put("www.wurstclient.net", nbtList); - stack.setTag(nbtCompound); + stack.setNbt(nbtCompound); stack.setCustomName(new LiteralText("Copy Me")); // give item diff --git a/src/main/java/net/wurstclient/hacks/KillPotionHack.java b/src/main/java/net/wurstclient/hacks/KillPotionHack.java index 5b03cddd..944f2e3d 100644 --- a/src/main/java/net/wurstclient/hacks/KillPotionHack.java +++ b/src/main/java/net/wurstclient/hacks/KillPotionHack.java @@ -53,7 +53,7 @@ public final class KillPotionHack extends Hack effects.add(effect); NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", effects); - stack.setTag(nbt); + stack.setNbt(nbt); String name = "\u00a7rSplash Potion of \u00a74\u00a7lINSTANT DEATH"; stack.setCustomName(new LiteralText(name)); diff --git a/src/main/java/net/wurstclient/hacks/NavigatorHack.java b/src/main/java/net/wurstclient/hacks/NavigatorHack.java index e504968b..354fb8bc 100644 --- a/src/main/java/net/wurstclient/hacks/NavigatorHack.java +++ b/src/main/java/net/wurstclient/hacks/NavigatorHack.java @@ -29,7 +29,7 @@ public final class NavigatorHack extends Hack public void onEnable() { if(!(MC.currentScreen instanceof NavigatorMainScreen)) - MC.openScreen(new NavigatorMainScreen()); + MC.setScreen(new NavigatorMainScreen()); setEnabled(false); } diff --git a/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java b/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java index a68eade2..926a9807 100644 --- a/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java +++ b/src/main/java/net/wurstclient/hacks/ServerCrasherHack.java @@ -45,7 +45,7 @@ public final class ServerCrasherHack extends Hack Item item = Registry.ITEM.get(new Identifier("creeper_spawn_egg")); ItemStack stack = new ItemStack(item, 1); - stack.setTag(createNBT()); + stack.setNbt(createNBT()); placeStackInHotbar(stack); setEnabled(false); diff --git a/src/main/java/net/wurstclient/hacks/TrollPotionHack.java b/src/main/java/net/wurstclient/hacks/TrollPotionHack.java index 9318d94f..37aa1c7f 100644 --- a/src/main/java/net/wurstclient/hacks/TrollPotionHack.java +++ b/src/main/java/net/wurstclient/hacks/TrollPotionHack.java @@ -52,7 +52,7 @@ public final class TrollPotionHack extends Hack } NbtCompound nbt = new NbtCompound(); nbt.put("CustomPotionEffects", effects); - stack.setTag(nbt); + stack.setNbt(nbt); String name = "\u00a7rSplash Potion of Trolling"; stack.setCustomName(new LiteralText(name)); diff --git a/src/main/java/net/wurstclient/hacks/XRayHack.java b/src/main/java/net/wurstclient/hacks/XRayHack.java index 3760fd7d..73301b94 100644 --- a/src/main/java/net/wurstclient/hacks/XRayHack.java +++ b/src/main/java/net/wurstclient/hacks/XRayHack.java @@ -168,7 +168,7 @@ public final class XRayHack extends Hack implements UpdateListener, public void openBlockListEditor(Screen prevScreen) { - MC.openScreen(new EditBlockListScreen(prevScreen, ores)); + MC.setScreen(new EditBlockListScreen(prevScreen, ores)); } private boolean isVisible(Block block) diff --git a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java index 753eb7bc..9f9a1343 100644 --- a/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/GameMenuScreenMixin.java @@ -62,7 +62,7 @@ public abstract class GameMenuScreenMixin extends Screen private void openWurstOptions() { - client.openScreen(new WurstOptionsScreen(this)); + client.setScreen(new WurstOptionsScreen(this)); } private void removeFeedbackAndBugReportButtons() diff --git a/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java b/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java index 8106a3c4..f219ca76 100644 --- a/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java @@ -63,11 +63,11 @@ public class MultiplayerScreenMixin extends Screen implements IMultiplayerScreen .joinLastServer((MultiplayerScreen)(Object)this))); addDrawableChild(new ButtonWidget(width / 2 + 154 + 4, height - 52, 100, - 20, new LiteralText("Server Finder"), b -> client.openScreen( + 20, new LiteralText("Server Finder"), b -> client.setScreen( new ServerFinderScreen((MultiplayerScreen)(Object)this)))); addDrawableChild(new ButtonWidget(width / 2 + 154 + 4, height - 28, 100, - 20, new LiteralText("Clean Up"), b -> client.openScreen( + 20, new LiteralText("Clean Up"), b -> client.setScreen( new CleanUpScreen((MultiplayerScreen)(Object)this)))); } diff --git a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java index 71401984..4c5d282d 100644 --- a/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java +++ b/src/main/java/net/wurstclient/mixin/TitleScreenMixin.java @@ -40,7 +40,7 @@ public abstract class TitleScreenMixin extends Screen addDrawableChild(new ButtonWidget(width / 2 + 2, y + spacingY * 2, 98, 20, new LiteralText("Alt Manager"), - b -> client.openScreen(new AltManagerScreen(this, + b -> client.setScreen(new AltManagerScreen(this, WurstClient.INSTANCE.getAltManager())))); for(Drawable d : ((IScreen)this).getButtons()) diff --git a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java index cbe9b3b0..feb11791 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java @@ -172,7 +172,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen public void press() { // add keybind - WurstClient.MC.openScreen(new NavigatorNewKeybindScreen( + WurstClient.MC.setScreen(new NavigatorNewKeybindScreen( possibleKeybinds, NavigatorFeatureScreen.this)); } }; @@ -234,7 +234,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen public void press() { // remove keybind - client.openScreen(new NavigatorRemoveKeybindScreen( + client.setScreen(new NavigatorRemoveKeybindScreen( existingKeybinds, NavigatorFeatureScreen.this)); } }); @@ -293,7 +293,7 @@ public final class NavigatorFeatureScreen extends NavigatorScreen private void goBack() { parent.setExpanding(false); - client.openScreen(parent); + client.setScreen(parent); } @Override diff --git a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java index 9d0ac271..8f8633ae 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorMainScreen.java @@ -115,7 +115,7 @@ public final class NavigatorMainScreen extends NavigatorScreen // back button if(button == GLFW.GLFW_MOUSE_BUTTON_4) { - WurstClient.MC.openScreen((Screen)null); + WurstClient.MC.setScreen((Screen)null); return; } @@ -212,7 +212,7 @@ public final class NavigatorMainScreen extends NavigatorScreen if(clickTimer < 4) clickTimer++; else - WurstClient.MC.openScreen( + WurstClient.MC.setScreen( new NavigatorFeatureScreen(expandingFeature, this)); else if(!expanding && clickTimer > -1) clickTimer--; diff --git a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java index 1baa2f73..d6229e9e 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorNewKeybindScreen.java @@ -62,7 +62,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen WurstClient.INSTANCE.getNavigator() .addPreference(parent.getFeature().getName()); - WurstClient.MC.openScreen(parent); + WurstClient.MC.setScreen(parent); }else { choosingKey = true; @@ -74,7 +74,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen // cancel button addDrawableChild(new ButtonWidget(width / 2 + 2, height - 65, 149, 18, - new LiteralText("Cancel"), b -> WurstClient.MC.openScreen(parent))); + new LiteralText("Cancel"), b -> WurstClient.MC.setScreen(parent))); } @Override @@ -87,7 +87,7 @@ public class NavigatorNewKeybindScreen extends NavigatorScreen okButton.active = !selectedKey.equals("key.keyboard.unknown"); }else if(keyCode == 1) - WurstClient.MC.openScreen(parent); + WurstClient.MC.setScreen(parent); } @Override diff --git a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java index 4d419d2d..67103e48 100644 --- a/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java +++ b/src/main/java/net/wurstclient/navigator/NavigatorRemoveKeybindScreen.java @@ -54,7 +54,7 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen // cancel button addDrawableChild(new ButtonWidget(width / 2 + 2, height - 65, 149, 18, - new LiteralText("Cancel"), b -> client.openScreen(parent))); + new LiteralText("Cancel"), b -> client.setScreen(parent))); } private void remove() @@ -87,14 +87,14 @@ public class NavigatorRemoveKeybindScreen extends NavigatorScreen WurstClient.INSTANCE.getNavigator() .addPreference(parent.getFeature().getName()); - client.openScreen(parent); + client.setScreen(parent); } @Override protected void onKeyPress(int keyCode, int scanCode, int int_3) { if(keyCode == 1) - client.openScreen(parent); + client.setScreen(parent); } @Override diff --git a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java index 0faa292a..56394117 100644 --- a/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java +++ b/src/main/java/net/wurstclient/options/EnterProfileNameScreen.java @@ -62,7 +62,7 @@ public final class EnterProfileNameScreen extends Screen if(!value.isEmpty()) callback.accept(value); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } @Override @@ -75,7 +75,7 @@ public final class EnterProfileNameScreen extends Screen break; case GLFW.GLFW_KEY_ESCAPE: - client.openScreen(prevScreen); + client.setScreen(prevScreen); break; } diff --git a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java index be9e233f..b75851c0 100644 --- a/src/main/java/net/wurstclient/options/KeybindEditorScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindEditorScreen.java @@ -50,13 +50,13 @@ public final class KeybindEditorScreen extends Screen { addDrawableChild(new ButtonWidget(width / 2 - 100, 60, 200, 20, new LiteralText("Change Key"), - b -> client.openScreen(new PressAKeyScreen(this)))); + b -> client.setScreen(new PressAKeyScreen(this)))); addDrawableChild(new ButtonWidget(width / 2 - 100, height / 4 + 72, 200, 20, new LiteralText("Save"), b -> save())); addDrawableChild(new ButtonWidget(width / 2 - 100, height / 4 + 96, 200, - 20, new LiteralText("Cancel"), b -> client.openScreen(prevScreen))); + 20, new LiteralText("Cancel"), b -> client.setScreen(prevScreen))); commandField = new TextFieldWidget(textRenderer, width / 2 - 100, 100, 200, 20, new LiteralText("")); @@ -75,7 +75,7 @@ public final class KeybindEditorScreen extends Screen WurstClient.INSTANCE.getKeybinds().remove(oldKey); WurstClient.INSTANCE.getKeybinds().add(key, commandField.getText()); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } @Override diff --git a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java index d070b781..b544070a 100644 --- a/src/main/java/net/wurstclient/options/KeybindManagerScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindManagerScreen.java @@ -43,7 +43,7 @@ public final class KeybindManagerScreen extends Screen addDrawableChild(addButton = new ButtonWidget(width / 2 - 102, height - 52, 100, 20, new LiteralText("Add"), - b -> client.openScreen(new KeybindEditorScreen(this)))); + b -> client.setScreen(new KeybindEditorScreen(this)))); addDrawableChild(editButton = new ButtonWidget(width / 2 + 2, height - 52, 100, 20, new LiteralText("Edit"), b -> edit())); @@ -53,29 +53,29 @@ public final class KeybindManagerScreen extends Screen addDrawableChild( backButton = new ButtonWidget(width / 2 + 2, height - 28, 100, 20, - new LiteralText("Back"), b -> client.openScreen(prevScreen))); + new LiteralText("Back"), b -> client.setScreen(prevScreen))); addDrawableChild( new ButtonWidget(8, 8, 100, 20, new LiteralText("Reset Keybinds"), - b -> client.openScreen(new ConfirmScreen(confirmed -> { + b -> client.setScreen(new ConfirmScreen(confirmed -> { if(confirmed) WurstClient.INSTANCE.getKeybinds() .setKeybinds(KeybindList.DEFAULT_KEYBINDS); - client.openScreen(this); + client.setScreen(this); }, new LiteralText( "Are you sure you want to reset your keybinds?"), new LiteralText("This cannot be undone!"))))); addDrawableChild(new ButtonWidget(width - 108, 8, 100, 20, new LiteralText("Profiles..."), - b -> client.openScreen(new KeybindProfilesScreen(this)))); + b -> client.setScreen(new KeybindProfilesScreen(this)))); } private void edit() { Keybind keybind = WurstClient.INSTANCE.getKeybinds().getAllKeybinds() .get(listGui.selected); - client.openScreen(new KeybindEditorScreen(this, keybind.getKey(), + client.setScreen(new KeybindEditorScreen(this, keybind.getKey(), keybind.getCommands())); } diff --git a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java index 2601b256..08d1c67d 100644 --- a/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java +++ b/src/main/java/net/wurstclient/options/KeybindProfilesScreen.java @@ -49,7 +49,7 @@ public final class KeybindProfilesScreen extends Screen new LiteralText("Open Folder"), b -> openFolder())); addDrawableChild(new ButtonWidget(width / 2 - 154, height - 48, 100, 20, - new LiteralText("New Profile"), b -> client.openScreen( + new LiteralText("New Profile"), b -> client.setScreen( new EnterProfileNameScreen(this, this::newProfile)))); loadButton = @@ -106,7 +106,7 @@ public final class KeybindProfilesScreen extends Screen private void openPrevScreen() { - client.openScreen(prevScreen); + client.setScreen(prevScreen); } @Override diff --git a/src/main/java/net/wurstclient/options/PressAKeyScreen.java b/src/main/java/net/wurstclient/options/PressAKeyScreen.java index b2ad3b6e..34346d5d 100644 --- a/src/main/java/net/wurstclient/options/PressAKeyScreen.java +++ b/src/main/java/net/wurstclient/options/PressAKeyScreen.java @@ -34,7 +34,7 @@ public class PressAKeyScreen extends Screen if(keyCode != GLFW.GLFW_KEY_ESCAPE) prevScreen.setKey(getKeyName(keyCode, scanCode)); - client.openScreen((Screen)prevScreen); + client.setScreen((Screen)prevScreen); return super.keyPressed(keyCode, scanCode, int_3); } diff --git a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java index 02620b93..2e372408 100644 --- a/src/main/java/net/wurstclient/options/WurstOptionsScreen.java +++ b/src/main/java/net/wurstclient/options/WurstOptionsScreen.java @@ -44,7 +44,7 @@ public class WurstOptionsScreen extends Screen { addDrawableChild( new ButtonWidget(width / 2 - 100, height / 4 + 144 - 16, 200, 20, - new LiteralText("Back"), b -> client.openScreen(prevScreen))); + new LiteralText("Back"), b -> client.setScreen(prevScreen))); addSettingButtons(); addManagerButtons(); @@ -92,7 +92,7 @@ public class WurstOptionsScreen extends Screen new WurstOptionsButton(-50, 24, () -> "Keybinds", "Keybinds allow you to toggle any hack\n" + "or command by simply pressing a\n" + "button.", - b -> client.openScreen(new KeybindManagerScreen(this))); + b -> client.setScreen(new KeybindManagerScreen(this))); new WurstOptionsButton(-50, 48, () -> "X-Ray Blocks", "Manager for the blocks\n" + "that X-Ray will show.", @@ -102,7 +102,7 @@ public class WurstOptionsScreen extends Screen "The Zoom Manager allows you to\n" + "change the zoom key, how far it\n" + "will zoom in and more.", - b -> client.openScreen(new ZoomManagerScreen(this))); + b -> client.setScreen(new ZoomManagerScreen(this))); } private void addLinkButtons() diff --git a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java index 16deba66..6cd4e7ff 100644 --- a/src/main/java/net/wurstclient/options/ZoomManagerScreen.java +++ b/src/main/java/net/wurstclient/options/ZoomManagerScreen.java @@ -41,12 +41,12 @@ public class ZoomManagerScreen extends Screen implements PressAKeyCallback addDrawableChild( new ButtonWidget(width / 2 - 100, height / 4 + 144 - 16, 200, 20, - new LiteralText("Back"), b -> client.openScreen(prevScreen))); + new LiteralText("Back"), b -> client.setScreen(prevScreen))); addDrawableChild( keyButton = new ButtonWidget(width / 2 - 79, height / 4 + 24 - 16, 158, 20, new LiteralText("Zoom Key: " + zoomKeyName), - b -> client.openScreen(new PressAKeyScreen(this)))); + b -> client.setScreen(new PressAKeyScreen(this)))); addDrawableChild(new ButtonWidget(width / 2 - 79, height / 4 + 72 - 16, 50, 20, new LiteralText("More"), b -> level.increaseValue())); diff --git a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java index 0dd355d3..c157ee16 100644 --- a/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/CleanUpScreen.java @@ -50,7 +50,7 @@ public class CleanUpScreen extends Screen { addDrawableChild( new CleanUpButton(width / 2 - 100, height / 4 + 168 + 12, - () -> "Cancel", "", b -> client.openScreen(prevScreen))); + () -> "Cancel", "", b -> client.setScreen(prevScreen))); addDrawableChild(cleanUpButton = new CleanUpButton(width / 2 - 100, height / 4 + 144 + 12, () -> "Clean Up", @@ -130,7 +130,7 @@ public class CleanUpScreen extends Screen } saveServerList(); - client.openScreen(prevScreen); + client.setScreen(prevScreen); } private boolean shouldRemove(ServerInfo server) diff --git a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java index b9e14381..e790c4dd 100644 --- a/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java +++ b/src/main/java/net/wurstclient/serverfinder/ServerFinderScreen.java @@ -57,7 +57,7 @@ public class ServerFinderScreen extends Screen addDrawableChild( new ButtonWidget(width / 2 - 100, height / 4 + 144 + 12, 200, 20, - new LiteralText("Back"), b -> client.openScreen(prevScreen))); + new LiteralText("Back"), b -> client.setScreen(prevScreen))); ipBox = new TextFieldWidget(textRenderer, width / 2 - 100, height / 4 + 34, 200, 20, new LiteralText(""));