diff --git a/build.gradle.kts b/build.gradle.kts index 7ddf630f..06d26d5b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { `java-library` id("com.github.johnrengelman.shadow") version "8.1.1" // For ingametesting - id("io.papermc.paperweight.userdev") version "1.5.10" + //id("io.papermc.paperweight.userdev") version "1.5.10" idea } @@ -52,16 +52,18 @@ dependencies { // For BSON file serialisation implementation("org.mongodb:bson:4.11.1") // Spigot - //compileOnly("org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT") + compileOnly("org.spigotmc:spigot-api:1.20.3-R0.1-SNAPSHOT") // ProtocolLib compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0") //For ingametesting // Mojang mappings for NMS + /* compileOnly("com.mojang:authlib:4.0.43") paperweight.paperDevBundle("1.19.2-R0.1-SNAPSHOT") // For reflection remapping implementation("xyz.jpenilla:reflection-remapper:0.1.1") + */ } group = "kernitus.plugin.OldCombatMechanics" @@ -71,14 +73,14 @@ description = "OldCombatMechanics" java { toolchain { // At least 17 required for MC 1.19 for ingametesting - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(8)) } } sourceSets { main { java { - //exclude("kernitus/plugin/OldCombatMechanics/tester/**") + exclude("kernitus/plugin/OldCombatMechanics/tester/**") } } } @@ -97,19 +99,21 @@ tasks.withType { tasks.named("shadowJar") { dependsOn("jar") - //archiveFileName.set("${project.name}.jar") + archiveFileName.set("${project.name}.jar") dependencies { relocate("org.bstats", "kernitus.plugin.OldCombatMechanics.lib.bstats") } } // For ingametesting +/* tasks.reobfJar { outputJar.set(File(buildDir, "libs/${project.name}.jar")) } + */ tasks.assemble { // For ingametesting - dependsOn("reobfJar") - //dependsOn("shadowJar") + //dependsOn("reobfJar") + dependsOn("shadowJar") } \ No newline at end of file diff --git a/src/main/java/kernitus/plugin/OldCombatMechanics/commands/OCMCommandHandler.java b/src/main/java/kernitus/plugin/OldCombatMechanics/commands/OCMCommandHandler.java index 0154e091..8fac2ec6 100644 --- a/src/main/java/kernitus/plugin/OldCombatMechanics/commands/OCMCommandHandler.java +++ b/src/main/java/kernitus/plugin/OldCombatMechanics/commands/OCMCommandHandler.java @@ -7,14 +7,12 @@ import kernitus.plugin.OldCombatMechanics.ModuleLoader; import kernitus.plugin.OldCombatMechanics.OCMMain; -import kernitus.plugin.OldCombatMechanics.tester.InGameTester; import kernitus.plugin.OldCombatMechanics.utilities.Config; import kernitus.plugin.OldCombatMechanics.utilities.Messenger; import kernitus.plugin.OldCombatMechanics.utilities.storage.PlayerData; import kernitus.plugin.OldCombatMechanics.utilities.storage.PlayerStorage; import org.bukkit.Bukkit; import org.bukkit.ChatColor; -import org.bukkit.Location; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -31,7 +29,7 @@ public class OCMCommandHandler implements CommandExecutor { private final OCMMain plugin; - enum Subcommand {reload, mode, test} + enum Subcommand {reload, mode } public OCMCommandHandler(OCMMain instance) { this.plugin = instance; @@ -136,6 +134,7 @@ private void mode(CommandSender sender, String[] args) { ModuleLoader.getModules().forEach(module -> module.onModesetChange(playerCopy)); } + /* private void test(OCMMain plugin, CommandSender sender) { final Location location = sender instanceof Player ? ((Player) sender).getLocation() : @@ -143,6 +142,7 @@ private void test(OCMMain plugin, CommandSender sender) { new InGameTester(plugin).performTests(sender, location); } + */ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, String[] args) { if (args.length < 1) { @@ -156,9 +156,11 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @N case reload: reload(sender); break; + /* case test: test(plugin, sender); break; + */ case mode: mode(sender, args); break;