Skip to content

Commit de5641f

Browse files
committed
Fix crashing bug, cannot find scala/actors/threadpool/Arrays
1 parent 04942e7 commit de5641f

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

src/main/java/com/mattsmeets/macrokey/command/CommandLayer.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414

1515
import javax.annotation.Nullable;
1616
import java.io.IOException;
17+
import java.util.ArrayList;
18+
import java.util.Collections;
1719
import java.util.List;
1820

1921
public class CommandLayer extends StrippedCommand {
@@ -33,7 +35,7 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
3335
}
3436

3537
if (args[1].equals("toggle")) {
36-
this.printLayerInformation(sender);
38+
this.nextLayer(server, sender, new String[] {args[0]});
3739

3840
return;
3941
}
@@ -43,7 +45,10 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
4345

4446
@Override
4547
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
46-
return Arrays.asList(new String[] {"toggle"});
48+
List<String> list = new ArrayList<String>();
49+
list.add("toggle");
50+
51+
return list;
4752
}
4853

4954
@Override
@@ -81,7 +86,7 @@ private void nextLayer(MinecraftServer server, ICommandSender sender, String[] a
8186
try {
8287
MacroKey.instance.modState.nextLayer();
8388

84-
this.execute(server, sender, new String[] {args[0]});
89+
this.execute(server, sender, args);
8590
} catch (IOException e) {
8691
e.printStackTrace();
8792
}

src/main/java/com/mattsmeets/macrokey/command/CommandMacroKey.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import net.minecraft.server.MinecraftServer;
88
import net.minecraft.util.math.BlockPos;
99
import net.minecraft.util.text.TextComponentString;
10-
import scala.actors.threadpool.Arrays;
1110

1211
import javax.annotation.Nullable;
12+
import java.util.ArrayList;
13+
import java.util.Arrays;
1314
import java.util.HashMap;
1415
import java.util.List;
1516

@@ -62,6 +63,10 @@ public List<String> getTabCompletions(MinecraftServer server, ICommandSender sen
6263
return this.subCommands.get(args[0].toLowerCase()).getTabCompletions(server, sender, args, targetPos);
6364
}
6465

65-
return Arrays.asList(this.subCommands.keySet().toArray());
66+
List<String> list = new ArrayList<String>();
67+
list.add("open");
68+
list.add("layer");
69+
70+
return list;
6671
}
6772
}

src/main/java/com/mattsmeets/macrokey/command/CommandOpenGUI.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
import net.minecraftforge.common.MinecraftForge;
1010
import net.minecraftforge.fml.relauncher.Side;
1111
import net.minecraftforge.fml.relauncher.SideOnly;
12-
import scala.actors.threadpool.Arrays;
1312

1413
import javax.annotation.Nullable;
14+
import java.util.ArrayList;
15+
import java.util.Arrays;
16+
import java.util.Collections;
1517
import java.util.List;
1618

1719
public class CommandOpenGUI extends StrippedCommand {
@@ -24,6 +26,8 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
2426

2527
@Override
2628
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
27-
return Arrays.asList(new String[]{});
29+
List<String> list = new ArrayList<String>();
30+
31+
return list;
2832
}
2933
}

0 commit comments

Comments
 (0)