RepoMirrors
/
kami-blue
mirror of https://github.com/kami-blue/client
1
0
Fork 1
Code Issues Releases Wiki Activity

separate autonametag into it's own module

This commit is contained in:
Bella 2020-04-05 08:59:58 -04:00
parent a4c2911267
commit 0fb24f3d65
No known key found for this signature in database
GPG Key ID: 815562EA23BFE344
2 changed files with 59 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoNametag.java Normal file
View File

@ -0,0 +1,59 @@
package me.zeroeightsix.kami.module.modules.misc;
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 net.minecraft.entity.Entity;
import net.minecraft.entity.boss.EntityWither;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemNameTag;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
/**
* @author S-B99
* Created by S-B99 on this commit: 83387d6c2243c2a70dc864c9fbef96a77b9a9735
*/
@Module.Info(name = "AutoNametag", description = "Automatically nametags entities", category = Module.Category.MISC)
public class AutoNametag extends Module {
private Setting<Float> range = register(Settings.floatBuilder("Range").withMinimum(2.0f).withValue(3.5f).withMaximum(10.0f).build());
private Setting<Boolean> debug = register(Settings.b("Debug", false));
public void onUpdate() {
useNameTag();
}
private void useNameTag() {
int originalSlot = mc.player.inventory.currentItem;
for (Entity w : mc.world.getLoadedEntityList()) {
if (w instanceof EntityWither && w.getDisplayName().getUnformattedText().equalsIgnoreCase("Wither")) {
final EntityWither wither = (EntityWither) w;
if (mc.player.getDistance(wither) <= range.getValue()) {
if (debug.getValue()) Command.sendChatMessage("Found Unnamed Wither");
selectNameTags();
mc.playerController.interactWithEntity(mc.player, wither, EnumHand.MAIN_HAND);
}
}
}
mc.player.inventory.currentItem = originalSlot;
}
private void selectNameTags() {
int tagSlot = -1;
for (int i = 0; i < 9; i++) {
ItemStack stack = mc.player.inventory.getStackInSlot(i);
if (stack == ItemStack.EMPTY || stack.getItem() instanceof ItemBlock) continue;
Item tag = stack.getItem();
if (tag instanceof ItemNameTag) tagSlot = i;
}
if (tagSlot == -1) {
if (debug.getValue()) Command.sendErrorMessage(getChatName() + "Error: No nametags in hotbar");
return;
}
mc.player.inventory.currentItem = tagSlot;
}
}

35
src/main/java/me/zeroeightsix/kami/module/modules/misc/AutoSpawner.java
View File

@ -42,7 +42,6 @@ public class AutoSpawner extends Module {
private Setting<Boolean> party = register(Settings.b("Party", false));
private Setting<Boolean> partyWithers = register(Settings.booleanBuilder("Withers").withValue(false).withVisibility(v -> party.getValue()).build());
private Setting<EntityMode> entityMode = register(Settings.enumBuilder(EntityMode.class).withName("Entity Mode").withValue(EntityMode.SNOW).withVisibility(v -> !party.getValue()).build());
private Setting<Boolean> nametagWithers = register(Settings.booleanBuilder("Nametag").withValue(true).withVisibility(v -> party.getValue() && partyWithers.getValue() || !party.getValue() && entityMode.getValue().equals(EntityMode.WITHER)).build());
private Setting<Float> placeRange = register(Settings.floatBuilder("Place Range").withMinimum(2.0f).withValue(3.5f).withMaximum(10.0f).build());
private Setting<Integer> delay = register(Settings.integerBuilder("Delay").withMinimum(12).withValue(20).withMaximum(100).withVisibility(v -> useMode.getValue().equals(UseMode.SPAM)).build());
private Setting<Boolean> rotate = register(Settings.b("Rotate", true));
@ -84,38 +83,6 @@ public class AutoSpawner extends Module {
mc.rightClickDelayTimer = 4;
}
private void useNameTag() {
int originalSlot = mc.player.inventory.currentItem;
for (Entity w : mc.world.getLoadedEntityList()) {
if (w instanceof EntityWither && w.getDisplayName().getUnformattedText().equalsIgnoreCase("Wither")) {
final EntityWither wither = (EntityWither) w;
if (mc.player.getDistance(wither) <= placeRange.getValue()) {
if (debug.getValue()) Command.sendChatMessage("Found Unnamed Wither");
selectNameTags();
mc.playerController.interactWithEntity(mc.player, wither, EnumHand.MAIN_HAND);
}
}
}
mc.player.inventory.currentItem = originalSlot;
}
private void selectNameTags() {
int tagSlot = -1;
for (int i = 0; i < 9; i++) {
ItemStack stack = mc.player.inventory.getStackInSlot(i);
if (stack == ItemStack.EMPTY || stack.getItem() instanceof ItemBlock) continue;
Item tag = stack.getItem();
if (tag instanceof ItemNameTag) tagSlot = i;
}
if (tagSlot == -1) {
if (debug.getValue()) Command.sendErrorMessage(getChatName() + "Error: No nametags in hotbar");
return;
}
mc.player.inventory.currentItem = tagSlot;
}
private static EnumFacing getPlaceableSide(BlockPos pos) {
for (EnumFacing side : EnumFacing.values()) {
BlockPos neighbour = pos.offset(side);
@ -356,8 +323,6 @@ public class AutoSpawner extends Module {
public void onUpdate() {
if (mc.player == null) return;
if (nametagWithers.getValue() && (party.getValue() && partyWithers.getValue() || !party.getValue() && entityMode.getValue().equals(EntityMode.WITHER))) useNameTag();
if (buildStage == 1) {
isSneaking = false;
rotationPlaceableX = false;