diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 228b351..888bc59 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,7 +13,6 @@ <option value="$PROJECT_DIR$/common" /> <option value="$PROJECT_DIR$/platforms" /> <option value="$PROJECT_DIR$/platforms/spigot" /> - <option value="$PROJECT_DIR$/test-plugin" /> </set> </option> </GradleProjectSettings> diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 57f7120..b1ea36f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -4,12 +4,7 @@ <option name="autoReloadType" value="SELECTIVE" /> </component> <component name="ChangeListManager"> - <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment=""> - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/Metadata.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/Metadata.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java" afterDir="false" /> - <change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityEquipment.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntityEquipment.java" afterDir="false" /> - </list> + <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="" /> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -42,20 +37,13 @@ <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="EntityLib" type="f1a62948:ProjectNode" /> - <item name="test-plugin" type="2d1252cf:ModuleNode" /> - </path> - <path> - <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> - <item name="EntityLib" type="f1a62948:ProjectNode" /> - <item name="test-plugin" type="2d1252cf:ModuleNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" /> </path> <path> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="EntityLib" type="f1a62948:ProjectNode" /> - <item name="test-plugin" type="2d1252cf:ModuleNode" /> <item name="Tasks" type="e4a08cd1:TasksNode" /> - <item name="run paper" type="c8890929:TasksNode$1" /> + <item name="publishing" type="c8890929:TasksNode$1" /> </path> </expand> <select /> @@ -89,37 +77,39 @@ <option name="showExcludedFiles" value="false" /> <option name="showLibraryContents" value="true" /> </component> - <component name="PropertiesComponent">{ - "keyToString": { - "Downloaded.Files.Path.Enabled": "false", - "Gradle.Build EntityLib.executor": "Run", - "Gradle.EntityLib [dependencies].executor": "Run", - "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run", - "Gradle.EntityLib:test-plugin [runServer].executor": "Run", - "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run", - "Repository.Attach.Annotations": "false", - "Repository.Attach.JavaDocs": "false", - "Repository.Attach.Sources": "false", - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "git-widget-placeholder": "feat/platform-api", - "ignore.virus.scanning.warn.message": "true", - "jdk.selected.JAVA_MODULE": "corretto-17", - "kotlin-language-version-configured": "true", - "last_opened_file_path": "D:/Github/EntityLib/api/src/main/java/me/tofaa/entitylib/extras", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "project.structure.last.edited": "Project", - "project.structure.proportion": "0.15", - "project.structure.side.proportion": "0.2", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + <component name="PropertiesComponent"><![CDATA[{ + "keyToString": { + "Downloaded.Files.Path.Enabled": "false", + "Gradle.Build EntityLib.executor": "Run", + "Gradle.EntityLib [dependencies].executor": "Run", + "Gradle.EntityLib [publish].executor": "Run", + "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run", + "Gradle.EntityLib:test-plugin [publish].executor": "Run", + "Gradle.EntityLib:test-plugin [runServer].executor": "Run", + "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run", + "Repository.Attach.Annotations": "false", + "Repository.Attach.JavaDocs": "false", + "Repository.Attach.Sources": "false", + "RunOnceActivity.OpenProjectViewOnStart": "true", + "RunOnceActivity.ShowReadmeOnStart": "true", + "WebServerToolWindowFactoryState": "false", + "git-widget-placeholder": "master", + "ignore.virus.scanning.warn.message": "true", + "jdk.selected.JAVA_MODULE": "corretto-17", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "D:/Github/EntityLib/api/src/main/java/me/tofaa/entitylib/extras", + "node.js.detected.package.eslint": "true", + "node.js.detected.package.tslint": "true", + "node.js.selected.package.eslint": "(autodetect)", + "node.js.selected.package.tslint": "(autodetect)", + "nodejs_package_manager_path": "npm", + "project.structure.last.edited": "Modules", + "project.structure.proportion": "0.15", + "project.structure.side.proportion": "0.2", + "settings.editor.selected.configurable": "preferences.pluginManager", + "vue.rearranger.settings.migration": "true" } -}</component> +}]]></component> <component name="RecentsManager"> <key name="CopyFile.RECENT_KEYS"> <recent name="D:\Github\EntityLib\api\src\main\java\me\tofaa\entitylib\extras" /> @@ -127,7 +117,7 @@ <recent name="D:\Github\EntityLib\test-plugin" /> </key> </component> - <component name="RunManager" selected="Gradle.EntityLib:test-plugin [runServer]"> + <component name="RunManager" selected="Gradle.EntityLib [publish]"> <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <option name="MAIN_CLASS_NAME" value="me.tofaa.entitylib.codegen.Main" /> <module name="EntityLib.code-gen.main" /> @@ -141,7 +131,7 @@ <option name="Make" enabled="true" /> </method> </configuration> - <configuration name="EntityLib [dependencies]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> + <configuration name="EntityLib [publish]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <ExternalSystemSettings> <option name="executionName" /> <option name="externalProjectPath" value="$PROJECT_DIR$" /> @@ -152,7 +142,29 @@ </option> <option name="taskNames"> <list> - <option value="dependencies" /> + <option value="publish" /> + </list> + </option> + <option name="vmOptions" /> + </ExternalSystemSettings> + <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> + <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> + <DebugAllEnabled>false</DebugAllEnabled> + <RunAsTest>false</RunAsTest> + <method v="2" /> + </configuration> + <configuration name="EntityLib:test-plugin [publish]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" value="$PROJECT_DIR$/test-plugin" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list> + <option value="publish" /> </list> </option> <option name="vmOptions" /> @@ -207,44 +219,21 @@ <RunAsTest>false</RunAsTest> <method v="2" /> </configuration> - <configuration name="PE-EntityMeta [compileTestJava]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> - <ExternalSystemSettings> - <option name="executionName" /> - <option name="externalProjectPath" value="$PROJECT_DIR$" /> - <option name="externalSystemIdString" value="GRADLE" /> - <option name="scriptParameters" /> - <option name="taskDescriptions"> - <list /> - </option> - <option name="taskNames"> - <list> - <option value="compileTestJava" /> - </list> - </option> - <option name="vmOptions" /> - </ExternalSystemSettings> - <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess> - <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess> - <DebugAllEnabled>false</DebugAllEnabled> - <RunAsTest>false</RunAsTest> - <method v="2" /> - </configuration> <recent_temporary> <list> + <item itemvalue="Gradle.EntityLib [publish]" /> + <item itemvalue="Gradle.EntityLib:test-plugin [publish]" /> <item itemvalue="Gradle.EntityLib:test-plugin [runServer]" /> <item itemvalue="Gradle.EntityLib:test-plugin [shadowJar]" /> <item itemvalue="Application.Main" /> - <item itemvalue="Gradle.EntityLib [dependencies]" /> - <item itemvalue="Gradle.PE-EntityMeta [compileTestJava]" /> </list> </recent_temporary> </component> <component name="SharedIndexes"> <attachedChunks> <set> - <option value="jdk-1.8.0_392-corretto-1.8.0_392-3183f394aec4-cb300fc7" /> - <option value="jdk-17.0.10-corretto-17.0.10-3183f394aec4-cf227e86" /> - <option value="jdk-17.0.9-corretto-17.0.9-3183f394aec4-8f899f12" /> + <option value="jdk-17.0.10-temurin-17.0.10-4caba194b151-b3785831" /> + <option value="jdk-21.0.2-openjdk-21.0.2-4caba194b151-4f524021" /> </set> </attachedChunks> </component> @@ -298,12 +287,17 @@ <workItem from="1707219870641" duration="5522000" /> <workItem from="1707300688189" duration="1512000" /> <workItem from="1707381529971" duration="921000" /> + <workItem from="1708165509853" duration="12086000" /> </task> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="3" /> </component> + <component name="UnknownFeatures"> + <option featureType="dependencySupport" implementationName="java:net.kyori:adventure-api" /> + <option featureType="dependencySupport" implementationName="java:org.spigotmc:spigot-api" /> + </component> <component name="XDebuggerManager"> <breakpoint-manager> <breakpoints> @@ -314,7 +308,7 @@ </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java</url> - <line>37</line> + <line>33</line> <option name="timeStamp" value="3" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-method"> diff --git a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java index 0ce32de..283c113 100644 --- a/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java +++ b/api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java @@ -80,6 +80,10 @@ public class WrapperEntity implements Tickable { return true; } + public void setLocation(Location location) { + this.location = location; + } + public void remove() { EntityLib.getApi().removeEntity(this); }