caskd
/
kami-blue
forked from RepoMirrors/kami-blue
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make name detection for autonametag better

This commit is contained in:
Bella 2020-04-05 16:56:57 -04:00
parent 6623a281ab
commit 9e682f7c73
No known key found for this signature in database
GPG Key ID: 815562EA23BFE344
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoNametag.java
View File

@ -23,8 +23,11 @@ import net.minecraft.util.EnumHand;
public class AutoNametag extends Module { public class AutoNametag extends Module {
private Setting<Mode> modeSetting = register(Settings.e("Mode", Mode.WITHER)); private Setting<Mode> modeSetting = register(Settings.e("Mode", Mode.WITHER));
private Setting<Float> range = register(Settings.floatBuilder("Range").withMinimum(2.0f).withValue(3.5f).withMaximum(10.0f).build()); private Setting<Float> range = register(Settings.floatBuilder("Range").withMinimum(2.0f).withValue(3.5f).withMaximum(10.0f).build());
private Setting<Boolean> autoSlot = register(Settings.b("Auto Slot", true));
private Setting<Boolean> debug = register(Settings.b("Debug", false)); private Setting<Boolean> debug = register(Settings.b("Debug", false));
private String currentName = "";
public void onUpdate() { public void onUpdate() {
useNameTag(); useNameTag();
} }
@ -34,7 +37,7 @@ public class AutoNametag extends Module {
for (Entity w : mc.world.getLoadedEntityList()) { for (Entity w : mc.world.getLoadedEntityList()) {
switch (modeSetting.getValue()) { switch (modeSetting.getValue()) {
case WITHER: case WITHER:
if (w instanceof EntityWither && !w.hasCustomName()) { if (w instanceof EntityWither && !w.getDisplayName().getUnformattedText().equals(currentName)) {
final EntityWither wither = (EntityWither) w; final EntityWither wither = (EntityWither) w;
if (mc.player.getDistance(wither) <= range.getValue()) { if (mc.player.getDistance(wither) <= range.getValue()) {
if (debug.getValue()) if (debug.getValue())
@ -45,7 +48,7 @@ public class AutoNametag extends Module {
} }
return; return;
case ANY: case ANY:
if (w instanceof EntityMob || w instanceof EntityAnimal && !w.hasCustomName()) { if (w instanceof EntityMob || w instanceof EntityAnimal && !w.getDisplayName().getUnformattedText().equals(currentName)) {
if (mc.player.getDistance(w) <= range.getValue()) { if (mc.player.getDistance(w) <= range.getValue()) {
if (debug.getValue()) if (debug.getValue())
Command.sendChatMessage("Found unnamed " + w.getDisplayName().getUnformattedText()); Command.sendChatMessage("Found unnamed " + w.getDisplayName().getUnformattedText());
@ -55,16 +58,20 @@ public class AutoNametag extends Module {
} }
} }
} }
mc.player.inventory.currentItem = originalSlot; if (autoSlot.getValue()) mc.player.inventory.currentItem = originalSlot;
} }
private void selectNameTags() { private void selectNameTags() {
if (!autoSlot.getValue()) return;
int tagSlot = -1; int tagSlot = -1;
for (int i = 0; i < 9; i++) { for (int i = 0; i < 9; i++) {
ItemStack stack = mc.player.inventory.getStackInSlot(i); ItemStack stack = mc.player.inventory.getStackInSlot(i);
if (stack == ItemStack.EMPTY || stack.getItem() instanceof ItemBlock) continue; if (stack == ItemStack.EMPTY || stack.getItem() instanceof ItemBlock) continue;
Item tag = stack.getItem(); Item tag = stack.getItem();
if (tag instanceof ItemNameTag) tagSlot = i; if (tag instanceof ItemNameTag) {
tagSlot = i;
currentName = stack.getDisplayName();
}
} }
if (tagSlot == -1) { if (tagSlot == -1) {