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

Selection shifting and such

Browse Source
This commit is contained in:
Logan Darklock
2019-09-03 06:09:02 -07:00
parent 289971557a
commit 65d2bdaf2b
5 changed files with 284 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/baritone/selection/Selection.java
View File

@@ -116,9 +116,9 @@ public class Selection implements ISelection {
@Override
public ISelection contract(EnumFacing direction, int blocks) {
if (isPos2(direction)) {
return new Selection(pos1.offset(direction, -blocks), pos2);
return new Selection(pos1.offset(direction, blocks), pos2);
} else {
return new Selection(pos1, pos2.offset(direction, -blocks));
return new Selection(pos1, pos2.offset(direction, blocks));
}
}

62
src/main/java/baritone/selection/SelectionManager.java
View File

@@ -3,12 +3,13 @@ package baritone.selection;
import baritone.api.selection.ISelection;
import baritone.api.selection.ISelectionManager;
import baritone.api.utils.BetterBlockPos;
import net.minecraft.util.EnumFacing;
import java.util.LinkedHashSet;
import java.util.Set;
import java.util.LinkedList;
import java.util.ListIterator;
public class SelectionManager implements ISelectionManager {
private final Set<ISelection> selections = new LinkedHashSet<>();
private final LinkedList<ISelection> selections = new LinkedList<>();
private ISelection[] selectionsArr = new ISelection[0];
public SelectionManager() {
@@ -54,7 +55,60 @@ public class SelectionManager implements ISelectionManager {
@Override
public synchronized ISelection getOnlySelection() {
if (selections.size() == 1) {
return selections.iterator().next();
return selections.peekFirst();
}
return null;
}
@Override
public ISelection getLastSelection() {
return selections.peekLast();
}
@Override
public synchronized ISelection expand(ISelection selection, EnumFacing direction, int blocks) {
for (ListIterator<ISelection> it = selections.listIterator(); it.hasNext(); ) {
ISelection current = it.next();
if (current == selection) {
it.remove();
it.add(current.expand(direction, blocks));
resetSelectionsArr();
return it.previous();
}
}
return null;
}
@Override
public synchronized ISelection contract(ISelection selection, EnumFacing direction, int blocks) {
for (ListIterator<ISelection> it = selections.listIterator(); it.hasNext(); ) {
ISelection current = it.next();
if (current == selection) {
it.remove();
it.add(current.contract(direction, blocks));
resetSelectionsArr();
return it.previous();
}
}
return null;
}
@Override
public synchronized ISelection shift(ISelection selection, EnumFacing direction, int blocks) {
for (ListIterator<ISelection> it = selections.listIterator(); it.hasNext(); ) {
ISelection current = it.next();
if (current == selection) {
it.remove();
it.add(current.shift(direction, blocks));
resetSelectionsArr();
return it.previous();
}
}
return null;