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

toolset

Browse Source
This commit is contained in:
Leijurv 2018-08-01 11:42:42 -04:00
parent 38a7b72570
commit cb4dac63c5
No known key found for this signature in database
GPG Key ID: 0936202430AE187C
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
util/ToolSet.java
View File

@ -8,10 +8,12 @@ package baritone.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.entity.EntityPlayerSP;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
/** /**
@ -19,31 +21,35 @@ import net.minecraft.util.math.BlockPos;
* @author avecowa * @author avecowa
*/ */
public class ToolSet { public class ToolSet {
public ArrayList<Item> tools; public ArrayList<Item> tools;
public ArrayList<Byte> slots; public ArrayList<Byte> slots;
public HashMap<Block, Byte> cache = new HashMap<Block, Byte>(); public HashMap<Block, Byte> cache = new HashMap<Block, Byte>();
public ToolSet(ArrayList<Item> tools, ArrayList<Byte> slots) { public ToolSet(ArrayList<Item> tools, ArrayList<Byte> slots) {
this.tools = tools; this.tools = tools;
this.slots = slots; this.slots = slots;
} }
public ToolSet() { public ToolSet() {
EntityPlayerSP p = Minecraft.getMinecraft().player; EntityPlayerSP p = Minecraft.getMinecraft().player;
ItemStack[] inv = p.inventory.mainInventory; NonNullList<ItemStack> inv = p.inventory.mainInventory;
tools = new ArrayList<Item>(); tools = new ArrayList<Item>();
slots = new ArrayList<Byte>(); slots = new ArrayList<Byte>();
//Out.log("inv: " + Arrays.toString(inv)); //Out.log("inv: " + Arrays.toString(inv));
boolean fnull = false; boolean fnull = false;
for (byte i = 0; i < 9; i++) { for (byte i = 0; i < 9; i++) {
if (!fnull || (inv[i] != null && inv[i].getItem().isItemTool(null))) { if (!fnull || (inv.get(i) != null && inv.get(i).getItem().isItemTool(null))) {
tools.add(inv[i] != null ? inv[i].getItem() : null); tools.add(inv.get(i) != null ? inv.get(i).getItem() : null);
slots.add(i); slots.add(i);
fnull |= inv[i] == null || (!inv[i].getItem().isDamageable()); fnull |= inv.get(i) == null || (!inv.get(i).getItem().isDamageable());
} }
} }
} }
public Item getBestTool(Block b) {
if (cache.get(b) != null) { public Item getBestTool(IBlockState b) {
return tools.get(cache.get(b)); if (cache.get(b.getBlock()) != null) {
return tools.get(cache.get(b.getBlock()));
} }
byte best = 0; byte best = 0;
//Out.log("best: " + best); //Out.log("best: " + best);
@ -62,12 +68,13 @@ public class ToolSet {
} }
} }
//Out.log("best: " + best); //Out.log("best: " + best);
cache.put(b, best); cache.put(b.getBlock(), best);
return tools.get(best); return tools.get(best);
} }
public byte getBestSlot(Block b) {
if (cache.get(b) != null) { public byte getBestSlot(IBlockState b) {
return slots.get(cache.get(b)); if (cache.get(b.getBlock()) != null) {
return slots.get(cache.get(b.getBlock()));
} }
byte best = 0; byte best = 0;
//Out.log("best: " + best); //Out.log("best: " + best);
@ -86,10 +93,11 @@ public class ToolSet {
} }
} }
//Out.log("best: " + best); //Out.log("best: " + best);
cache.put(b, best); cache.put(b.getBlock(), best);
return slots.get(best); return slots.get(best);
} }
public double getStrVsBlock(Block b, BlockPos pos) {
public double getStrVsBlock(IBlockState b, BlockPos pos) {
Item item = this.getBestTool(b); Item item = this.getBestTool(b);
if (item == null) { if (item == null) {
item = Item.getByNameOrId("minecraft:apple"); item = Item.getByNameOrId("minecraft:apple");
@ -97,7 +105,8 @@ public class ToolSet {
float f = b.getBlockHardness(Minecraft.getMinecraft().world, pos); float f = b.getBlockHardness(Minecraft.getMinecraft().world, pos);
return f < 0.0F ? 0.0F : (!canHarvest(b, item) ? item.getStrVsBlock(new ItemStack(item), b) / f / 100.0F : item.getStrVsBlock(new ItemStack(item), b) / f / 30.0F); return f < 0.0F ? 0.0F : (!canHarvest(b, item) ? item.getStrVsBlock(new ItemStack(item), b) / f / 100.0F : item.getStrVsBlock(new ItemStack(item), b) / f / 30.0F);
} }
public boolean canHarvest(Block blockIn, Item item) {
public boolean canHarvest(IBlockState blockIn, Item item) {
if (blockIn.getMaterial().isToolNotRequired()) { if (blockIn.getMaterial().isToolNotRequired()) {
return true; return true;
} else { } else {