merge: fix workspace.xml conflict
This commit is contained in:
Leonid Azgihin
redstone2888
commit
ef1d717a48
9 changed files with 48 additions and 365 deletions
29
.idea/runConfigurations/core__runServer_.xml
generated
Normal file
29
.idea/runConfigurations/core__runServer_.xml
generated
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="core [runServer]" type="GradleRunConfiguration" factoryName="Gradle">
|
||||||
|
<ExternalSystemSettings>
|
||||||
|
<option name="env">
|
||||||
|
<map>
|
||||||
|
<entry key="HOST_NATS" value="nats://172.17.0.1:4222" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
<option name="executionName" />
|
||||||
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="externalSystemIdString" value="GRADLE" />
|
||||||
|
<option name="scriptParameters" value="" />
|
||||||
|
<option name="taskDescriptions">
|
||||||
|
<list />
|
||||||
|
</option>
|
||||||
|
<option name="taskNames">
|
||||||
|
<list>
|
||||||
|
<option value="runServer" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
<option name="vmOptions" />
|
||||||
|
</ExternalSystemSettings>
|
||||||
|
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
||||||
|
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
||||||
|
<DebugAllEnabled>false</DebugAllEnabled>
|
||||||
|
<RunAsTest>false</RunAsTest>
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
350
.idea/workspace.xml
generated
350
.idea/workspace.xml
generated
|
|
@ -1,350 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="AutoImportSettings">
|
|
||||||
<option name="autoReloadType" value="SELECTIVE" />
|
|
||||||
</component>
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment="cleaned up build process">
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="ExternalProjectsData">
|
|
||||||
<projectState path="$PROJECT_DIR$">
|
|
||||||
<ProjectState />
|
|
||||||
</projectState>
|
|
||||||
<projectState path="$PROJECT_DIR$/build-logic">
|
|
||||||
<ProjectState />
|
|
||||||
</projectState>
|
|
||||||
</component>
|
|
||||||
<component name="ExternalProjectsManager">
|
|
||||||
<system id="GRADLE">
|
|
||||||
<state>
|
|
||||||
<task path="$PROJECT_DIR$">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<task path="$PROJECT_DIR$/core-lib">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<task path="$PROJECT_DIR$/core-bukkit-impl">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<task path="$PROJECT_DIR$/core-bukkit-api">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<task path="$PROJECT_DIR$/core-velocity-impl">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<projects_view>
|
|
||||||
<tree_state>
|
|
||||||
<expand />
|
|
||||||
<select />
|
|
||||||
</tree_state>
|
|
||||||
</projects_view>
|
|
||||||
</state>
|
|
||||||
</system>
|
|
||||||
</component>
|
|
||||||
<component name="FileTemplateManagerImpl">
|
|
||||||
<option name="RECENT_TEMPLATES">
|
|
||||||
<list>
|
|
||||||
<option value="Kotlin Class" />
|
|
||||||
<option value="Interface" />
|
|
||||||
<option value="package-info" />
|
|
||||||
<option value="Class" />
|
|
||||||
<option value="Kotlin File" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
<option name="ROOT_SYNC" value="SYNC" />
|
|
||||||
</component>
|
|
||||||
<component name="GradleScriptDefinitionsStorage" workingDir="$PROJECT_DIR$" gradleHome="$USER_HOME$/.gradle/wrapper/dists/gradle-8.11-bin/c4te04g51qsyw1bxcb929u7br/gradle-8.11" javaHome="/usr/lib/jvm/openjdk21" gradleVersion="8.11" />
|
|
||||||
<component name="HighlightingSettingsPerFile">
|
|
||||||
<setting file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/io.projectreactor/reactor-core/3.8.5/ed6c3f423d84bf282e50a4f7432a8d65af321efb/reactor-core-3.8.5-sources.jar!/reactor/core/publisher/Mono.java" root0="SKIP_INSPECTION" />
|
|
||||||
</component>
|
|
||||||
<component name="McpProjectServerCommands">
|
|
||||||
<commands />
|
|
||||||
<urls />
|
|
||||||
</component>
|
|
||||||
<component name="ProblemsViewState">
|
|
||||||
<option name="autoscrollToSource" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectColorInfo">{
|
|
||||||
"customColor": "",
|
|
||||||
"associatedIndex": 0
|
|
||||||
}</component>
|
|
||||||
<component name="ProjectId" id="3FjIFMmEgYbcwxMNHxWXQRQn8hy" />
|
|
||||||
<component name="ProjectLevelVcsManager">
|
|
||||||
<ConfirmationsSetting value="2" id="Add" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectViewState">
|
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
|
||||||
<option name="showLibraryContents" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="PropertiesComponent"><![CDATA[{
|
|
||||||
"keyToString": {
|
|
||||||
"Gradle.Download Sources.executor": "Run",
|
|
||||||
"Gradle.core [:core-velocity-impl:shadowJar].executor": "Run",
|
|
||||||
"Gradle.core [a].executor": "Run",
|
|
||||||
"Gradle.core [buildEnvironment].executor": "Run",
|
|
||||||
"Gradle.core [build].executor": "Run",
|
|
||||||
"Gradle.core [clean].executor": "Run",
|
|
||||||
"Gradle.core [publishAllPublicationsToScrowRepository].executor": "Run",
|
|
||||||
"Gradle.core [publishCoreLibPublicationToScrowRepository].executor": "Run",
|
|
||||||
"Gradle.core [publish].executor": "Run",
|
|
||||||
"Gradle.core:core-bukkit-api [build].executor": "Run",
|
|
||||||
"Gradle.core:core-bukkit-api [clean].executor": "Run",
|
|
||||||
"Gradle.core:core-bukkit-impl [build].executor": "Run",
|
|
||||||
"Gradle.core:core-lib [publishAllPublicationsToScrowRepository].executor": "Run",
|
|
||||||
"Gradle.core:core-lib [publishCoreLibPublicationToMavenLocal].executor": "Run",
|
|
||||||
"Gradle.core:core-lib [publishCoreLibPublicationToScrowRepository].executor": "Run",
|
|
||||||
"Gradle.core:core-velocity-impl [build].executor": "Run",
|
|
||||||
"Gradle.core:core-velocity-impl [classes].executor": "Run",
|
|
||||||
"Gradle.core:core-velocity-impl [clean].executor": "Run",
|
|
||||||
"Gradle.core:core-velocity-impl [shadowJar].executor": "Run",
|
|
||||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
|
||||||
"RunOnceActivity.MCP Project settings loaded": "true",
|
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
||||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
|
||||||
"RunOnceActivity.git.unshallow": "true",
|
|
||||||
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
|
|
||||||
"git-widget-placeholder": "master",
|
|
||||||
"junie.onboarding.icon.badge.shown": "true",
|
|
||||||
"kotlin-language-version-configured": "true",
|
|
||||||
"last_opened_file_path": "/Users/leonidazgihin/IdeaProjects/core",
|
|
||||||
"project.structure.last.edited": "Modules",
|
|
||||||
"project.structure.proportion": "0.15",
|
|
||||||
"project.structure.side.proportion": "0.6268199",
|
|
||||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle",
|
|
||||||
"to.speed.mode.migration.done": "true"
|
|
||||||
}
|
|
||||||
}]]></component>
|
|
||||||
<component name="RecentsManager">
|
|
||||||
<key name="CreateClassDialog.RecentsKey">
|
|
||||||
<recent name="de.kentoj.scrow.bukkit.economy.command" />
|
|
||||||
<recent name="de.kentoj.scrowlib.messaging" />
|
|
||||||
</key>
|
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
|
||||||
<recent name="$PROJECT_DIR$/core-lib" />
|
|
||||||
<recent name="$PROJECT_DIR$/build-logic/gradle" />
|
|
||||||
</key>
|
|
||||||
<key name="ExtractSuperBase.RECENT_KEYS">
|
|
||||||
<recent name="de.kentoj.scrow.bukkit.region" />
|
|
||||||
</key>
|
|
||||||
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
|
||||||
<recent name="scrow" />
|
|
||||||
</key>
|
|
||||||
<key name="CopyClassDialog.RECENTS_KEY">
|
|
||||||
<recent name="de.kentoj.scrow.bukkit.player" />
|
|
||||||
<recent name="de.kentoj.scrow.bukkit.friends.command" />
|
|
||||||
<recent name="de.kentoj.scrowlib.messaging" />
|
|
||||||
<recent name="de.kentoj.scrow.bukkit.region.event" />
|
|
||||||
</key>
|
|
||||||
</component>
|
|
||||||
<component name="RunAnythingCache">
|
|
||||||
<option name="myCommands">
|
|
||||||
<command value="gradlew clean" />
|
|
||||||
<command value="./gradlew :core-velocity-impl:shadowJar --info" />
|
|
||||||
<command value="./gradlew :core-velocity-impl:shadowJar --rerun-tasks" />
|
|
||||||
<command value="gradlew buildEnvironment" />
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="RunManager" selected="Gradle.core [publish]">
|
|
||||||
<configuration name="core [:core-velocity-impl:shadowJar]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
|
|
||||||
<ExternalSystemSettings>
|
|
||||||
<option name="executionName" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
|
||||||
<option name="externalSystemIdString" value="GRADLE" />
|
|
||||||
<option name="scriptParameters" value="--info" />
|
|
||||||
<option name="taskDescriptions">
|
|
||||||
<list />
|
|
||||||
</option>
|
|
||||||
<option name="taskNames">
|
|
||||||
<list>
|
|
||||||
<option value=":core-velocity-impl:shadowJar" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<RunAsTest>false</RunAsTest>
|
|
||||||
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
|
||||||
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration name="core [a]" 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="a" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<RunAsTest>false</RunAsTest>
|
|
||||||
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
|
||||||
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration name="core [buildEnvironment]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
|
|
||||||
<ExternalSystemSettings>
|
|
||||||
<option name="executionName" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
|
||||||
<option name="externalSystemIdString" value="GRADLE" />
|
|
||||||
<option name="scriptParameters" value="" />
|
|
||||||
<option name="taskDescriptions">
|
|
||||||
<list />
|
|
||||||
</option>
|
|
||||||
<option name="taskNames">
|
|
||||||
<list>
|
|
||||||
<option value="buildEnvironment" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<RunAsTest>false</RunAsTest>
|
|
||||||
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
|
||||||
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration name="core [build]" 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="build" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<RunAsTest>false</RunAsTest>
|
|
||||||
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
|
||||||
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration name="core [publish]" 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="publish" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<ExternalSystemDebugDisabled>false</ExternalSystemDebugDisabled>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<RunAsTest>false</RunAsTest>
|
|
||||||
<GradleProfilingDisabled>false</GradleProfilingDisabled>
|
|
||||||
<GradleCoverageDisabled>false</GradleCoverageDisabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration default="true" type="JetRunConfigurationType">
|
|
||||||
<module name="kotlin.scripts.KotlinSettingsScript.build-logic:settings.gradle.kts" />
|
|
||||||
<method v="2">
|
|
||||||
<option name="Make" enabled="true" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
<recent_temporary>
|
|
||||||
<list>
|
|
||||||
<item itemvalue="Gradle.core [publish]" />
|
|
||||||
<item itemvalue="Gradle.core [build]" />
|
|
||||||
<item itemvalue="Gradle.core [a]" />
|
|
||||||
<item itemvalue="Gradle.core [buildEnvironment]" />
|
|
||||||
<item itemvalue="Gradle.core [:core-velocity-impl:shadowJar]" />
|
|
||||||
</list>
|
|
||||||
</recent_temporary>
|
|
||||||
</component>
|
|
||||||
<component name="SharedIndexes">
|
|
||||||
<attachedChunks>
|
|
||||||
<set>
|
|
||||||
<option value="bundled-jdk-30f59d01ecdd-2fc7cc6b9a17-intellij.indexing.shared.core-IU-253.31033.145" />
|
|
||||||
</set>
|
|
||||||
</attachedChunks>
|
|
||||||
</component>
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="56c685a1-f609-4ffd-a951-849beb2a7f8d" name="Changes" comment="" />
|
|
||||||
<created>1782581947132</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1782581947132</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00001" summary=".">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1782666067624</created>
|
|
||||||
<option name="number" value="00001" />
|
|
||||||
<option name="presentableId" value="LOCAL-00001" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1782666067624</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00002" summary=".">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1782673270039</created>
|
|
||||||
<option name="number" value="00002" />
|
|
||||||
<option name="presentableId" value="LOCAL-00002" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1782673270039</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00003" summary="fix: unable to leave regions when unloaded">
|
|
||||||
<option name="closed" value="true" />
|
|
||||||
<created>1782675674934</created>
|
|
||||||
<option name="number" value="00003" />
|
|
||||||
<option name="presentableId" value="LOCAL-00003" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1782675674934</updated>
|
|
||||||
</task>
|
|
||||||
<option name="localTasksCounter" value="4" />
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="VcsManagerConfiguration">
|
|
||||||
<MESSAGE value="fix: unable to leave regions when unloaded" />
|
|
||||||
<MESSAGE value="currently refactoring a lot" />
|
|
||||||
<MESSAGE value="." />
|
|
||||||
<MESSAGE value="move some stuff around" />
|
|
||||||
<MESSAGE value="cleaned up build process" />
|
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="cleaned up build process" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -5,8 +5,8 @@ TODO
|
||||||
- notification: Friend is now offline/online
|
- notification: Friend is now offline/online
|
||||||
- /ignore command
|
- /ignore command
|
||||||
|
|
||||||
environment
|
modules
|
||||||
-----------
|
-------
|
||||||
|
|
||||||
- **core-lib**: stateless library
|
- **core-lib**: stateless library
|
||||||
- **core-bukkit-api** stateful api, for minecraft development, depends on core-lib
|
- **core-bukkit-api** stateful api, for minecraft development, depends on core-lib
|
||||||
|
|
|
||||||
3
core-bukkit-impl/run/eula.txt
Normal file
3
core-bukkit-impl/run/eula.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA).
|
||||||
|
#Mon Jul 06 16:35:59 CEST 2026
|
||||||
|
eula=true
|
||||||
|
|
@ -18,7 +18,7 @@ public class CoreImplPlugin extends JavaPlugin {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
ScrowAPISurface.initScrowAPI(this, true);
|
ScrowAPISurface.initScrowAPI(this);
|
||||||
{
|
{
|
||||||
ScrowAPI.getCommandApi().register(new CoinsCommand().getRootNode());
|
ScrowAPI.getCommandApi().register(new CoinsCommand().getRootNode());
|
||||||
ScrowAPI.getCommandApi().register(FriendCommand.create());
|
ScrowAPI.getCommandApi().register(FriendCommand.create());
|
||||||
|
|
|
||||||
|
|
@ -19,16 +19,18 @@ import io.nats.client.Nats;
|
||||||
import io.nats.client.Options;
|
import io.nats.client.Options;
|
||||||
import lombok.AccessLevel;
|
import lombok.AccessLevel;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
import org.jdbi.v3.core.Jdbi;
|
import org.jdbi.v3.core.Jdbi;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@NoArgsConstructor(access = AccessLevel.NONE)
|
@NoArgsConstructor(access = AccessLevel.NONE)
|
||||||
public class ScrowAPISurface {
|
public class ScrowAPISurface {
|
||||||
|
|
||||||
public static void initScrowAPI(Plugin plugin, boolean enableDatabase) {
|
public static void initScrowAPI(Plugin plugin) {
|
||||||
ScrowAPI.setCorePlugin(plugin);
|
ScrowAPI.setCorePlugin(plugin);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
@ -42,15 +44,15 @@ public class ScrowAPISurface {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (enableDatabase) {
|
|
||||||
try {
|
try {
|
||||||
Class.forName("org.postgresql.Driver", true, ScrowAPISurface.class.getClassLoader());
|
Class.forName("org.postgresql.Driver", true, ScrowAPISurface.class.getClassLoader());
|
||||||
} catch (ClassNotFoundException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
var props = new Properties();
|
var props = new Properties();
|
||||||
props.setProperty("user", "postgres");
|
props.setProperty("user", "postgres");
|
||||||
ScrowAPI.setJdbi(Jdbi.create(EnvUtils.envOrThrow("HOST_POSTGRES"), props));
|
ScrowAPI.setJdbi(Jdbi.create(EnvUtils.envOrThrow("HOST_POSTGRES"), props));
|
||||||
|
} catch (ClassNotFoundException e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
|
} catch (IllegalStateException e) {
|
||||||
|
log.error("HOST_POSTGRES not set -> Using in-memory database");
|
||||||
}
|
}
|
||||||
|
|
||||||
ScrowAPI.setPlayerFactory(playerId -> new NetworkPlayerImpl(ScrowAPI.getMessageBroker(), playerId));
|
ScrowAPI.setPlayerFactory(playerId -> new NetworkPlayerImpl(ScrowAPI.getMessageBroker(), playerId));
|
||||||
|
|
|
||||||
|
|
@ -10,15 +10,12 @@ import de.kentoj.kencommandapi.api.platform.MessageStyle;
|
||||||
import de.kentoj.scrow.bukkit.ScrowAPI;
|
import de.kentoj.scrow.bukkit.ScrowAPI;
|
||||||
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
import de.kentoj.scrow.bukkit.scheduler.Tasks;
|
||||||
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
import de.kentoj.scrowlib.convention.ScrowMessageStyle;
|
||||||
import lombok.AccessLevel;
|
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.NoArgsConstructor;
|
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
|
||||||
@NoArgsConstructor(access = AccessLevel.NONE)
|
|
||||||
public class CoinsCommand implements CommandExecutor<CommandSender> {
|
public class CoinsCommand implements CommandExecutor<CommandSender> {
|
||||||
@Getter
|
@Getter
|
||||||
private final RootCommandNode<CommandSender> rootNode;
|
private final RootCommandNode<CommandSender> rootNode;
|
||||||
|
|
@ -39,7 +36,6 @@ public class CoinsCommand implements CommandExecutor<CommandSender> {
|
||||||
rootNode.addLiteral(getLiteral);
|
rootNode.addLiteral(getLiteral);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CompletableFuture<Result<Object, String>> execute(CommandContext<CommandSender> ctx) {
|
public CompletableFuture<Result<Object, String>> execute(CommandContext<CommandSender> ctx) {
|
||||||
var player = ((Player) ctx.getSender());
|
var player = ((Player) ctx.getSender());
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,9 @@ import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@NoArgsConstructor(access = AccessLevel.NONE)
|
@NoArgsConstructor(access = AccessLevel.NONE)
|
||||||
public class EnvUtils {
|
public class EnvUtils {
|
||||||
|
/**
|
||||||
|
* @throws IllegalStateException if the var is not set
|
||||||
|
*/
|
||||||
public static String envOrThrow(String name) {
|
public static String envOrThrow(String name) {
|
||||||
var env = System.getenv(name);
|
var env = System.getenv(name);
|
||||||
if (env == null) throw new IllegalStateException("environment variable " + name + " not set");
|
if (env == null) throw new IllegalStateException("environment variable " + name + " not set");
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
[versions]
|
[versions]
|
||||||
shadow = "9.2.0"
|
shadow = "9.2.0"
|
||||||
run-paper = "2.3.1"
|
run-paper = "2.3.1"
|
||||||
scrow-commandapi = "0.31"
|
scrow-commandapi = "0.32"
|
||||||
postgress = "42.7.12"
|
postgress = "42.7.12"
|
||||||
nats = "2.25.2"
|
nats = "2.25.2"
|
||||||
papermc = "1.21.11-rc3-R0.1-SNAPSHOT"
|
papermc = "1.21.11-rc3-R0.1-SNAPSHOT"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue