Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
| Version | Released at |
| :-----: | :---------: |
| v2.0.0 | 04/11/2018 |

Changelog
=======

v2.0.0
-----
- Right click layers
- Add commands
- UTF-8 (#6)
- Add way to move buttons (#2)
- Add buttons
- Modify & add layers
- Added layer support
- Send anonymous usage data
- Add version checking
- Repeatable commands
- Modify & add keybindings
- Reimplemented Key handling
- Loading keybindings via service
- Redefining saving mechanism
- Rewrite MacroKey from scratch
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ buildConfig {
buildConfigField "String", "fingerprint", project.findProperty('signingFingerprint')
buildConfigField "String", "updateJSON",
config.update_url +
'?mkver=' + config.mod_version +
'?mkver=' + project.version +
'&mcver=' + config.mc_version +
'&fmver=' + config.forge_version +
'&fngpt=' + project.findProperty('signingFingerprint')
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/com/mattsmeets/macrokey/command/CommandLayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

import javax.annotation.Nullable;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

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

if (args[1].equals("toggle")) {
this.printLayerInformation(sender);
this.nextLayer(server, sender, new String[] {args[0]});

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

@Override
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
return Arrays.asList(new String[] {"toggle"});
List<String> list = new ArrayList<String>();
list.add("toggle");

return list;
}

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

this.execute(server, sender, new String[] {args[0]});
this.execute(server, sender, args);
} catch (IOException e) {
e.printStackTrace();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextComponentString;
import scala.actors.threadpool.Arrays;

import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;

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

return Arrays.asList(this.subCommands.keySet().toArray());
List<String> list = new ArrayList<String>();
list.add("open");
list.add("layer");

return list;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import scala.actors.threadpool.Arrays;

import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

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

@Override
public List<String> getTabCompletions(MinecraftServer server, ICommandSender sender, String[] args, @Nullable BlockPos targetPos) {
return Arrays.asList(new String[]{});
List<String> list = new ArrayList<String>();

return list;
}
}