diff --git a/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java b/src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java index 9a83e5776c..a1e40adc51 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,11 @@ 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) { + Nametags nametags = ModuleManager.getModule(Nametags.class); + if (nametags.isEnabled() && nametags.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