Skip to content

Commit

Permalink
Made the clickgui closed by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@BleachDev
BleachDev committed Jul 10, 2021
1 parent 5788de1 commit 61a6764
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 40 deletions.
24 changes: 12 additions & 12 deletions BleachHack-Fabric-1.16/src/main/java/bleach/hack/command/commands/CmdClickGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,7 @@ public void onCommand(String alias, String[] args) throws Exception {
}

if (args[0].equalsIgnoreCase("reset")) {
if (args.length == 1 || args[1].equalsIgnoreCase("open")) {
int x = 10;

for (Window m : ClickGui.clickGui.getWindows()) {
if (m instanceof ClickGuiWindow) {
((ClickGuiWindow) m).hiding = false;
m.x1 = x;
m.y1 = 35;
x += (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue() + 5;
}
}
} else if (args[1].equalsIgnoreCase("closed")) {
if (args.length == 1 || args[1].equalsIgnoreCase("closed")) {
int y = 50;

for (Window m : ClickGui.clickGui.getWindows()) {
Expand All @@ -55,6 +44,17 @@ public void onCommand(String alias, String[] args) throws Exception {
y += 16;
}
}
} else if (args[1].equalsIgnoreCase("open")) {
int x = 10;

for (Window m : ClickGui.clickGui.getWindows()) {
if (m instanceof ClickGuiWindow) {
((ClickGuiWindow) m).hiding = false;
m.x1 = x;
m.y1 = 35;
x += (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue() + 5;
}
}
} else {
throw new CmdSyntaxException("Invalid reset mode!");
}
Expand Down
22 changes: 14 additions & 8 deletions BleachHack-Fabric-1.16/src/main/java/bleach/hack/gui/clickgui/ModuleClickGuiScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import bleach.hack.BleachHack;
import bleach.hack.command.Command;
import bleach.hack.gui.clickgui.window.ClickGuiWindow;
import bleach.hack.gui.clickgui.window.ModuleWindow;
import bleach.hack.gui.window.Window;
import bleach.hack.module.ModuleCategory;
Expand Down Expand Up @@ -48,27 +49,32 @@ public void init() {
public void initWindows() {
int len = (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue();

int startX = 10;
addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.PLAYER),
startX, 35, len, "Player", new ItemStack(Items.ARMOR_STAND)));
30, 50, len, "Player", new ItemStack(Items.ARMOR_STAND)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.RENDER),
startX + len + 5, 35, len, "Render", new ItemStack(Items.YELLOW_STAINED_GLASS)));
30, 66, len, "Render", new ItemStack(Items.YELLOW_STAINED_GLASS)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.COMBAT),
startX + len * 2 + 10, 35, len, "Combat", new ItemStack(Items.TOTEM_OF_UNDYING)));
30, 82, len, "Combat", new ItemStack(Items.TOTEM_OF_UNDYING)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.MOVEMENT),
startX + len * 3 + 15, 35, len, "Movement", new ItemStack(Items.POTION)));
30, 98, len, "Movement", new ItemStack(Items.POTION)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.EXPLOITS),
startX + len * 4 + 20, 35, len, "Exploits", new ItemStack(Items.REPEATING_COMMAND_BLOCK)));
30, 114, len, "Exploits", new ItemStack(Items.REPEATING_COMMAND_BLOCK)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.MISC),
startX + len * 5 + 25, 35, len, "Misc", new ItemStack(Items.NAUTILUS_SHELL)));
30, 130, len, "Misc", new ItemStack(Items.NAUTILUS_SHELL)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.WORLD),
startX + len * 6 + 30, 35, len, "World", new ItemStack(Items.GRASS_BLOCK)));
30, 146, len, "World", new ItemStack(Items.GRASS_BLOCK)));

for (Window w: getWindows()) {
if (w instanceof ClickGuiWindow) {
((ClickGuiWindow) w).hiding = true;
}
}
}

