Skip to content

Commit d6c8113

Browse files
committed
Updated to newest FE! Testing still needed... probably...
1 parent 555582c commit d6c8113

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ minecraft {
6666
dependencies {
6767
testCompile "junit:junit:4.11"
6868
compile "com.esotericsoftware.reflectasm:reflectasm:${config.reflectasm_version}"
69-
compile "com.forgeessentials:forgeessentials:1.4.0-SNAPSHOT"
69+
compile "com.forgeessentials:forgeessentials:1.4-SNAPSHOT"
7070

7171
// Deps for Bukkit/Cauldron compat
7272
compile "org.bukkit:bukkit:1.7.9-R0.2"

src/main/java/myessentials/command/CommandModel.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package myessentials.command;
22

3+
import cpw.mods.fml.common.Optional;
34
import myessentials.utils.PlayerUtils;
45
import net.minecraft.command.CommandException;
56
import net.minecraft.command.ICommandSender;
67
import net.minecraft.entity.player.EntityPlayer;
78
import net.minecraft.server.MinecraftServer;
9+
import net.minecraftforge.permission.PermissionLevel;
10+
import net.minecraftforge.permission.PermissionObject;
811

912
import java.lang.reflect.Method;
1013
import java.util.Arrays;
@@ -13,7 +16,10 @@
1316
/**
1417
* Command model which instantiates all base commands that need to be registered to Minecraft
1518
*/
16-
public class CommandModel extends CmdBase {
19+
@Optional.InterfaceList({
20+
@Optional.Interface(iface = "net.minecraftforge.permission.PermissionObject", modid = "ForgeEssentials")
21+
})
22+
public class CommandModel extends CmdBase implements PermissionObject {
1723
/**
1824
* The Command annotation which holds information about the node's position.
1925
*/
@@ -41,6 +47,16 @@ public String getPermissionNode() {
4147
return commandAnnot.permission();
4248
}
4349

50+
@Override
51+
@Optional.Method(modid = "ForgeEssentials")
52+
public PermissionLevel getPermissionLevel() {
53+
if (commandAnnot.opsOnlyAccess()) {
54+
return PermissionLevel.OP;
55+
}
56+
57+
return PermissionLevel.FALSE;
58+
}
59+
4460
@Override
4561
public boolean canConsoleUseCommand() {
4662
return commandAnnot.console();
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package myessentials.command.registrar;
22

33
import net.minecraft.command.ICommand;
4-
import net.minecraftforge.fe.server.CommandHandlerForge;
5-
import net.minecraftforge.permissions.PermissionsManager;
4+
import net.minecraftforge.permission.PermissionLevel;
5+
import net.minecraftforge.permission.PermissionManager;
66

77
/**
88
* ForgeEssentials command registrar.
99
*/
1010
public class ForgeEssentialsCommandRegistrar implements ICommandRegistrar {
1111
@Override
1212
public void registerCommand(ICommand cmd, String permNode, boolean defaultPerm) {
13-
CommandHandlerForge.registerCommand(cmd, permNode, PermissionsManager.RegisteredPermValue.fromBoolean(defaultPerm));
13+
PermissionManager.registerPermission(permNode, PermissionLevel.fromBoolean(defaultPerm));
1414
}
1515
}

0 commit comments

Comments
 (0)