schematic command file handling correction

also imports cleanup
DenizenScript · Feb 27, 2024 · a9b998a · a9b998a
1 parent 83951fb
commit a9b998a
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 9 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java b/plugin/src/main/java/com/denizenscript/denizen/events/npc/NPCStuckScriptEvent.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizencore.objects.ObjectTag;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.scripts.ScriptEntryData;
-import com.denizenscript.denizencore.utilities.CoreUtilities;
 import net.citizensnpcs.api.ai.TeleportStuckAction;
 import net.citizensnpcs.api.ai.event.NavigationStuckEvent;
 import org.bukkit.event.EventHandler;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/item/InventoryCommand.java
@@ -10,7 +10,6 @@
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsRuntimeException;
 import com.denizenscript.denizencore.scripts.commands.generator.*;
-import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.inventory.InventoryTrackerSystem;
 import com.denizenscript.denizen.utilities.inventory.SlotHelper;
 import com.denizenscript.denizencore.objects.*;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/SchematicCommand.java
@@ -344,17 +344,16 @@ public void execute(final ScriptEntry scriptEntry) {
                     scriptEntry.setFinished(true);
                     return;
                 }
-                String directory = URLDecoder.decode(System.getProperty("user.dir"));
-                File f = new File(directory + "/plugins/Denizen/schematics/" + fname + ".schem");
+                File f = new File(Denizen.getInstance().getDataFolder(), "schematics/" + fname + ".schem");
                 if (!Utilities.canReadFile(f)) {
                     Debug.echoError("Cannot read from that file path due to security settings in Denizen/config.yml.");
                     scriptEntry.setFinished(true);
                     return;
                 }
                 if (!f.exists()) {
-                    f = new File(directory + "/plugins/Denizen/schematics/" + fname + ".schematic");
+                    f = new File(Denizen.getInstance().getDataFolder(), "schematics/" + fname + ".schematic");
                     if (!f.exists()) {
-                        Debug.echoError("Schematic file " + fname + " does not exist. Are you sure it's in " + directory + "/plugins/Denizen/schematics/?");
+                        Debug.echoError("Schematic file " + fname + " does not exist. Are you sure it's in plugins/Denizen/schematics/?");
                         scriptEntry.setFinished(true);
                         return;
                     }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TickCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TickCommand.java
@@ -1,7 +1,6 @@
 package com.denizenscript.denizen.scripts.commands.world;
 
 import com.denizenscript.denizencore.exceptions.InvalidArgumentsRuntimeException;
-import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 import com.denizenscript.denizencore.scripts.commands.generator.*;
 import org.bukkit.Bukkit;

diff --git a/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/helpers/PlayerHelperImpl.java b/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/helpers/PlayerHelperImpl.java
@@ -54,7 +54,6 @@
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.phys.AABB;
 import org.bukkit.*;
 import org.bukkit.boss.BossBar;

diff --git a/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/BiomeNMSImpl.java b/v1_20/src/main/java/com/denizenscript/denizen/nms/v1_20/impl/BiomeNMSImpl.java
@@ -27,7 +27,6 @@
 import java.lang.invoke.MethodHandle;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Optional;
 
 public class BiomeNMSImpl extends BiomeNMS {

diff --git a/...enizenscript/denizen/nms/v1_20/impl/network/handlers/packet/FakePlayerPacketHandlers.java b/...enizenscript/denizen/nms/v1_20/impl/network/handlers/packet/FakePlayerPacketHandlers.java
@@ -1,5 +1,6 @@
 package com.denizenscript.denizen.nms.v1_20.impl.network.handlers.packet;
 
+/*
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.nms.v1_20.impl.entities.EntityFakePlayerImpl;
 import com.denizenscript.denizen.nms.v1_20.impl.network.handlers.DenizenNetworkManagerImpl;
@@ -8,6 +9,7 @@
 import org.bukkit.Bukkit;
 
 import java.util.List;
+*/
 
 public class FakePlayerPacketHandlers {