diff --git a/build.gradle b/build.gradle index d7092be2b..63d7f2d77 100644 --- a/build.gradle +++ b/build.gradle @@ -5,6 +5,12 @@ plugins { id 'idea' } +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } +} + version = "1.10.2" group= "kamkeel.customnpc-plus" archivesBaseName = "CustomNPC-Plus" diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java index 4eb764103..ee2cf1ae5 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java +++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java @@ -1,13 +1,13 @@ package noppes.npcs.controllers; import cpw.mods.fml.common.eventhandler.Event; -import jdk.nashorn.api.scripting.ScriptObjectMirror; import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NBTTags; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.EnumScriptType; import noppes.npcs.controllers.data.IScriptHandler; import noppes.npcs.scripted.NpcAPI; +import org.openjdk.nashorn.api.scripting.ScriptObjectMirror; import javax.script.*; import java.io.PrintWriter; diff --git a/src/main/java/noppes/npcs/controllers/ScriptController.java b/src/main/java/noppes/npcs/controllers/ScriptController.java index 81f9e65c4..e3f3a0e2a 100644 --- a/src/main/java/noppes/npcs/controllers/ScriptController.java +++ b/src/main/java/noppes/npcs/controllers/ScriptController.java @@ -1,8 +1,6 @@ package noppes.npcs.controllers; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import jdk.nashorn.api.scripting.ClassFilter; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -21,6 +19,8 @@ import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.ScriptWorld; import noppes.npcs.util.JsonException; import noppes.npcs.util.NBTJsonUtil; +import org.openjdk.nashorn.api.scripting.ClassFilter; +import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory; import javax.script.ScriptContext; import javax.script.ScriptEngine;