Combine Scoreboard and scoreboardnumbers

This commit is contained in:
ThisIsALegitUsername 2023-01-09 03:03:55 +00:00
parent eed4ed2ecd
commit 6894b417e5
25 changed files with 66270 additions and 66470 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

View File

@ -32,9 +32,7 @@ import dev.resent.module.impl.misc.NoParticles;
import dev.resent.module.impl.misc.NoRain; import dev.resent.module.impl.misc.NoRain;
import dev.resent.module.impl.misc.NoSwingDelay; import dev.resent.module.impl.misc.NoSwingDelay;
import dev.resent.module.impl.misc.Scoreboard; import dev.resent.module.impl.misc.Scoreboard;
import dev.resent.module.impl.misc.ScoreboardNumbers;
import dev.resent.module.impl.misc.SelfNametag; import dev.resent.module.impl.misc.SelfNametag;
import dev.resent.module.impl.misc.SmoothCamera;
import dev.resent.module.impl.misc.Tooltips; import dev.resent.module.impl.misc.Tooltips;
import dev.resent.module.impl.movement.AutoJump; import dev.resent.module.impl.movement.AutoJump;
import dev.resent.module.impl.movement.AutoWalk; import dev.resent.module.impl.movement.AutoWalk;
@ -68,14 +66,12 @@ public class ModManager {
public static Health health; public static Health health;
//public static ChunkBorders chunkBorders; //public static ChunkBorders chunkBorders;
public static NoParticles noParticles = new NoParticles(); public static NoParticles noParticles = new NoParticles();
public static ScoreboardNumbers scoreboardNumbers; public static Scoreboard scoreboard = new Scoreboard();
public static Scoreboard scoreboard;
public static AutoWalk autoWalk; public static AutoWalk autoWalk;
public static AutoJump autoJump; public static AutoJump autoJump;
public static SelfNametag selfNametag = new SelfNametag(); public static SelfNametag selfNametag = new SelfNametag();
public static ClearChat clearChat = new ClearChat(); public static ClearChat clearChat = new ClearChat();
public static Tooltips tooltips; public static Tooltips tooltips;
public static SmoothCamera smoothCamera;
public static FPSB fpsb = new FPSB(); public static FPSB fpsb = new FPSB();
public static FakeArray fakeArray; public static FakeArray fakeArray;
public static Animations animations = new Animations(); public static Animations animations = new Animations();
@ -120,14 +116,12 @@ public class ModManager {
register(hitboxes); register(hitboxes);
//register(chunkBorders = new ChunkBorders()); //register(chunkBorders = new ChunkBorders());
register(noParticles); register(noParticles);
register(scoreboardNumbers = new ScoreboardNumbers()); register(scoreboard );
register(scoreboard = new Scoreboard());
register(autoWalk = new AutoWalk()); register(autoWalk = new AutoWalk());
register(autoJump = new AutoJump()); register(autoJump = new AutoJump());
//register(selfNametag = new SelfNametag()); //register(selfNametag = new SelfNametag());
register(clearChat); register(clearChat);
register(tooltips = new Tooltips()); register(tooltips = new Tooltips());
register(smoothCamera = new SmoothCamera());
register(animations); register(animations);
} }

View File

@ -1,40 +0,0 @@
// package dev.resent.module.impl.misc;
// import dev.resent.Resent;
// import dev.resent.event.impl.RenderWorldEvent;
// import dev.resent.module.base.Category;
// import dev.resent.module.base.Mod;
// import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager;
// import net.minecraft.client.renderer.RenderGlobal;
// import net.minecraft.client.renderer.entity.RenderManager;
// import net.minecraft.util.AxisAlignedBB;
// public class ChunkBorders extends Mod{
// public ChunkBorders() {
// super("ChunkBorders", Category.MISC);
// Resent.INSTANCE.events().subscribe(RenderWorldEvent.class, event -> {
// if (this.isEnabled() && mc.theWorld != null) {
// final int chunkX = mc.thePlayer.chunkCoordX * 16;
// final int chunkZ = mc.thePlayer.chunkCoordZ * 16;
// final AxisAlignedBB chunkBB = AxisAlignedBB.getBoundingBox(
// chunkX, 0.0, chunkZ,
// chunkX + 16.0, 255.0, chunkZ + 16.0);
// GlStateManager.pushMatrix();
// GlStateManager.color(1.0f, 1.0f, 0.0f);
// GlStateManager.disableTexture2D();
// GlStateManager.disableDepth();
// GlStateManager.translate((float)-RenderManager.renderPosX, (float)-RenderManager.renderPosY, (float)-RenderManager.renderPosZ);
// GlStateManager.line(1f);
// RenderGlobal.drawOutlinedBoundingBox(chunkBB);
// GlStateManager.enableDepth();
// GlStateManager.enableTexture2D();
// GlStateManager.popMatrix();
// }
// });
// }
// }

View File

@ -2,10 +2,13 @@ package dev.resent.module.impl.misc;
import dev.resent.module.base.Category; import dev.resent.module.base.Category;
import dev.resent.module.base.Mod; import dev.resent.module.base.Mod;
import dev.resent.setting.BooleanSetting;
public class Scoreboard extends Mod { public class Scoreboard extends Mod {
public Scoreboard() { public Scoreboard() {
super("Scoreboard", Category.MISC); super("Scoreboard", Category.MISC, true);
addSetting(numbers);
} }
public BooleanSetting numbers = new BooleanSetting("Numbers","", false);
} }

