diff --git a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index d757b42..9f488f3 100644 --- a/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -140,7 +141,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !(stack.getEntity() instanceof Player) || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !(stack.getEntity() instanceof Player) || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); } catch (Exception e) { diff --git a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.19.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.19.3/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.20.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.20.4/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.20/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.20/changelog.md b/1.20/changelog.md index 1c28ab9..d61bfe4 100644 --- a/1.20/changelog.md +++ b/1.20/changelog.md @@ -5,4 +5,4 @@ **New Features**: -- Added Nojang API to allow mods to access GameRules (SDLink) \ No newline at end of file +- Added Nojang API to allow mods to access GameRules (SDLink) diff --git a/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.21.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.21.2/settings.gradle b/1.21.2/settings.gradle index d1bb9ba..2a1fbd7 100644 --- a/1.21.2/settings.gradle +++ b/1.21.2/settings.gradle @@ -15,4 +15,4 @@ pluginManagement { rootProject.name = 'CraterLib' include("Common", "Fabric", "NeoForge") -include 'Paper' \ No newline at end of file +include 'Paper' diff --git a/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java b/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java index 9e3d459..10e27ad 100644 --- a/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/1.21/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java @@ -2,6 +2,7 @@ package com.hypherionmc.craterlib.api.commands; import com.hypherionmc.craterlib.CraterConstants; import com.hypherionmc.craterlib.compat.LuckPermsCompat; +import com.hypherionmc.craterlib.core.platform.LoaderType; import com.hypherionmc.craterlib.core.platform.ModloaderEnvironment; import com.hypherionmc.craterlib.nojang.authlib.BridgedGameProfile; import com.hypherionmc.craterlib.nojang.commands.BridgedCommandSourceStack; @@ -139,7 +140,7 @@ public class CraterCommand { private boolean checkPermission(CommandSourceStack stack) { try { - if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) + if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel); diff --git a/1.21/settings.gradle b/1.21/settings.gradle index d1bb9ba..2a1fbd7 100644 --- a/1.21/settings.gradle +++ b/1.21/settings.gradle @@ -15,4 +15,4 @@ pluginManagement { rootProject.name = 'CraterLib' include("Common", "Fabric", "NeoForge") -include 'Paper' \ No newline at end of file +include 'Paper' diff --git a/commit.sha b/commit.sha index 0f5ad10..7fcf790 100644 --- a/commit.sha +++ b/commit.sha @@ -1 +1 @@ -76be1292f9cd9a89da05dd2ea9601f57feec7d5a \ No newline at end of file +3680e085db3b4b74a2885c79ad909e7170e71403 \ No newline at end of file diff --git a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java.patch b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java.patch index 916d041..9670bf7 100644 --- a/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java.patch +++ b/patches/1.18.2/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java.patch @@ -1,6 +1,6 @@ --- a/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java +++ b/Common/src/main/java/com/hypherionmc/craterlib/api/commands/CraterCommand.java -@@ -15,6 +15,7 @@ +@@ -16,6 +16,7 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraft.commands.arguments.GameProfileArgument; @@ -8,7 +8,7 @@ import net.minecraft.world.entity.player.Player; import org.jetbrains.annotations.ApiStatus; -@@ -54,7 +55,7 @@ +@@ -55,7 +56,7 @@ public CraterCommand withGameProfilesArgument(String key, CommandExecutorWithArgs> executor) { this.mojangCommand.then(Commands.argument(key, GameProfileArgument.gameProfile()) .executes(context -> executor.run( @@ -17,7 +17,7 @@ GameProfileArgument.getGameProfiles(context, key).stream().map(BridgedGameProfile::of).toList(), BridgedCommandSourceStack.of(context.getSource())) )); -@@ -64,7 +65,7 @@ +@@ -65,7 +66,7 @@ public CraterCommand withBoolArgument(String key, CommandExecutorWithArgs executor) { this.mojangCommand.then(Commands.argument(key, BoolArgumentType.bool()) .executes(context -> executor.run( @@ -26,7 +26,7 @@ BoolArgumentType.getBool(context, key), BridgedCommandSourceStack.of(context.getSource()) ))); -@@ -74,7 +75,7 @@ +@@ -75,7 +76,7 @@ public CraterCommand withWordArgument(String key, CommandExecutorWithArgs executor) { this.mojangCommand.then(Commands.argument(key, StringArgumentType.word()) .executes(context -> executor.run( @@ -35,7 +35,7 @@ StringArgumentType.getString(context, key), BridgedCommandSourceStack.of(context.getSource()) ))); -@@ -84,7 +85,7 @@ +@@ -85,7 +86,7 @@ public CraterCommand withStringArgument(String key, CommandExecutorWithArgs executor) { this.mojangCommand.then(Commands.argument(key, StringArgumentType.string()) .executes(context -> executor.run( @@ -44,7 +44,7 @@ StringArgumentType.getString(context, key), BridgedCommandSourceStack.of(context.getSource()) ))); -@@ -94,7 +95,7 @@ +@@ -95,7 +96,7 @@ public CraterCommand withPhraseArgument(String key, CommandExecutorWithArgs executor) { this.mojangCommand.then(Commands.argument(key, StringArgumentType.greedyString()) .executes(context -> executor.run( @@ -53,7 +53,7 @@ StringArgumentType.getString(context, key), BridgedCommandSourceStack.of(context.getSource()) ))); -@@ -104,7 +105,7 @@ +@@ -105,7 +106,7 @@ public CraterCommand withIntegerArgument(String key, CommandExecutorWithArgs executor) { this.mojangCommand.then(Commands.argument(key, IntegerArgumentType.integer()) .executes(context -> executor.run( @@ -62,12 +62,12 @@ IntegerArgumentType.getInteger(context, key), BridgedCommandSourceStack.of(context.getSource()) ))); -@@ -139,14 +140,14 @@ +@@ -140,14 +141,14 @@ private boolean checkPermission(CommandSourceStack stack) { try { -- if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !stack.isPlayer() || luckPermNode.isEmpty()) -+ if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || !(stack.getEntity() instanceof Player) || luckPermNode.isEmpty()) +- if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !stack.isPlayer() || luckPermNode.isEmpty()) ++ if (!ModloaderEnvironment.INSTANCE.isModLoaded("luckperms") || ModloaderEnvironment.INSTANCE.getLoaderType() == LoaderType.PAPER || !(stack.getEntity() instanceof Player) || luckPermNode.isEmpty()) return stack.hasPermission(this.permLevel); - return LuckPermsCompat.INSTANCE.hasPermission(stack.getPlayer(), this.luckPermNode) || stack.hasPermission(this.permLevel);