public void onClose() {
Expand Down
24 changes: 12 additions & 12 deletions BleachHack-Fabric-1.17/src/main/java/bleach/hack/command/commands/CmdClickGui.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,7 @@ public void onCommand(String alias, String[] args) throws Exception {
}

if (args[0].equalsIgnoreCase("reset")) {
if (args.length == 1 || args[1].equalsIgnoreCase("open")) {
int x = 10;

for (Window m : ClickGui.clickGui.getWindows()) {
if (m instanceof ClickGuiWindow) {
((ClickGuiWindow) m).hiding = false;
m.x1 = x;
m.y1 = 35;
x += (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue() + 5;
}
}
} else if (args[1].equalsIgnoreCase("closed")) {
if (args.length == 1 || args[1].equalsIgnoreCase("closed")) {
int y = 50;

for (Window m : ClickGui.clickGui.getWindows()) {
Expand All @@ -55,6 +44,17 @@ public void onCommand(String alias, String[] args) throws Exception {
y += 16;
}
}
} else if (args[1].equalsIgnoreCase("open")) {
int x = 10;

for (Window m : ClickGui.clickGui.getWindows()) {
if (m instanceof ClickGuiWindow) {
((ClickGuiWindow) m).hiding = false;
m.x1 = x;
m.y1 = 35;
x += (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue() + 5;
}
}
} else {
throw new CmdSyntaxException("Invalid reset mode!");
}
Expand Down
22 changes: 14 additions & 8 deletions BleachHack-Fabric-1.17/src/main/java/bleach/hack/gui/clickgui/ModuleClickGuiScreen.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

import bleach.hack.BleachHack;
import bleach.hack.command.Command;
import bleach.hack.gui.clickgui.window.ClickGuiWindow;
import bleach.hack.gui.clickgui.window.ModuleWindow;
import bleach.hack.gui.window.Window;
import bleach.hack.module.ModuleCategory;
Expand Down Expand Up @@ -48,27 +49,32 @@ public void init() {
public void initWindows() {
int len = (int) ModuleManager.getModule("ClickGui").getSetting(0).asSlider().getValue();

int startX = 10;
addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.PLAYER),
startX, 35, len, "Player", new ItemStack(Items.ARMOR_STAND)));
30, 50, len, "Player", new ItemStack(Items.ARMOR_STAND)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.RENDER),
startX + len + 5, 35, len, "Render", new ItemStack(Items.YELLOW_STAINED_GLASS)));
30, 66, len, "Render", new ItemStack(Items.YELLOW_STAINED_GLASS)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.COMBAT),
startX + len * 2 + 10, 35, len, "Combat", new ItemStack(Items.TOTEM_OF_UNDYING)));
30, 82, len, "Combat", new ItemStack(Items.TOTEM_OF_UNDYING)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.MOVEMENT),
startX + len * 3 + 15, 35, len, "Movement", new ItemStack(Items.POTION)));
30, 98, len, "Movement", new ItemStack(Items.POTION)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.EXPLOITS),
startX + len * 4 + 20, 35, len, "Exploits", new ItemStack(Items.REPEATING_COMMAND_BLOCK)));
30, 114, len, "Exploits", new ItemStack(Items.REPEATING_COMMAND_BLOCK)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.MISC),
startX + len * 5 + 25, 35, len, "Misc", new ItemStack(Items.NAUTILUS_SHELL)));
30, 130, len, "Misc", new ItemStack(Items.NAUTILUS_SHELL)));

addWindow(new ModuleWindow(ModuleManager.getModulesInCat(ModuleCategory.WORLD),
startX + len * 6 + 30, 35, len, "World", new ItemStack(Items.GRASS_BLOCK)));
30, 146, len, "World", new ItemStack(Items.GRASS_BLOCK)));

for (Window w: getWindows()) {
if (w instanceof ClickGuiWindow) {
((ClickGuiWindow) w).hiding = true;
}
}
}

public void onClose() {
Expand Down

0 comments on commit 61a6764

Please sign in to comment.