View File

@ -1,11 +0,0 @@
package dev.resent.module.impl.misc;
import dev.resent.module.base.Category;
import dev.resent.module.base.Mod;
public class ScoreboardNumbers extends Mod {
public ScoreboardNumbers() {
super("Sboard numbers", Category.MISC);
}
}

View File

@ -1,22 +0,0 @@
package dev.resent.module.impl.misc;
import dev.resent.module.base.Category;
import dev.resent.module.base.Mod;
public class SmoothCamera extends Mod {
public SmoothCamera() {
super("SmoothCamera", Category.MISC);
}
@Override
public void onEnable() {
if (mc.theWorld != null)
mc.gameSettings.smoothCamera = true;
}
@Override
public void onDisable() {
if (mc.theWorld != null)
mc.gameSettings.smoothCamera = false;
}
}

View File

@ -1,6 +1,5 @@
package dev.resent.util.misc; package dev.resent.util.misc;
import dev.resent.Resent;
import dev.resent.module.base.ModManager; import dev.resent.module.base.ModManager;
import dev.resent.module.impl.hud.ComboCounter; import dev.resent.module.impl.hud.ComboCounter;
import dev.resent.module.impl.hud.Freelook; import dev.resent.module.impl.hud.Freelook;
@ -13,7 +12,6 @@ import dev.resent.module.impl.misc.NoHurtCam;
import dev.resent.module.impl.misc.NoParticles; import dev.resent.module.impl.misc.NoParticles;
import dev.resent.module.impl.misc.NoRain; import dev.resent.module.impl.misc.NoRain;
import dev.resent.module.impl.misc.Scoreboard; import dev.resent.module.impl.misc.Scoreboard;
import dev.resent.module.impl.misc.ScoreboardNumbers;
import dev.resent.module.impl.misc.SelfNametag; import dev.resent.module.impl.misc.SelfNametag;
public class W { public class W {
@ -26,7 +24,6 @@ public class W {
public static ComboCounter comboCounter(){ return ModManager.comboCounter; } public static ComboCounter comboCounter(){ return ModManager.comboCounter; }
public static Hitboxes hitboxes(){ return ModManager.hitboxes; } public static Hitboxes hitboxes(){ return ModManager.hitboxes; }
public static NoParticles noParticles(){ return ModManager.noParticles; } public static NoParticles noParticles(){ return ModManager.noParticles; }
public static ScoreboardNumbers scoreboardNumbers(){ return ModManager.scoreboardNumbers; }
public static Scoreboard scoreboard(){ return ModManager.scoreboard; } public static Scoreboard scoreboard(){ return ModManager.scoreboard; }
public static SelfNametag selfNametag(){ return ModManager.selfNametag; } public static SelfNametag selfNametag(){ return ModManager.selfNametag; }
public static ClearChat clearChat(){ return ModManager.clearChat; } public static ClearChat clearChat(){ return ModManager.clearChat; }

View File

@ -166,6 +166,7 @@ public class GuiIngame extends Gui {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(icons); this.mc.getTextureManager().bindTexture(icons);
GlStateManager.enableBlend(); GlStateManager.enableBlend();
if (this.showCrosshair()) { if (this.showCrosshair()) {
GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0); GlStateManager.tryBlendFuncSeparate(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR, 1, 0);
GlStateManager.enableAlpha(); GlStateManager.enableAlpha();
@ -460,8 +461,7 @@ public class GuiIngame extends Gui {
} }
protected boolean showCrosshair() { protected boolean showCrosshair() {
if (this.mc.gameSettings.showDebugInfo && !this.mc.thePlayer.hasReducedDebug() if (this.mc.gameSettings.showDebugInfo && !this.mc.thePlayer.hasReducedDebug() && !this.mc.gameSettings.reducedDebugInfo) {
&& !this.mc.gameSettings.reducedDebugInfo) {
return false; return false;
} else if (this.mc.playerController.isSpectator()) { } else if (this.mc.playerController.isSpectator()) {
if (this.mc.pointedEntity != null) { if (this.mc.pointedEntity != null) {
@ -519,8 +519,8 @@ public class GuiIngame extends Gui {
int l = parScaledResolution.getScaledWidth() - b0 + 2; int l = parScaledResolution.getScaledWidth() - b0 + 2;
drawRect(k1 - 2, k, l, k + this.getFontRenderer().FONT_HEIGHT, 1342177280); drawRect(k1 - 2, k, l, k + this.getFontRenderer().FONT_HEIGHT, 1342177280);
this.getFontRenderer().drawString(s1, k1, k, 553648127); this.getFontRenderer().drawString(s1, k1, k, 553648127);
if(W.scoreboardNumbers().enabled){ if(W.scoreboard().numbers.getValue()){
this.getFontRenderer().drawString(s2, l - this.getFontRenderer().getStringWidth(s2), k, 553648127); this.getFontRenderer().drawString(s2, l - this.getFontRenderer().getStringWidth(s2), k, 553648127);
} }
if (j == arraylist1.size()) { if (j == arraylist1.size()) {
String s3 = parScoreObjective.getDisplayName(); String s3 = parScoreObjective.getDisplayName();