Misc fixes

This commit is contained in:
Tofaa2 2024-05-26 15:19:10 +04:00
parent dcdbe8575f
commit 932e667762
5 changed files with 189 additions and 123 deletions

View file

@ -5,23 +5,7 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment=""> <list default="true" id="9d5d9b6f-43c8-41a4-bb42-a66ffc96c9b0" name="Changes" comment="">
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/storage/ByteEntitySerializer.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/test-plugin/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/build.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/storage/EntitySerializer.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/storage/EntityStorage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/storage/FSEntityStorage.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/wrapper/PerViewerEntity.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/model-engine-addon/build.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/model-engine-addon/src/main/java/me/tofaa/entitylib/modelengine/ELibBaseEntity.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<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/EntityLib.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/EntityLib.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/Platform.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/Platform.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/MetaOffsetConverter.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/meta/MetaOffsetConverter.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.java" beforeDir="false" afterPath="$PROJECT_DIR$/api/src/main/java/me/tofaa/entitylib/utils/GithubUpdater.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$/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/settings.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/settings.gradle" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" beforeDir="false" afterPath="$PROJECT_DIR$/test-plugin/src/main/java/me/tofaa/testentitylib/TestEntityLibPlugin.java" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -45,6 +29,9 @@
<task path="$PROJECT_DIR$/test-plugin"> <task path="$PROJECT_DIR$/test-plugin">
<activation /> <activation />
</task> </task>
<task path="$PROJECT_DIR$/api">
<activation />
</task>
<projects_view> <projects_view>
<tree_state> <tree_state>
<expand> <expand>
@ -52,6 +39,31 @@
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" /> <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="EntityLib" type="f1a62948:ProjectNode" /> <item name="EntityLib" type="f1a62948:ProjectNode" />
</path> </path>
<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" />
</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 task shared" type="c8890929:TasksNode$1" />
</path>
</expand> </expand>
<select /> <select />
</tree_state> </tree_state>
@ -71,6 +83,10 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component> </component>
<component name="HighlightingSettingsPerFile"> <component name="HighlightingSettingsPerFile">
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.2.0/f981796d809d02eee3e485167b2476ed766be882/api-2.2.0.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateAttributes.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.3.0/a199b900341990aa6a2899e42e396800c83601f0/api-2.3.0-default.jar!/com/github/retrooper/packetevents/protocol/attribute/Attribute.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.3.0/a199b900341990aa6a2899e42e396800c83601f0/api-2.3.0-default.jar!/com/github/retrooper/packetevents/protocol/attribute/Attributes.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/api/2.3.0/a199b900341990aa6a2899e42e396800c83601f0/api-2.3.0-default.jar!/com/github/retrooper/packetevents/wrapper/play/server/WrapperPlayServerUpdateAttributes.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/velocity/2.3.0/aba4fb09c29c8a071cac36acba545ed37bb80268/velocity-2.3.0-default.jar!/io/github/retrooper/packetevents/bstats/Metrics.class" root0="SKIP_INSPECTION" /> <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/velocity/2.3.0/aba4fb09c29c8a071cac36acba545ed37bb80268/velocity-2.3.0-default.jar!/io/github/retrooper/packetevents/bstats/Metrics.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/velocity/2.3.0/aba4fb09c29c8a071cac36acba545ed37bb80268/velocity-2.3.0-default.jar!/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.class" root0="SKIP_INSPECTION" /> <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.retrooper.packetevents/velocity/2.3.0/aba4fb09c29c8a071cac36acba545ed37bb80268/velocity-2.3.0-default.jar!/io/github/retrooper/packetevents/velocity/factory/VelocityPacketEventsBuilder.class" root0="SKIP_INSPECTION" />
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar!/com/google/gson/JsonArray.class" root0="SKIP_INSPECTION" /> <setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.8.0/c4ba5371a29ac9b2ad6129b1d39ea38750043eff/gson-2.8.0.jar!/com/google/gson/JsonArray.class" root0="SKIP_INSPECTION" />
@ -90,44 +106,51 @@
<option name="showExcludedFiles" value="false" /> <option name="showExcludedFiles" value="false" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent">{ <component name="PropertiesComponent"><![CDATA[{
&quot;keyToString&quot;: { "keyToString": {
&quot;Downloaded.Files.Path.Enabled&quot;: &quot;false&quot;, "Downloaded.Files.Path.Enabled": "false",
&quot;Gradle.Build EntityLib.executor&quot;: &quot;Run&quot;, "Gradle.Build EntityLib.executor": "Run",
&quot;Gradle.EntityLib [dependencies].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib [dependencies].executor": "Run",
&quot;Gradle.EntityLib [publish].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib [publish].executor": "Run",
&quot;Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib [runServer] (1).executor": "Run",
&quot;Gradle.EntityLib:test-plugin [publish].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib [runServer].executor": "Run",
&quot;Gradle.EntityLib:test-plugin [runServer].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib:code-gen [:code-gen:Main.main()].executor": "Run",
&quot;Gradle.EntityLib:test-plugin [shadowJar].executor&quot;: &quot;Run&quot;, "Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches].executor": "Run",
&quot;Repository.Attach.Annotations&quot;: &quot;false&quot;, "Gradle.EntityLib:test-plugin [cleanCustomServiceCaches].executor": "Run",
&quot;Repository.Attach.JavaDocs&quot;: &quot;false&quot;, "Gradle.EntityLib:test-plugin [cleanPaperCache].executor": "Run",
&quot;Repository.Attach.Sources&quot;: &quot;false&quot;, "Gradle.EntityLib:test-plugin [cleanPaperPluginsCache].executor": "Run",
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;, "Gradle.EntityLib:test-plugin [publish].executor": "Run",
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;, "Gradle.EntityLib:test-plugin [runServer].executor": "Run",
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;, "Gradle.EntityLib:test-plugin [shadowJar].executor": "Run",
&quot;git-widget-placeholder&quot;: &quot;master&quot;, "JAR Application.Unnamed.executor": "Run",
&quot;ignore.virus.scanning.warn.message&quot;: &quot;true&quot;, "Repository.Attach.Annotations": "false",
&quot;jdk.selected.JAVA_MODULE&quot;: &quot;corretto-17&quot;, "Repository.Attach.JavaDocs": "false",
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;, "Repository.Attach.Sources": "false",
&quot;last_opened_file_path&quot;: &quot;/home/tofaa/Github/EntityLib/model-engine-addon&quot;, "RunOnceActivity.OpenProjectViewOnStart": "true",
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;, "RunOnceActivity.ShowReadmeOnStart": "true",
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;, "WebServerToolWindowFactoryState": "false",
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;, "git-widget-placeholder": "master",
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;, "ignore.virus.scanning.warn.message": "true",
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;, "jdk.selected.JAVA_MODULE": "corretto-17",
&quot;project.structure.last.edited&quot;: &quot;Modules&quot;, "kotlin-language-version-configured": "true",
&quot;project.structure.proportion&quot;: &quot;0.15&quot;, "last_opened_file_path": "/home/tofaa/Github/EntityLib/model-engine-addon",
&quot;project.structure.side.proportion&quot;: &quot;0.2&quot;, "node.js.detected.package.eslint": "true",
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.editor&quot;, "node.js.detected.package.tslint": "true",
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot; "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.editor",
"vue.rearranger.settings.migration": "true"
}, },
&quot;keyToStringList&quot;: { "keyToStringList": {
&quot;kotlin-gradle-user-dirs&quot;: [ "kotlin-gradle-user-dirs": [
&quot;/home/tofaa/.gradle&quot; "/home/tofaa/.gradle"
] ]
} }
}</component> }]]></component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/model-engine-addon" /> <recent name="$PROJECT_DIR$/model-engine-addon" />
@ -136,21 +159,8 @@
<recent name="D:\Github\EntityLib\test-plugin" /> <recent name="D:\Github\EntityLib\test-plugin" />
</key> </key>
</component> </component>
<component name="RunManager" selected="Gradle.EntityLib:test-plugin [runServer]"> <component name="RunManager" selected="Gradle.EntityLib [runServer]">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true"> <configuration name="EntityLib [runServer] (1)" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<option name="MAIN_CLASS_NAME" value="me.tofaa.entitylib.codegen.Main" />
<module name="EntityLib.code-gen.main" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="me.tofaa.entitylib.codegen.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="EntityLib [publish]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
@ -159,50 +169,6 @@
<option name="taskDescriptions"> <option name="taskDescriptions">
<list /> <list />
</option> </option>
<option name="taskNames">
<list>
<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" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<configuration name="EntityLib:test-plugin [runServer]" 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"> <option name="taskNames">
<list> <list>
<option value="runServer" /> <option value="runServer" />
@ -216,18 +182,18 @@
<RunAsTest>false</RunAsTest> <RunAsTest>false</RunAsTest>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="EntityLib:test-plugin [shadowJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration name="EntityLib [runServer]" type="GradleRunConfiguration" factoryName="Gradle">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$/test-plugin" /> <option name="externalProjectPath" value="$PROJECT_DIR$/test-plugin" />
<option name="externalSystemIdString" value="GRADLE" /> <option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" /> <option name="scriptParameters" value="" />
<option name="taskDescriptions"> <option name="taskDescriptions">
<list /> <list />
</option> </option>
<option name="taskNames"> <option name="taskNames">
<list> <list>
<option value="shadowJar" /> <option value="runServer" />
</list> </list>
</option> </option>
<option name="vmOptions" /> <option name="vmOptions" />
@ -238,13 +204,109 @@
<RunAsTest>false</RunAsTest> <RunAsTest>false</RunAsTest>
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="EntityLib:test-plugin [cleanAllRunTaskCaches]" 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="cleanAllRunTaskCaches" />
</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 [cleanCustomServiceCaches]" 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="cleanCustomServiceCaches" />
</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 [cleanPaperCache]" 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="cleanPaperCache" />
</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 [cleanPaperPluginsCache]" 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="cleanPaperPluginsCache" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>false</RunAsTest>
<method v="2" />
</configuration>
<list>
<item itemvalue="Gradle.EntityLib [runServer]" />
<item itemvalue="Gradle.EntityLib [runServer] (1)" />
<item itemvalue="Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches]" />
<item itemvalue="Gradle.EntityLib:test-plugin [cleanCustomServiceCaches]" />
<item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperCache]" />
<item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperPluginsCache]" />
</list>
<recent_temporary> <recent_temporary>
<list> <list>
<item itemvalue="Gradle.EntityLib:test-plugin [runServer]" /> <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperPluginsCache]" />
<item itemvalue="Gradle.EntityLib [publish]" /> <item itemvalue="Gradle.EntityLib:test-plugin [cleanPaperCache]" />
<item itemvalue="Gradle.EntityLib:test-plugin [publish]" /> <item itemvalue="Gradle.EntityLib:test-plugin [cleanCustomServiceCaches]" />
<item itemvalue="Gradle.EntityLib:test-plugin [shadowJar]" /> <item itemvalue="Gradle.EntityLib:test-plugin [cleanAllRunTaskCaches]" />
<item itemvalue="Application.Main" /> <item itemvalue="Gradle.EntityLib [runServer] (1)" />
</list> </list>
</recent_temporary> </recent_temporary>
</component> </component>
@ -343,6 +405,7 @@
<workItem from="1716022802329" duration="1089000" /> <workItem from="1716022802329" duration="1089000" />
<workItem from="1716206341414" duration="1609000" /> <workItem from="1716206341414" duration="1609000" />
<workItem from="1716212065238" duration="80000" /> <workItem from="1716212065238" duration="80000" />
<workItem from="1716488324710" duration="3710000" />
</task> </task>
<servers /> <servers />
</component> </component>

