Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
13b8151
Update gradle.yml
SolsticeSpectrum Jan 30, 2022
24f6238
Update gradle.yml
SolsticeSpectrum Jan 30, 2022
01da7f2
Update BleachHack.java
SolsticeSpectrum Jan 30, 2022
921f499
Update BleachHack.java
SolsticeSpectrum Jan 30, 2022
399ee2b
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Jan 30, 2022
d60691a
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Feb 2, 2022
06205bd
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Feb 9, 2022
1127ef9
NoRender + Nametags modules additions
SolsticeSpectrum Feb 13, 2022
1e896c5
oops
SolsticeSpectrum Feb 13, 2022
8dea8ad
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Feb 17, 2022
fe2dcab
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Feb 23, 2022
fde2fa3
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 4, 2022
a6c283b
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 8, 2022
c1a3d28
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 17, 2022
63fe796
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 21, 2022
f925b06
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 24, 2022
b175f3c
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Mar 28, 2022
a8b90bc
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Apr 4, 2022
9be3ec1
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Apr 7, 2022
09ae7d4
Merge branch 'BleachDrinker420:1.17.1' into 1.17.1
SolsticeSpectrum Apr 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/org/bleachhack/mixin/MixinEntityRenderer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,6 +28,11 @@ public abstract class MixinEntityRenderer<T extends Entity> {

@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);

Expand Down
11 changes: 11 additions & 0 deletions src/main/java/org/bleachhack/mixin/MixinInGameHud.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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();
}
}
}
7 changes: 6 additions & 1 deletion src/main/java/org/bleachhack/module/mods/Nametags.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/bleachhack/module/mods/NoRender.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down