BaseBand/BaseBandRewrite
3
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity Actions

Merge branch 'main' of ssh://tudbut.de:222/BaseBand/BaseBandRewrite
Some checks failed
/ Build BaseBand DSM & Broadway (push) Has been cancelled
Details

Browse source
This commit is contained in:
Jess H 2024-06-15 19:53:45 +01:00
commit 309ea94bbb
Signed by: UnixSystemV
GPG key ID: 9B21C50B68D67F19
12 changed files with 27 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Client/src/main/java/de/com/baseband/client/feature/Feature.java
View file

@ -35,7 +35,6 @@ public abstract class Feature extends ToggleButton implements SetCommand {
public static final int M_ENABLED = MARKER_PREFIX + 1;
protected de.com.baseband.client.Setup Setup;
protected Minecraft mc;
public Category category;
@ -43,6 +42,8 @@ public abstract class Feature extends ToggleButton implements SetCommand {
@Marker(M_ENABLED)
public boolean enabled = defaultEnable();
public String meta = null;
public Feature() {
super("Uninit", null, "Enabled");
this.setLambda(this::updateEnabled);
@ -296,4 +297,8 @@ public abstract class Feature extends ToggleButton implements SetCommand {
public boolean renderInHUD() {
return true;
}
public String getHUDText() {
return text + (meta != null ? " §7[" + meta + "]" : "");
}
}

3
Client/src/main/java/de/com/baseband/client/feature/modules/chat/PvpInfo.java
View file

@ -15,7 +15,7 @@ public class PvpInfo extends Feature {
private final ArrayList<String> names = new ArrayList<>();
private final ArrayList<String> newnames = new ArrayList<>();
private HashMap<String, Integer> popList = new HashMap<>();
private final HashMap<String, Integer> popList = new HashMap<>();
@Config("Totem Pops")
public boolean totemPops;
@ -71,7 +71,6 @@ public class PvpInfo extends Feature {
@Override
public void onDisable() {
text = "PvpInfo";
names.clear();
newnames.clear();
popList.clear();

2
Client/src/main/java/de/com/baseband/client/feature/modules/client/Baritone.java
View file

@ -32,7 +32,7 @@ public class Baritone extends Feature {
public void onTick() {
IBaritoneProcess baritoneProcess = BaritoneManager.getBaritone().getPathingControlManager().mostRecentInControl().orElse(null);
text = "Baritone §7[" + (baritoneProcess == null ? "Idle" : baritoneProcess.displayName()) + "]";
meta = (baritoneProcess == null ? "Idle" : baritoneProcess.displayName());
}
public void onSelect(SelectEvent event) {

7
Client/src/main/java/de/com/baseband/client/feature/modules/client/Spotify.java
View file

@ -36,9 +36,10 @@ public class Spotify extends Feature {
}
if (api.isConnected() && api.hasPosition() && api.hasTrack() && enabled && renderInHUD) {
text = this + "§7 [" + api.getTrack().getName() + " - " + api.getTrack().getArtist() + " (" + new SimpleDateFormat("mm:ss").format(new Date(api.getPosition())) + "/" + new SimpleDateFormat("mm:ss").format(new Date(api.getTrack().getLength())) + ")]";
} else {
text = toString();
meta = api.getTrack().getName() + " - " + api.getTrack().getArtist() + " (" + new SimpleDateFormat("mm:ss").format(new Date(api.getPosition())) + "/" + new SimpleDateFormat("mm:ss").format(new Date(api.getTrack().getLength())) + ")";
}
else {
meta = null;
}
}

6
Client/src/main/java/de/com/baseband/client/feature/modules/client/Timer.java
View file

@ -59,7 +59,7 @@ public class Timer extends Feature {
@Override
public void onDisable() {
setGameTimer(20);
text = "Timer";
meta = null;
multiplierLock = null;
}
@ -102,7 +102,7 @@ public class Timer extends Feature {
private void tickTimer() {
if (timerLock) {
text = "Timer" + (enabled ? " §7[LOCKED]" : "");
meta = (enabled ? "LOCKED" : null);
if(multiplierLock != null) {
setGameTimer(multiplierLock);
}
@ -116,7 +116,7 @@ public class Timer extends Feature {
}
float t = (adjust ? tps : 20) * m;
setGameTimer(t);
text = "Timer" + (enabled ? "§7 [TPS: " + (Math.round(t * 100f) / 100f) + "]" : "");
meta = (enabled ? "TPS: " + (Math.round(t * 100f) / 100f) : null);
}
}

4
Client/src/main/java/de/com/baseband/client/feature/modules/combat/AutoTotem.java
View file

@ -140,9 +140,9 @@ public class AutoTotem extends Feature {
//Hot
if(enabled && renderTotemCountModuleList && !notIngame()) {
text = this + "§7 [" + getTotemCount() + "]";
meta = String.valueOf(getTotemCount());
} else {
text = toString();
meta = null;
}
switch (mode) {

4
Client/src/main/java/de/com/baseband/client/feature/modules/movement/ElytraFly.java
View file

@ -115,9 +115,9 @@ public class ElytraFly extends Feature {
@Override
public void onEveryTick() {
if (blockMovement) {
text = this + "§7 [Locked]";
meta = "Locked";
} else {
text = toString();
meta = null;
}
}

10
Client/src/main/java/de/com/baseband/client/feature/modules/render/Bright.java
View file

@ -21,17 +21,9 @@ public class Bright extends Feature {
Gamma,
}
@Override
public void onEveryTick() {
if (enabled && !notIngame()) {
text = this + "§7 [" + mode.toString() + "]";
} else {
text = toString();
}
}
@Override
public void onTick() {
meta = mode.toString();
switch (mode) {
case Gamma:
mc.gameSettings.gammaSetting = 100f;

11
Client/src/main/java/de/com/baseband/client/feature/modules/render/HUD.java
View file

@ -227,7 +227,7 @@ public class HUD extends Feature {
int maxWidth = TextSplitter.getStringWidth(initString);
Feature[] renderFeatures = Arrays.stream(Features.features).filter(m -> m.enabled && m.category != Category.COMMAND && m.getClass() != Client.class && m != this && m.renderInHUD()).sorted(Comparator.comparingDouble(value -> -Minecraft.getMinecraft().fontRenderer.getStringWidth(includeStatus ? value.text : value.toString()))).toArray(Feature[]::new);
for (Feature f : renderFeatures) {
maxWidth = Math.max(mc.fontRenderer.getStringWidth(f.text), maxWidth);
maxWidth = Math.max(mc.fontRenderer.getStringWidth(f.getHUDText()), maxWidth);
}
if(background) {
@ -237,7 +237,7 @@ public class HUD extends Feature {
TextSplitter.drawString(initString, 3,3, theme.getGreenColor(), textShadow, false);
int y = 3 + TextSplitter.getStringHeight(initString);
for (Feature f : renderFeatures) {
mc.fontRenderer.drawString(f.text, 3, y, hashColor ? f.getHashColor() : theme.getGreenColor(), textShadow);
mc.fontRenderer.drawString(f.getHUDText(), 3, y, hashColor ? f.getHashColor() : theme.getGreenColor(), textShadow);
y = y + mc.fontRenderer.FONT_HEIGHT;
}
@ -333,14 +333,9 @@ public class HUD extends Feature {
return false;
}
@Override
public void onDisable() {
text = toString();
}
@Override
public void onTick() {
text = "ShowTPS" + (enabled ? " §7[TPS: " + (Math.round(ServerDataManager.tps * 100f) / 100f) + "]" : "");
meta = "TPS: " + (Math.round(ServerDataManager.tps * 100f) / 100f);
}
@Override

10
Client/src/main/java/de/com/baseband/client/feature/modules/world/AutoEat.java
View file

@ -33,17 +33,9 @@ public class AutoEat extends Feature {
return "AutoEat";
}
@Override
public void onEveryTick() {
if(enabled) {
text = this + "§7 [" + (eating ? "Eating" : "Idle") + "]";
} else {
text = toString();
}
}
@Override
public void onTick() {
meta = (eating ? "Eating" : "Idle");
if (eating && !mc.player.isHandActive()) {
if (lastSlot != -1) {
mc.player.inventory.currentItem = lastSlot;

3
Client/src/main/java/de/com/baseband/client/feature/modules/world/Ping.java
View file

@ -28,7 +28,7 @@ public class Ping extends Feature {
@Override
public void onEveryTick() {
text = "Ping" + (enabled ? " §7[" + seconds + "s: " + totalRecieved + (holder == null ? "" : "§cH§7") + "]" : "");
meta = seconds + "s: " + totalRecieved + (holder == null ? "" : "§cH§7");
}
@Override
@ -40,7 +40,6 @@ public class Ping extends Feature {
}
public void onDisable() {
text = "Ping";
totalRecieved = 0;
}

9
Client/src/main/java/de/com/baseband/client/feature/modules/world/Select.java
View file

@ -36,14 +36,9 @@ public class Select extends Feature {
@Override
public void onTick() {
if(selection != null)
text = this + "§7 [" + selection.area() + " Blocks]";
meta = selection.area() + " Blocks";
else
text = this + "§7 [0 Blocks]";
}
@Override
public void onDisable() {
text = this.toString();
meta = "0 Blocks";
}
@Override