View file

@ -80,7 +80,7 @@ final class MetaConverterRegistry {
put(GUARDIAN, GuardianMeta.class, GuardianMeta::new); put(GUARDIAN, GuardianMeta.class, GuardianMeta::new);
put(GIANT, GiantMeta.class, GiantMeta::new); put(GIANT, GiantMeta.class, GiantMeta::new);
put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new); put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new);
put(ENDERMITE, EndermiteMeta.class, EndermiteMeta::new); put(ENDERMAN, EndermanMeta.class, EndermanMeta::new);
put(ELDER_GUARDIAN, ElderGuardianMeta.class, ElderGuardianMeta::new); put(ELDER_GUARDIAN, ElderGuardianMeta.class, ElderGuardianMeta::new);
put(CREEPER, CreeperMeta.class, CreeperMeta::new); put(CREEPER, CreeperMeta.class, CreeperMeta::new);
put(CAVE_SPIDER, CaveSpiderMeta.class, CaveSpiderMeta::new); put(CAVE_SPIDER, CaveSpiderMeta.class, CaveSpiderMeta::new);
@ -113,7 +113,6 @@ final class MetaConverterRegistry {
put(WANDERING_TRADER, WanderingTraderMeta.class, WanderingTraderMeta::new); put(WANDERING_TRADER, WanderingTraderMeta.class, WanderingTraderMeta::new);
put(CHEST_MINECART, ChestMinecartMeta.class, ChestMinecartMeta::new); put(CHEST_MINECART, ChestMinecartMeta.class, ChestMinecartMeta::new);
put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new); put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new);
put(COMMAND_BLOCK_MINECART, CommandBlockMinecartMeta.class, CommandBlockMinecartMeta::new);
put(FURNACE_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new); put(FURNACE_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
put(HOPPER_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new); put(HOPPER_MINECART, FurnaceMinecartMeta.class, FurnaceMinecartMeta::new);
put(SPAWNER_MINECART, SpawnerMinecartMeta.class, SpawnerMinecartMeta::new); put(SPAWNER_MINECART, SpawnerMinecartMeta.class, SpawnerMinecartMeta::new);

View file

@ -301,6 +301,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
} }
protected WrapperPlayServerSetPassengers createPassengerPacket() { protected WrapperPlayServerSetPassengers createPassengerPacket() {
if (passengers.isEmpty()) return null;
return new WrapperPlayServerSetPassengers(entityId, passengers.stream().mapToInt(i -> i).toArray()); return new WrapperPlayServerSetPassengers(entityId, passengers.stream().mapToInt(i -> i).toArray());
} }
@ -352,6 +353,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
public void refresh() { public void refresh() {
if (!spawned) return; if (!spawned) return;
sendPacketToViewers(entityMeta.createPacket()); sendPacketToViewers(entityMeta.createPacket());
sendPacketToViewers(createPassengerPacket());
} }
public void sendPacketToViewers(PacketWrapper<?> packet) { public void sendPacketToViewers(PacketWrapper<?> packet) {
@ -365,7 +367,7 @@ public class WrapperEntity implements Tickable, TrackedEntity {
} }
private static void sendPacket(UUID user, PacketWrapper<?> wrapper) { private static void sendPacket(UUID user, PacketWrapper<?> wrapper) {
if (wrapper == null) return;
Object channel = EntityLib.getApi().getPacketEvents().getProtocolManager().getChannel(user); Object channel = EntityLib.getApi().getPacketEvents().getProtocolManager().getChannel(user);
if (channel == null) { if (channel == null) {
if (EntityLib.getApi().getSettings().isDebugMode()) { if (EntityLib.getApi().getSettings().isDebugMode()) {

View file

@ -31,6 +31,7 @@ public class WrapperLivingEntity extends WrapperEntity{
public void refresh() { public void refresh() {
super.refresh(); super.refresh();
equipment.refresh(); equipment.refresh();
attributes.refresh();
} }
public WrapperEntityAttributes getAttributes() { public WrapperEntityAttributes getAttributes() {

View file

@ -33,7 +33,8 @@ repositories {
dependencies { dependencies {
compileOnly('org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT') compileOnly('org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT')
compileOnly('com.github.retrooper.packetevents:spigot:2.3.0') compileOnly('com.github.retrooper.packetevents:spigot:2.3.0')
implementation(project(":platforms:spigot")) // implementation(project(":platforms:spigot"))
implementation("com.github.Tofaa2.EntityLib:spigot:2.2.0-SNAPSHOT")
} }