Miko/baritone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.13.2

Browse Source
This commit is contained in:
Leijurv
2019-10-11 16:56:04 -07:00
parent 861ee5049a 2f9efae457
commit 1c00e167ca
23 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/baritone/api/process/IBuilderProcess.java
View File

@@ -17,7 +17,7 @@
package baritone.api.process;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.util.math.BlockPos;

2
src/api/java/baritone/api/schematic/AbstractSchematic.java
View File

@@ -17,8 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
public abstract class AbstractSchematic implements ISchematic {
protected int x;

1
src/api/java/baritone/api/schematic/CompositeSchematic.java
View File

@@ -17,7 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState;
import java.util.ArrayList;

2
src/api/java/baritone/api/schematic/CompositeSchematicEntry.java
View File

@@ -17,8 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
public class CompositeSchematicEntry {
public final ISchematic schematic;

2
src/api/java/baritone/api/utils/ISchematic.java → src/api/java/baritone/api/schematic/ISchematic.java
View File

@@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils;
package baritone.api.schematic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.EnumFacing;

1
src/api/java/baritone/api/schematic/MaskSchematic.java
View File

@@ -17,7 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState;
import java.util.List;

1
src/api/java/baritone/api/schematic/ReplaceSchematic.java
View File

@@ -18,7 +18,6 @@
package baritone.api.schematic;
import baritone.api.utils.BlockOptionalMetaLookup;
import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState;
public class ReplaceSchematic extends MaskSchematic {

1
src/api/java/baritone/api/schematic/ShellSchematic.java
View File

@@ -17,7 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState;
public class ShellSchematic extends MaskSchematic {

1
src/api/java/baritone/api/schematic/WallsSchematic.java
View File

@@ -17,7 +17,6 @@
package baritone.api.schematic;
import baritone.api.utils.ISchematic;
import net.minecraft.block.state.IBlockState;
public class WallsSchematic extends MaskSchematic {

2
src/api/java/baritone/api/utils/BlockOptionalMeta.java
View File

@@ -17,7 +17,7 @@
package baritone.api.utils;
import baritone.api.accessor.IItemStack;
import baritone.api.utils.accessor.IItemStack;
import com.google.common.collect.ImmutableSet;
import net.minecraft.block.*;
import net.minecraft.block.state.IBlockState;

2
src/api/java/baritone/api/accessor/IItemStack.java → src/api/java/baritone/api/utils/accessor/IItemStack.java
View File

@@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.accessor;
package baritone.api.utils.accessor;
public interface IItemStack {

2
src/launch/java/baritone/launch/mixins/MixinGuiScreen.java
View File

@@ -17,7 +17,7 @@
package baritone.launch.mixins;
import baritone.api.accessor.IGuiScreen;
import baritone.utils.accessor.IGuiScreen;
import net.minecraft.client.gui.GuiScreen;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;

2
src/launch/java/baritone/launch/mixins/MixinItemStack.java
View File

@@ -17,7 +17,7 @@
package baritone.launch.mixins;
import baritone.api.accessor.IItemStack;
import baritone.api.utils.accessor.IItemStack;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Final;

4
src/main/java/baritone/behavior/InventoryBehavior.java
View File

@@ -151,7 +151,7 @@ public final class InventoryBehavior extends Behavior {
public boolean throwaway(boolean select, Predicate<? super ItemStack> desired) {
EntityPlayerSP p = ctx.player();
NonNullList<ItemStack> inv = p.inventory.mainInventory;
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack item = inv.get(i);
// this usage of settings() is okay because it's only called once during pathing
// (while creating the CalculationContext at the very beginning)
@@ -171,7 +171,7 @@ public final class InventoryBehavior extends Behavior {
// we've already checked above ^ and the main hand can't possible have an acceptablethrowawayitem
// so we need to select in the main hand something that doesn't right click
// so not a shovel, not a hoe, not a block, etc
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack item = inv.get(i);
if (item.isEmpty() || item.getItem() instanceof ItemPickaxe) {
if (select) {

2
src/main/java/baritone/command/BaritoneChatControl.java
View File

@@ -20,7 +20,7 @@ package baritone.command;
import baritone.api.BaritoneAPI;
import baritone.api.IBaritone;
import baritone.api.Settings;
import baritone.api.accessor.IGuiScreen;
import baritone.utils.accessor.IGuiScreen;
import baritone.api.event.events.ChatEvent;
import baritone.api.event.events.TabCompleteEvent;
import baritone.api.event.listener.AbstractGameEventListener;

2
src/main/java/baritone/command/defaults/SelCommand.java
View File

@@ -27,7 +27,7 @@ import baritone.api.selection.ISelectionManager;
import baritone.api.utils.BetterBlockPos;
import baritone.api.utils.BlockOptionalMeta;
import baritone.api.utils.BlockOptionalMetaLookup;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import baritone.api.command.Command;
import baritone.api.command.datatypes.ForBlockOptionalMeta;
import baritone.api.command.datatypes.ForEnumFacing;

1
src/main/java/baritone/process/BuilderProcess.java
View File

@@ -25,6 +25,7 @@ import baritone.api.pathing.goals.GoalGetToBlock;
import baritone.api.process.IBuilderProcess;
import baritone.api.process.PathingCommand;
import baritone.api.process.PathingCommandType;
import baritone.api.schematic.ISchematic;
import baritone.api.utils.*;
import baritone.api.utils.input.Input;
import baritone.pathing.movement.CalculationContext;

8
src/main/java/baritone/utils/ToolSet.java
View File

@@ -92,15 +92,15 @@ public class ToolSet {
* Calculate which tool on the hotbar is best for mining
*
* @param b the blockstate to be mined
* @return A byte containing the index in the tools array that worked best
* @return An int containing the index in the tools array that worked best
*/
public byte getBestSlot(Block b, boolean preferSilkTouch) {
byte best = 0;
public int getBestSlot(Block b, boolean preferSilkTouch) {
int best = 0;
double highestSpeed = Double.NEGATIVE_INFINITY;
int lowestCost = Integer.MIN_VALUE;
boolean bestSilkTouch = false;
IBlockState blockState = b.getDefaultState();
for (byte i = 0; i < 9; i++) {
for (int i = 0; i < 9; i++) {
ItemStack itemStack = player.inventory.getStackInSlot(i);
double speed = calculateSpeedVsBlock(itemStack, blockState);
boolean silkTouch = hasSilkTouch(itemStack);

2
src/api/java/baritone/api/accessor/IGuiScreen.java → src/main/java/baritone/utils/accessor/IGuiScreen.java
View File

@@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.accessor;
package baritone.utils.accessor;
import java.net.URI;

2
src/main/java/baritone/utils/schematic/FillSchematic.java
View File

@@ -17,7 +17,7 @@
package baritone.utils.schematic;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import net.minecraft.block.state.IBlockState;
import java.util.List;

2
src/main/java/baritone/utils/schematic/Schematic.java
View File

@@ -17,7 +17,7 @@
package baritone.utils.schematic;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import net.minecraft.block.state.IBlockState;
import net.minecraft.nbt.NBTTagCompound;

2
src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java
View File

@@ -17,7 +17,7 @@
package baritone.utils.schematic.schematica;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import com.github.lunatrius.schematica.client.world.SchematicWorld;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos;

2
src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java
View File

@@ -17,7 +17,7 @@
package baritone.utils.schematic.schematica;
import baritone.api.utils.ISchematic;
import baritone.api.schematic.ISchematic;
import com.github.lunatrius.schematica.Schematica;
import com.github.lunatrius.schematica.proxy.ClientProxy;
import net.minecraft.util.Tuple;