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

Merge remote-tracking branch 'hubmaster/master' into blockparole-master 

merge hub into blockparole-master
This commit is contained in:
S-B99 2019-10-27 14:31:09 -04:00
parent 0b0bc429ec fee61e7ca2
commit b50603de15
2 changed files with 82 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/zeroeightsix/kami/module/modules/combat/Aura.java
View File

@ -23,7 +23,7 @@ import java.util.Iterator;
/** /**
* Created by 086 on 12/12/2017. * Created by 086 on 12/12/2017.
* Updated by hub on 25 October 2019 * Updated by hub on 27 October 2019
*/ */
@Module.Info(name = "Aura", category = Module.Category.COMBAT, description = "Hits entities around you") @Module.Info(name = "Aura", category = Module.Category.COMBAT, description = "Hits entities around you")
public class Aura extends Module { public class Aura extends Module {
@ -39,9 +39,11 @@ public class Aura extends Module {
@Override @Override
public void onUpdate() { public void onUpdate() {
if (mc.player.isDead) { if (mc.player.isDead) {
return; return;
} }
boolean shield = mc.player.getHeldItemOffhand().getItem().equals(Items.SHIELD) && mc.player.getActiveHand() == EnumHand.OFF_HAND; boolean shield = mc.player.getHeldItemOffhand().getItem().equals(Items.SHIELD) && mc.player.getActiveHand() == EnumHand.OFF_HAND;
if (mc.player.isHandActive() && !shield) { if (mc.player.isHandActive() && !shield) {
return; return;
@ -81,16 +83,18 @@ public class Aura extends Module {
return; return;
} else { } else {
if (EntityUtil.isPassive(target) ? animals.getValue() : (EntityUtil.isMobAggressive(target) && mobs.getValue())) { if (EntityUtil.isPassive(target) ? animals.getValue() : (EntityUtil.isMobAggressive(target) && mobs.getValue())) {
// We want to skip this if switchTo32k.getValue() is true,
// because it only accounts for tools and weapons.
// Maybe someone could refactor this later? :3
if (!switchTo32k.getValue() && ModuleManager.isModuleEnabled("AutoTool")) { if (!switchTo32k.getValue() && ModuleManager.isModuleEnabled("AutoTool")) {
AutoTool.equipBestWeapon(); // We want to skip this if switchTo32k.getValue() is true, AutoTool.equipBestWeapon();
// because it only accounts for tools and weapons.
// Maybe someone could refactor this? :3
} }
attack(target); attack(target);
return; return;
} }
} }
} }
} }
private boolean checkSharpness(ItemStack stack) { private boolean checkSharpness(ItemStack stack) {
@ -113,7 +117,7 @@ public class Aura extends Module {
NBTTagCompound enchant = enchants.getCompoundTagAt(i); NBTTagCompound enchant = enchants.getCompoundTagAt(i);
if (enchant.getInteger("id") == 16) { if (enchant.getInteger("id") == 16) {
int lvl = enchant.getInteger("lvl"); int lvl = enchant.getInteger("lvl");
if (lvl >= 42) { if (lvl >= 42) { // dia sword against full prot 5 armor is deadly somehere >= 34 sharpness iirc
return true; return true;
} }
break; break;
@ -171,7 +175,7 @@ public class Aura extends Module {
} }
private boolean canEntityFeetBeSeen(Entity entityIn) { private boolean canEntityFeetBeSeen(Entity entityIn) {
return mc.world.rayTraceBlocks(new Vec3d(mc.player.posX, mc.player.posX + mc.player.getEyeHeight(), mc.player.posZ), new Vec3d(entityIn.posX, entityIn.posY, entityIn.posZ), false, true, false) == null; return mc.world.rayTraceBlocks(new Vec3d(mc.player.posX, mc.player.posY + mc.player.getEyeHeight(), mc.player.posZ), new Vec3d(entityIn.posX, entityIn.posY, entityIn.posZ), false, true, false) == null;
} }
} }

87
src/main/java/me/zeroeightsix/kami/module/modules/combat/Auto32k.java
View File

@ -10,6 +10,8 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockAir; import net.minecraft.block.BlockAir;
import net.minecraft.block.BlockLiquid; import net.minecraft.block.BlockLiquid;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.inventory.ClickType; import net.minecraft.inventory.ClickType;
import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemBlock;
@ -19,20 +21,21 @@ import net.minecraft.network.play.client.CPacketPlayer;
import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock; import net.minecraft.network.play.client.CPacketPlayerTryUseItemOnBlock;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand; import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.*;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d;
import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
* Created by hub on 7 August 2019 * Created by hub on 7 August 2019
* Updated by hub on 25 October 2019 * Updated by hub on 27 October 2019
*/ */
@Module.Info(name = "Auto32k", category = Module.Category.COMBAT) @Module.Info(name = "Auto32k", category = Module.Category.COMBAT)
public class Auto32k extends Module { public class Auto32k extends Module {
private static final DecimalFormat df = new DecimalFormat("#.#");
private static final List<Block> shulkerList = Arrays.asList( private static final List<Block> shulkerList = Arrays.asList(
Blocks.WHITE_SHULKER_BOX, Blocks.WHITE_SHULKER_BOX,
Blocks.ORANGE_SHULKER_BOX, Blocks.ORANGE_SHULKER_BOX,
@ -52,12 +55,13 @@ public class Auto32k extends Module {
Blocks.BLACK_SHULKER_BOX Blocks.BLACK_SHULKER_BOX
); );
private Setting<Boolean> moveToHotbar = register(Settings.b("Move to Hotbar", true)); private Setting<Boolean> moveToHotbar = register(Settings.b("Move 32k to Hotbar", true));
private Setting<Double> placeRange = register(Settings.d("Place Range", 4.0d));
private Setting<Integer> yOffset = register(Settings.i("Y Offset (up and down)", 2));
private Setting<Boolean> placeBehind = register(Settings.b("Place behind", true)); private Setting<Boolean> placeBehind = register(Settings.b("Place behind", true));
private Setting<Boolean> placeObi = register(Settings.b("Obi on Top", true)); private Setting<Boolean> placeObi = register(Settings.b("Obi on Top", true));
private Setting<Double> blockRange = register(Settings.d("Block Range", 4.0d));
private Setting<Double> maxDistance = register(Settings.d("Max Distance", 3.5d));
private Setting<Boolean> spoofRotation = register(Settings.b("Spoof Rotation", true)); private Setting<Boolean> spoofRotation = register(Settings.b("Spoof Rotation", true));
private Setting<Boolean> raytraceCheck = register(Settings.b("Raytrace Check", true));
private Setting<Boolean> debugMessages = register(Settings.b("Debug Messages", false)); private Setting<Boolean> debugMessages = register(Settings.b("Debug Messages", false));
private int swordSlot; private int swordSlot;
@ -108,6 +112,8 @@ public class Auto32k extends Module {
return; return;
} }
df.setRoundingMode(RoundingMode.CEILING);
int hopperSlot = -1; int hopperSlot = -1;
int shulkerSlot = -1; int shulkerSlot = -1;
int obiSlot = -1; int obiSlot = -1;
@ -157,7 +163,7 @@ public class Auto32k extends Module {
EnumFacing facingDirection; EnumFacing facingDirection;
BlockPos placeTestNextPos = basePos; BlockPos placeTestNextPos = basePos;
BlockPos placeTestLastSuccessfull = null; BlockPos placeTestSuccessfull = null;
if (placeBehind.getValue()) { if (placeBehind.getValue()) {
facingDirection = EnumFacing.fromAngle(mc.player.rotationYaw).getOpposite(); facingDirection = EnumFacing.fromAngle(mc.player.rotationYaw).getOpposite();
@ -165,19 +171,70 @@ public class Auto32k extends Module {
facingDirection = EnumFacing.fromAngle(mc.player.rotationYaw); facingDirection = EnumFacing.fromAngle(mc.player.rotationYaw);
} }
int range = Math.toIntExact(Math.round(blockRange.getValue())); int range = (int) Math.ceil(placeRange.getValue());
int yOffsetSanitized = yOffset.getValue() < 0 ? -1 * yOffset.getValue() : yOffset.getValue();
// Searching placeable area in front / behind the player in a straight line
// We could test iterations on both sides of the player while range - n (where n is iteration count).
// Just realized i also could reuse getSphere() from CrystalAura, but it would need a sorting for optimal
// placement of the hopper and i dont really have time for that right now.
// Also i think this would not work in most cases cause of raytrace checks on click.
for (int i = range; i > 0; i--) { for (int i = range; i > 0; i--) {
placeTestNextPos = placeTestNextPos.add(facingDirection.getXOffset(), 0, facingDirection.getZOffset()); placeTestNextPos = placeTestNextPos.add(facingDirection.getXOffset(), 0, facingDirection.getZOffset());
if (Wrapper.getWorld().getBlockState(placeTestNextPos).getMaterial().isReplaceable() && Wrapper.getWorld().getBlockState(placeTestNextPos.add(0, 1, 0)).getMaterial().isReplaceable() && !(Wrapper.getWorld().getBlockState(placeTestNextPos.add(0, -1, 0)).getBlock() instanceof BlockAir) && !(Wrapper.getWorld().getBlockState(placeTestNextPos.add(0, -1, 0)).getBlock() instanceof BlockAir) && !(Wrapper.getWorld().getBlockState(placeTestNextPos.add(0, -1, 0)).getBlock() instanceof BlockLiquid)) {
if (mc.player.getPositionVector().distanceTo(new Vec3d(placeTestNextPos)) <= maxDistance.getValue()) { // max y Offset is 2 Blocks (3 iterations)
placeTestLastSuccessfull = placeTestNextPos; for (int j = (-1 * yOffsetSanitized); j < (1 + yOffsetSanitized); j++) {
BlockPos placeTestNextPosOffsetY = placeTestNextPos.add(0, j, 0);
boolean EntityLivingBaseOnTargetBlockPos = false;
for (Entity entity : mc.world.getEntitiesWithinAABBExcludingEntity(null, new AxisAlignedBB(placeTestNextPosOffsetY))) {
if (entity instanceof EntityLivingBase) {
EntityLivingBaseOnTargetBlockPos = true;
break;
}
} }
if (EntityLivingBaseOnTargetBlockPos) {
continue; // entity on block
}
if (!Wrapper.getWorld().getBlockState(placeTestNextPosOffsetY).getMaterial().isReplaceable()) {
continue; // no space for hopper
}
if (!Wrapper.getWorld().getBlockState(placeTestNextPosOffsetY.add(0, 1, 0)).getMaterial().isReplaceable()) {
continue; // no space for shulker
}
if (Wrapper.getWorld().getBlockState(placeTestNextPosOffsetY.add(0, -1, 0)).getBlock() instanceof BlockAir) {
continue; // air below hopper
}
if (Wrapper.getWorld().getBlockState(placeTestNextPosOffsetY.add(0, -1, 0)).getBlock() instanceof BlockLiquid) {
continue; // liquid below hopper
}
if (mc.player.getPositionVector().distanceTo(new Vec3d(placeTestNextPosOffsetY)) > placeRange.getValue()) {
continue; // out of range
}
if (raytraceCheck.getValue()) {
RayTraceResult result = mc.world.rayTraceBlocks(new Vec3d(mc.player.posX, mc.player.posY + mc.player.getEyeHeight(), mc.player.posZ), new Vec3d(placeTestNextPosOffsetY), false, true, false);
if (!(result == null || result.getBlockPos().equals(placeTestNextPosOffsetY))) {
continue;
}
}
placeTestSuccessfull = placeTestNextPosOffsetY;
break;
} }
} }
if (placeTestLastSuccessfull == null) { if (placeTestSuccessfull == null) {
if (debugMessages.getValue()) { if (debugMessages.getValue()) {
Command.sendChatMessage("Not enough space, disabling."); Command.sendChatMessage("Not enough space, disabling.");
} }
@ -185,10 +242,10 @@ public class Auto32k extends Module {
return; return;
} }
BlockPos placeTargetPos = placeTestLastSuccessfull; BlockPos placeTargetPos = placeTestSuccessfull;
if (debugMessages.getValue()) { if (debugMessages.getValue()) {
Command.sendChatMessage("Place Target: " + placeTargetPos.toString() + " Distance: " + mc.player.getPositionVector().distanceTo(new Vec3d(placeTargetPos))); Command.sendChatMessage("Place Target: " + placeTargetPos.toString() + " Distance: " + df.format(mc.player.getPositionVector().distanceTo(new Vec3d(placeTargetPos))));
} }
mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_SNEAKING)); mc.player.connection.sendPacket(new CPacketEntityAction(mc.player, CPacketEntityAction.Action.START_SNEAKING));