From 13b8151c525bd11ccfaa320d9ce50d55157b6ff0 Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 30 Jan 2022 14:57:03 +0100 Subject: [PATCH 1/6] Update gradle.yml --- .github/workflows/gradle.yml | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 79ed58b703..dec42f28e3 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,14 +1,14 @@ # This workflow will build a Java project with Gradle # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle -name: BleachHack Workflow Builds +name: DarkHack Workflow 1.17.1 on: push: branches: [ 1.17.1 ] jobs: - build: + build-linux: runs-on: ubuntu-latest @@ -19,15 +19,33 @@ jobs: with: java-version: 17 - - name: Build The Bruh + - name: Linux Build run: | chmod +x gradlew ./gradlew build - - name: Upload The Bruh uses: actions/upload-artifact@v2 with: - name: BleachHack - path: | - build/libs/bleachhack-*.jar - !build/libs/bleachhack-*-*.jar + name: DarkHack-Linux + path: build/libs/ + + build-windows: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + + - name: Linux Build + run: | + chmod +x gradlew + ./gradlew build + - name: Upload The Bruh + uses: actions/upload-artifact@v2 + with: + name: DarkHack-Windows + path: build/libs/ From 24f62385cd3df09cc7714d56f37dbcbb2683239d Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 30 Jan 2022 14:58:48 +0100 Subject: [PATCH 2/6] Update gradle.yml --- .github/workflows/gradle.yml | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index dec42f28e3..79ed58b703 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -1,14 +1,14 @@ # This workflow will build a Java project with Gradle # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle -name: DarkHack Workflow 1.17.1 +name: BleachHack Workflow Builds on: push: branches: [ 1.17.1 ] jobs: - build-linux: + build: runs-on: ubuntu-latest @@ -19,33 +19,15 @@ jobs: with: java-version: 17 - - name: Linux Build + - name: Build The Bruh run: | chmod +x gradlew ./gradlew build + - name: Upload The Bruh uses: actions/upload-artifact@v2 with: - name: DarkHack-Linux - path: build/libs/ - - build-windows: - - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - - name: Linux Build - run: | - chmod +x gradlew - ./gradlew build - - name: Upload The Bruh - uses: actions/upload-artifact@v2 - with: - name: DarkHack-Windows - path: build/libs/ + name: BleachHack + path: | + build/libs/bleachhack-*.jar + !build/libs/bleachhack-*-*.jar From 01da7f2e2bd9a710c2af3b9cfeb6d3eba59baa3f Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 30 Jan 2022 21:55:42 +0100 Subject: [PATCH 3/6] Update BleachHack.java --- src/main/java/org/bleachhack/BleachHack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bleachhack/BleachHack.java b/src/main/java/org/bleachhack/BleachHack.java index b0dca7bfda..ac3aaa344c 100644 --- a/src/main/java/org/bleachhack/BleachHack.java +++ b/src/main/java/org/bleachhack/BleachHack.java @@ -39,7 +39,7 @@ public class BleachHack implements ModInitializer { private static BleachHack instance = null; - public static final String VERSION = "1.2.5"; + public static final String VERSION = "5.1"; public static final int INTVERSION = 39; public static Watermark watermark; From 921f4998c166f49f6c0c250b14c0ba992a11a50d Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 30 Jan 2022 21:55:57 +0100 Subject: [PATCH 4/6] Update BleachHack.java --- src/main/java/org/bleachhack/BleachHack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/bleachhack/BleachHack.java b/src/main/java/org/bleachhack/BleachHack.java index ac3aaa344c..b0dca7bfda 100644 --- a/src/main/java/org/bleachhack/BleachHack.java +++ b/src/main/java/org/bleachhack/BleachHack.java @@ -39,7 +39,7 @@ public class BleachHack implements ModInitializer { private static BleachHack instance = null; - public static final String VERSION = "5.1"; + public static final String VERSION = "1.2.5"; public static final int INTVERSION = 39; public static Watermark watermark; From 1127ef9c4a7ecbffe8c4a8cd08373f1a7f668b3f Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 13 Feb 2022 16:03:59 +0100 Subject: [PATCH 5/6] NoRender + Nametags modules additions Adds scoreboards to NoRender and ability to disable all name plates in Nametags module Thanks a lot Etheradon#2766 for coming up with this code --- .../org/bleachhack/mixin/MixinEntityRenderer.java | 6 ++++++ .../java/org/bleachhack/mixin/MixinInGameHud.java | 11 +++++++++++ .../java/org/bleachhack/module/mods/Nametags.java | 7 ++++++- .../java/org/bleachhack/module/mods/NoRender.java | 3 ++- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java b/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java index 9a83e5776c..0abfb60dc2 100644 --- a/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java +++ b/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java @@ -10,6 +10,8 @@ import org.bleachhack.BleachHack; import org.bleachhack.event.events.EventEntityRender; +import org.bleachhack.module.ModuleManager; +import org.bleachhack.module.mods.Nametags; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -26,6 +28,10 @@ public abstract class MixinEntityRenderer { @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true) private void renderLabelIfPresent(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo info) { + if (ModuleManager.getModule(Nametags.class).getSetting(6).asToggle().getState()) { + info.cancel(); + } + EventEntityRender.Single.Label event = new EventEntityRender.Single.Label(entity, matrices, vertexConsumers); BleachHack.eventBus.post(event); diff --git a/src/main/java/org/bleachhack/mixin/MixinInGameHud.java b/src/main/java/org/bleachhack/mixin/MixinInGameHud.java index 4498f3e232..ad8e3424e9 100644 --- a/src/main/java/org/bleachhack/mixin/MixinInGameHud.java +++ b/src/main/java/org/bleachhack/mixin/MixinInGameHud.java @@ -12,6 +12,8 @@ import org.bleachhack.event.events.EventRenderCrosshair; import org.bleachhack.event.events.EventRenderInGameHud; import org.bleachhack.event.events.EventRenderOverlay; +import org.bleachhack.module.ModuleManager; +import org.bleachhack.module.mods.NoRender; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; @@ -20,6 +22,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.client.gui.hud.InGameHud; +import net.minecraft.scoreboard.ScoreboardObjective; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; @@ -74,4 +77,12 @@ private void renderCrosshair(MatrixStack matrices, CallbackInfo callback) { callback.cancel(); } } + + + @Inject(method = "renderScoreboardSidebar", at = @At("HEAD"), cancellable = true) + public void renderScoreboardSidebar(MatrixStack matrices, ScoreboardObjective objective, CallbackInfo callback) { + if (ModuleManager.getModule(NoRender.class).isOverlayToggled(9)) { + callback.cancel(); + } + } } diff --git a/src/main/java/org/bleachhack/module/mods/Nametags.java b/src/main/java/org/bleachhack/module/mods/Nametags.java index fc7e8f08a3..4525084454 100644 --- a/src/main/java/org/bleachhack/module/mods/Nametags.java +++ b/src/main/java/org/bleachhack/module/mods/Nametags.java @@ -98,7 +98,8 @@ public Nametags() { new SettingToggle("CustomName", true).withDesc("Shows the items custom name if it has it."), new SettingToggle("ItemCount", true).withDesc("Shows how many items are in the stack.")), new SettingToggle("ArmorStands", false).withDesc("Shows nametags over armor stands of their eqipment.").withChildren( - new SettingSlider("Size", 0.5, 5, 1, 1).withDesc("The size of the nametags."))); + new SettingSlider("Size", 0.5, 5, 1, 1).withDesc("The size of the nametags.")), + new SettingToggle("Disable", false).withDesc("Disables all nametags.")); } @Override @@ -159,6 +160,10 @@ public void onLivingLabelRender(EventEntityRender.Single.Label event) { @BleachSubscribe public void onWorldRender(EventWorldRender.Post event) { + if (getSetting(6).asToggle().getState()) { + return; + } + for (Entity entity: mc.world.getEntities()) { if (entity == mc.player || entity.hasPassenger(mc.player) || mc.player.hasPassenger(entity)) { continue; diff --git a/src/main/java/org/bleachhack/module/mods/NoRender.java b/src/main/java/org/bleachhack/module/mods/NoRender.java index f72ce78e30..331d4ceb8f 100644 --- a/src/main/java/org/bleachhack/module/mods/NoRender.java +++ b/src/main/java/org/bleachhack/module/mods/NoRender.java @@ -57,7 +57,8 @@ public NoRender() { new SettingToggle("BossBar", false).withDesc("Removes bossbars."), // 0-6 new SettingToggle("Gui", false).withDesc("Makes the gui background more transparent.").withChildren( // 0-7 new SettingSlider("Opacity", 0, 1, 0, 2).withDesc("The opacity of the gui background.")), - new SettingToggle("Frostbite", true).withDesc("Removes the frostbite overlay when you walk in powdered snow.")), // 0-8 + new SettingToggle("Frostbite", true).withDesc("Removes the frostbite overlay when you walk in powdered snow."), // 0-8 + new SettingToggle("Scoreboard", true).withDesc("Removes the scoreboard.")), // 0-9 new SettingToggle("World", true).withDesc("Removes miscellaneous things in the world.").withChildren( // 1 new SettingToggle("Signs", false).withDesc("Doesn't render signs.").withChildren( // 1-0 From 1e896c520089e8b1eda28e024645ed0145c3968b Mon Sep 17 00:00:00 2001 From: DarkReaper231 <38611351+DarkReaper231@users.noreply.github.com> Date: Sun, 13 Feb 2022 16:43:08 +0100 Subject: [PATCH 6/6] oops --- src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java b/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java index 0abfb60dc2..a1e40adc51 100644 --- a/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java +++ b/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java @@ -28,7 +28,8 @@ public abstract class MixinEntityRenderer { @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true) private void renderLabelIfPresent(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, CallbackInfo info) { - if (ModuleManager.getModule(Nametags.class).getSetting(6).asToggle().getState()) { + Nametags nametags = ModuleManager.getModule(Nametags.class); + if (nametags.isEnabled() && nametags.getSetting(6).asToggle().getState()) { info.cancel(); }