Skip to content
This repository has been archived by the owner on Apr 22, 2021. It is now read-only.

True Durability and Friends List #338

Merged
merged 3 commits into from Jan 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 32 additions & 4 deletions src/main/java/me/zeroeightsix/kami/gui/kami/KamiGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import me.zeroeightsix.kami.module.ModuleManager;
import me.zeroeightsix.kami.module.modules.bewwawho.gui.InfoOverlay;
import me.zeroeightsix.kami.util.bewwawho.CalcPing;
import me.zeroeightsix.kami.util.zeroeightysix.ColourHolder;
import me.zeroeightsix.kami.util.zeroeightysix.LagCompensator;
import me.zeroeightsix.kami.util.zeroeightysix.Pair;
import me.zeroeightsix.kami.util.zeroeightysix.Wrapper;
import me.zeroeightsix.kami.util.zeroeightysix.*;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
Expand All @@ -33,6 +30,7 @@
import net.minecraft.entity.projectile.EntityEgg;
import net.minecraft.entity.projectile.EntitySnowball;
import net.minecraft.entity.projectile.EntityWitherSkull;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;

import javax.annotation.Nonnull;
Expand Down Expand Up @@ -205,6 +203,7 @@ public void onScroll(MouseScrollEvent event) {
frame.setPinneable(true);
frames.add(frame);


frame = new Frame(getTheme(), new Stretcherlayout(1), "Info");
frame.setCloseable(false);
frame.setPinneable(true);
Expand Down Expand Up @@ -259,6 +258,35 @@ public void onScroll(MouseScrollEvent event) {
information.setFontRenderer(fontRenderer);
frames.add(frame);

frame = new Frame(getTheme(), new Stretcherlayout(1), "True Durability");
frame.setCloseable(false);
frame.setPinneable(true);
Label durability = new Label("");
durability.setShadow(true);
durability.addTickListener(() -> {
ItemStack itemStack = Wrapper.getMinecraft().player.getHeldItemMainhand();
int itemDurability = itemStack.getMaxDamage() - itemStack.getItemDamage();
durability.setText(String.valueOf(itemDurability));
});
frame.addChild(durability);
durability.setFontRenderer(fontRenderer);
frames.add(frame);

frame = new Frame(getTheme(), new Stretcherlayout(1), "Friends");
frame.setCloseable(false);
frame.setPinneable(true);
Label friends = new Label("");
friends.setShadow(true);
friends.addTickListener(() -> {
friends.setText("");
Friends.friends.getValue().forEach(friend -> {
friends.addLine(friend.getUsername());
});
});
frame.addChild(friends);
friends.setFontRenderer(fontRenderer);
frames.add(frame);

frame = new Frame(getTheme(), new Stretcherlayout(1), "Text Radar");
Label list = new Label("");
DecimalFormat dfHealth = new DecimalFormat("#.#");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package me.zeroeightsix.kami.mixin.client;

import me.zeroeightsix.kami.module.modules.zeroeightysix.render.ExtraTab;
import me.zeroeightsix.kami.module.modules.zeroeightysix.render.TabFriends;
import net.minecraft.client.gui.GuiPlayerTabOverlay;
import net.minecraft.client.network.NetworkPlayerInfo;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -24,9 +25,9 @@ public List subList(List list, int fromIndex, int toIndex) {

@Inject(method = "getPlayerName", at = @At("HEAD"), cancellable = true)
public void getPlayerName(NetworkPlayerInfo networkPlayerInfoIn, CallbackInfoReturnable returnable) {
if (ExtraTab.INSTANCE.isEnabled()) {
if (TabFriends.INSTANCE.isEnabled()) {
returnable.cancel();
returnable.setReturnValue(ExtraTab.getPlayerName(networkPlayerInfoIn));
returnable.setReturnValue(TabFriends.getPlayerName(networkPlayerInfoIn));
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
package me.zeroeightsix.kami.module.modules.zeroeightysix.render;

import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.setting.Setting;
import me.zeroeightsix.kami.setting.Settings;
import me.zeroeightsix.kami.util.zeroeightysix.Friends;
import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.scoreboard.ScorePlayerTeam;

/**
* Created by 086 on 8/04/2018.
Expand All @@ -21,10 +17,4 @@ public class ExtraTab extends Module {
public ExtraTab() {
ExtraTab.INSTANCE = this;
}

public static String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) {
String dname = networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName());
if (Friends.isFriend(dname)) return String.format("%sa%s", Command.SECTION_SIGN, dname);
return dname;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package me.zeroeightsix.kami.module.modules.zeroeightysix.render;

import me.zeroeightsix.kami.command.Command;
import me.zeroeightsix.kami.module.Module;
import me.zeroeightsix.kami.util.zeroeightysix.Friends;
import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.scoreboard.ScorePlayerTeam;

@Module.Info(name = "TabFriends", description = "Highlights friends in the tab menu", category = Module.Category.RENDER)
public class TabFriends extends Module {

public static TabFriends INSTANCE;

public TabFriends() {
TabFriends.INSTANCE = this;
}

public static String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) {
String dname = networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName());
if (Friends.isFriend(dname)) return String.format("%sa%s", Command.SECTION_SIGN, dname);
return dname;
}
}