RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

Elytra inventory modifications 

- Use `throwaway` to switch items
- Remove inventory settings
- Prioritizes boost fireworks, but works without
- Avoids explosion fireworks
This commit is contained in:
Brady 2023-06-19 12:32:25 -05:00
parent 579e6d6e4c
commit 9e10faa4c5
No known key found for this signature in database
GPG Key ID: 73A788379A197567
2 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/java/baritone/api/Settings.java
View File

@ -50,14 +50,6 @@ public final class Settings {
public final Setting<Integer> elytraSimulationTicks = new Setting<>(20);
public final Setting<Integer> elytraPitchRange = new Setting<>(25);
/**
* Allow users to control firework usage instead of Baritone. e.g. with their own client modules.
*/
public final Setting<Boolean> elytraUseFireworks = new Setting<>(true);
/**
* Allow Baritone to manage fireworks in the inventory and hotbar
*/
public final Setting<Boolean> elytraInventory = new Setting<>(true);
public final Setting<Double> elytraFireworkSpeed = new Setting<>(0.6);
public final Setting<Boolean> conserveFireworks = new Setting<>(true);
public final Setting<Boolean> renderRaytraces = new Setting<>(false);

61
src/main/java/baritone/behavior/ElytraBehavior.java
View File

@ -431,21 +431,16 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
if (forceUseFirework || (!firework
&& sinceFirework > 10
&& Baritone.settings().elytraUseFireworks.value
&& useOnDescend
&& (ctx.player().posY < goingTo.y - 5 || start.distanceTo(new Vec3d(goingTo.x + 0.5, ctx.player().posY, goingTo.z + 0.5)) > 5) // UGH!!!!!!!
&& currentSpeed < Baritone.settings().elytraFireworkSpeed.value)
) {
if (Baritone.settings().elytraInventory.value) {
final int firstFireworksInHotbar = firstFireworksInHotbar();
if (firstFireworksInHotbar == -1) {
if (!swapToFireworksInInventory()) {
logDirect("no fireworks");
return;
}
} else {
ctx.player().inventory.currentItem = firstFireworksInHotbar;
}
// Prioritize boosting fireworks over regular ones
// TODO: Take the minimum boost time into account?
if (!baritone.getInventoryBehavior().throwaway(true, ElytraBehavior::isBoostingFireworks) &&
!baritone.getInventoryBehavior().throwaway(true, ElytraBehavior::isFireworks)) {
logDirect("no fireworks");
return;
}
logDirect("attempting to use firework" + (forceUseFirework ? " takeoff" : ""));
ctx.playerController().processRightClick(ctx.player(), ctx.world(), EnumHand.MAIN_HAND);
@ -453,42 +448,18 @@ public final class ElytraBehavior extends Behavior implements IElytraBehavior, H
}
}
private boolean swapToFireworksInInventory() {
final int i = firstFireworksInInventory();
if (i != -1) {
baritone.getInventoryBehavior().attemptToPutOnHotbar(i, (slot) -> slot != 7);
ctx.player().inventory.currentItem = 7;
return true;
private static boolean isFireworks(final ItemStack itemStack) {
if (itemStack.getItem() != Items.FIREWORKS) {
return false;
}
return false;
}
private int firstFireworksInInventory() {
final NonNullList<ItemStack> invy = ctx.player().inventory.mainInventory;
for (int i = 0; i < invy.size(); i++) {
if (isBoostingFireworks(invy.get(i))) {
return i;
}
}
return -1;
}
private int firstFireworksInHotbar() {
final NonNullList<ItemStack> invy = ctx.player().inventory.mainInventory;
for (int i = 0; i < 9; i++) {
if (isBoostingFireworks(invy.get(i))) {
return i;
}
}
return -1;
}
private boolean isBoostingFireworks(final ItemStack itemStack) {
// If it has NBT data, make sure it won't cause us to explode.
final NBTTagCompound subCompound = itemStack.getSubCompound("Fireworks");
return itemStack.getItem() == Items.FIREWORKS
&& subCompound != null
&& subCompound.hasKey("Flight")
&& !subCompound.hasKey("Explosions");
return subCompound == null || !subCompound.hasKey("Explosions");
}
private static boolean isBoostingFireworks(final ItemStack itemStack) {
final NBTTagCompound subCompound = itemStack.getSubCompound("Fireworks");
return isFireworks(itemStack) && subCompound != null && subCompound.hasKey("Flight");
}
private boolean isFireworkActive() {