From 80247ab566aa8dd37445b7b18918d879ab863dac Mon Sep 17 00:00:00 2001
From: Pulverizer <9803259+Pulverizer@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:59:21 +0100
Subject: [PATCH] nearly complete port to Sponge API 8
---
.gitignore | 3 +
.idea/codeStyles/codeStyleConfig.xml | 1 +
.idea/compiler.xml | 3 +-
.idea/gradle.xml | 3 +-
.idea/workspace.xml | 181 +++++++++++++--
build.gradle.kts | 55 ++++-
...lverizer.movecraft.common_build.gradle.kts | 50 +----
{gradle/forge => forge}/build.gradle.kts | 0
{gradle/forge => forge}/gradle.properties | 0
settings.gradle | 4 +-
.../pulverizer/movecraft/Movecraft.java | 52 +++--
.../config/craft/BlockMapCraftSetting.java | 10 +-
.../api/config/craft/BooleanCraftSetting.java | 4 +-
.../api/config/craft/CraftSetting.java | 14 +-
.../api/config/craft/DoubleCraftSetting.java | 4 +-
.../api/config/craft/FloatCraftSetting.java | 4 +-
.../api/config/craft/IntegerCraftSetting.java | 4 +-
.../api/config/craft/LongCraftSetting.java | 4 +-
.../api/config/craft/StringCraftSetting.java | 4 +-
.../api/event/CraftCollisionEvent.java | 9 +-
.../movecraft/api/event/CraftDetectEvent.java | 20 +-
.../movecraft/api/event/CraftPilotEvent.java | 9 +-
.../api/event/CraftReleaseEvent.java | 9 +-
.../movecraft/api/event/CraftRotateEvent.java | 9 +-
.../movecraft/api/event/CraftSinkEvent.java | 9 +-
.../api/event/CraftTranslateEvent.java | 7 +-
.../api/event/RegisterFeaturesEvent.java | 6 +-
.../api/event/SignTranslateEvent.java | 30 +--
.../movecraft/async/AsyncManager.java | 74 +++---
.../pulverizer/movecraft/async/AsyncTask.java | 17 +-
.../movecraft/async/DetectionTask.java | 115 +++++-----
.../movecraft/async/RotationTask.java | 85 +++----
.../movecraft/async/TranslationTask.java | 209 +++++++++--------
.../movecraft/commands/ContactsCommand.java | 44 ++--
.../commands/CraftReportCommand.java | 44 ++--
.../movecraft/commands/CraftTypesCommand.java | 96 ++++----
.../movecraft/commands/CrewCommand.java | 94 ++++----
.../movecraft/commands/DockCommand.java | 48 ++--
.../movecraft/config/ConfigManager.java | 27 ++-
.../pulverizer/movecraft/config/Settings.java | 71 +++---
.../movecraft/config/craft/CraftSettings.java | 60 ++---
.../movecraft/config/craft/CraftType.java | 11 +-
.../pulverizer/movecraft/craft/Craft.java | 211 +++++++++---------
.../movecraft/craft/CraftManager.java | 140 +++++++-----
.../movecraft/craft/crew/CrewInvite.java | 26 +--
.../movecraft/craft/crew/CrewManager.java | 164 +++++++-------
.../movecraft/listener/BlockListener.java | 149 +++++++------
.../movecraft/listener/InteractListener.java | 75 ++++---
.../movecraft/listener/PlayerListener.java | 81 ++++---
.../movecraft/listener/SignListener.java | 37 ++-
.../map_updater/MapUpdateManager.java | 4 +-
.../update/BlockCreateCommand.java | 18 +-
.../update/CraftRotateCommand.java | 44 ++--
.../update/CraftTranslateCommand.java | 44 ++--
.../update/EntityUpdateCommand.java | 7 +-
.../update/ExplosionUpdateCommand.java | 21 +-
.../update/ItemDropUpdateCommand.java | 40 ++--
.../update/ParticleUpdateCommand.java | 23 +-
.../pulverizer/movecraft/sign/AscendSign.java | 63 +++---
.../movecraft/sign/CommanderSign.java | 57 ++---
.../movecraft/sign/ContactsSign.java | 46 ++--
.../pulverizer/movecraft/sign/CraftSign.java | 31 ++-
.../pulverizer/movecraft/sign/CrewSign.java | 137 ++++++------
.../pulverizer/movecraft/sign/CruiseSign.java | 74 +++---
.../movecraft/sign/DescendSign.java | 61 ++---
.../pulverizer/movecraft/sign/HelmSign.java | 48 ++--
.../pulverizer/movecraft/sign/PilotSign.java | 11 +-
.../movecraft/sign/RelativeMoveSign.java | 36 +--
.../movecraft/sign/ReleaseSign.java | 18 +-
.../pulverizer/movecraft/sign/RemoteSign.java | 87 ++++----
.../pulverizer/movecraft/sign/SpeedSign.java | 46 ++--
.../movecraft/sign/StaticMoveSign.java | 28 +--
.../pulverizer/movecraft/sign/StatusSign.java | 96 ++++----
.../movecraft/sign/SubcraftRotateSign.java | 96 ++++----
.../movecraft/sign/TeleportSign.java | 36 +--
.../utils/BlockSnapshotSignDataUtil.java | 10 +-
.../movecraft/utils/BoundingBoxUtils.java | 26 +--
.../pulverizer/movecraft/utils/ChatUtils.java | 91 +++-----
.../movecraft/utils/CollectionUtils.java | 2 +-
.../movecraft/utils/HashHitBox.java | 102 ++++-----
.../pulverizer/movecraft/utils/HitBox.java | 4 +-
.../pulverizer/movecraft/utils/MathUtils.java | 35 ++-
.../movecraft/utils/MutableHitBox.java | 3 +-
.../movecraft/utils/SolidHitBox.java | 44 ++--
.../movecraft/utils/WorldUtils.java | 17 +-
.../movecraft/world/ChunkDataManager.java | 159 ++++++-------
.../movecraft/world/NextTickProvider.java | 59 ++---
.../movecraft/world/TileHolder.java | 31 +--
src/main/resources/movecraft.accesswidener | 6 +
{gradle/vanilla => vanilla}/build.gradle.kts | 14 +-
90 files changed, 2169 insertions(+), 1992 deletions(-)
rename {gradle/forge => forge}/build.gradle.kts (100%)
rename {gradle/forge => forge}/gradle.properties (100%)
rename {gradle/vanilla => vanilla}/build.gradle.kts (92%)
diff --git a/.gitignore b/.gitignore
index ad0ef9dca..4f0feb2c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,3 +79,6 @@ nb-configuration.xml
/gradle/forge/.gradle/
/gradle/forge/build/
/gradle/vanilla/build/
+/forge/.gradle/
+/forge/build/
+/vanilla/build/
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
index a55e7a179..6e6eec114 100644
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +1,6 @@
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3ff3e3228..29d15d7d2 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -31,13 +31,12 @@
-
+
-
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4f2a7b340..20d878e75 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,8 +12,7 @@
-
-
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9ae50fcc9..580c5dc56 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,13 +14,100 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -110,7 +197,6 @@
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
- "android.gradle.sync.needed": "true",
"git-widget-placeholder": "master",
"ignore.virus.scanning.warn.message": "true",
"last_opened_file_path": "C:/Users/berna/IdeaProjects/Movecraft-for-Sponge/buildSrc",
@@ -141,14 +227,14 @@
-
+
-
+
@@ -159,7 +245,29 @@
+
+
+ true
+ true
+ false
+ false
+
+
+
+
+
+
+
+
+
+
@@ -170,7 +278,7 @@
false
-
+
@@ -181,7 +289,29 @@
+
+
+ true
+ true
+ false
+ false
+
+
+
+
+
+
+
+
+
+
@@ -285,17 +415,20 @@
+
@@ -331,7 +464,16 @@
-
+
+
+
+
+
+
+
+
+
+
1630004325334
@@ -404,7 +546,15 @@
1696707757179
-
+
+
+ 1696708812402
+
+
+
+ 1696708812402
+
+
@@ -443,7 +593,8 @@
-
+
+
diff --git a/build.gradle.kts b/build.gradle.kts
index a14c2ca56..a02459e93 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,59 @@
+import org.spongepowered.gradle.plugin.config.PluginLoaders
+import org.spongepowered.plugin.metadata.model.PluginDependency
+
+repositories {
+ gradlePluginPortal()
+ mavenCentral()
+ maven {
+ setUrl("https://repo.spongepowered.org/repository/maven-public/")
+ }
+}
+
plugins {
id("io.github.pulverizer.movecraft.common_build")
id("org.spongepowered.gradle.vanilla")
+ id("org.spongepowered.gradle.plugin")
+ id("org.spongepowered.gradle.ore") // for Ore publishing
+}
+
+sponge {
+ apiVersion("8.2.0")
+ license("GPL-3.0")
+ loader {
+ name(PluginLoaders.JAVA_PLAIN)
+ version("1.0")
+ }
+ plugin("movecraft") {
+ displayName("Movecraft for Sponge")
+ entrypoint("io.github.pulverizer.movecraft.Movecraft")
+ description("Making vehicles out of blocks")
+ links {
+ homepage("https://ore.spongepowered.org/BernardisGood/Movecraft-for-Sponge")
+ source("https://github.com/Pulverizer/Movecraft-for-Sponge")
+ issues("https://github.com/Pulverizer/Movecraft-for-Sponge/issues")
+ }
+ contributor("BernardisGood") {
+ description("Lead Developer")
+ }
+ dependency("spongeapi") {
+ loadOrder(PluginDependency.LoadOrder.AFTER)
+ optional(false)
+ }
+ }
+}
+
+// Optional: configure publication to Ore
+// Publish using the publishToOre task
+// An API token is needed for this, by default read from the ORE_TOKEN environment variable
+oreDeployment {
+ // The default publication here is automatically configured by SpongeGradle
+ // using the first-created plugin"s ID as the project ID
+ // A version body is optional, to provide additional information about the release
+ /*
+defaultPublication {
+// Read the version body from the file whose path is provided to the changelog gradle property
+versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Charsets.UTF_8) }.orElse(""))
+}*/
}
tasks.shadowJar {
@@ -27,5 +80,5 @@ dependencies {
minecraft {
version("1.16.5")
- //accessWideners(file("../src/main/resources/movecraft.accesswidener"))
+ accessWideners(file("./src/main/resources/movecraft.accesswidener"))
}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts b/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts
index c2afb374d..4ecdea7d0 100644
--- a/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts
+++ b/buildSrc/src/main/kotlin/io.github.pulverizer.movecraft.common_build.gradle.kts
@@ -1,12 +1,7 @@
-import org.spongepowered.gradle.plugin.config.PluginLoaders
-import org.spongepowered.plugin.metadata.model.PluginDependency
-
plugins {
`java-library`
id("com.github.johnrengelman.shadow")
- id("org.spongepowered.gradle.plugin")
- id("org.spongepowered.gradle.ore") // for Ore publishing
// my plugins
`maven-publish`
@@ -19,35 +14,10 @@ dependencies {
testCompileOnly(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.7.0")
testCompileOnly(group = "org.mockito", name = "mockito-core", version = "3.+")
compileOnly("org.spongepowered:spongeapi:8.3.0-SNAPSHOT")
+ compileOnly("org.spongepowered:sponge:1.16.5-8.2.1-SNAPSHOT")
compileOnly("org.spongepowered:mixin:0.8.5")
}
-sponge {
- apiVersion("8.2.0")
- license("GPL-3.0")
- loader {
- name(PluginLoaders.JAVA_PLAIN)
- version("1.0")
- }
- plugin("movecraft") {
- displayName("Movecraft for Sponge")
- entrypoint("io.github.pulverizer.movecraft.Movecraft")
- description("Making vehicles out of blocks")
- links {
- homepage("https://ore.spongepowered.org/BernardisGood/Movecraft-for-Sponge")
- source("https://github.com/Pulverizer/Movecraft-for-Sponge")
- issues("https://github.com/Pulverizer/Movecraft-for-Sponge/issues")
- }
- contributor("BernardisGood") {
- description("Lead Developer")
- }
- dependency("spongeapi") {
- loadOrder(PluginDependency.LoadOrder.AFTER)
- optional(false)
- }
- }
-}
-
val javaTarget = 16
java {
sourceCompatibility = JavaVersion.toVersion(javaTarget)
@@ -70,20 +40,6 @@ tasks.withType(AbstractArchiveTask::class).configureEach {
isPreserveFileTimestamps = false
}
-// Optional: configure publication to Ore
-// Publish using the publishToOre task
-// An API token is needed for this, by default read from the ORE_TOKEN environment variable
-oreDeployment {
- // The default publication here is automatically configured by SpongeGradle
- // using the first-created plugin"s ID as the project ID
- // A version body is optional, to provide additional information about the release
- /*
-defaultPublication {
-// Read the version body from the file whose path is provided to the changelog gradle property
-versionBody.set(providers.gradleProperty("changelog").map { file(it).readText(Charsets.UTF_8) }.orElse(""))
-}*/
-}
-
configurations.create("shade")
configurations.create("provided").extendsFrom(configurations.getByName("shade"))
configurations.implementation.extendsFrom(configurations.getByName("provided"))
@@ -97,7 +53,7 @@ tasks.jar {
attributes["FMLCorePluginContainsFMLMod"] = "true"
}
}
-
+/*
publishing {
publications {
register("movecraft", MavenPublication::class) {
@@ -105,7 +61,7 @@ publishing {
}
}
}
-
+*/
dependencies {
testCompileOnly(group = "org.junit.jupiter", name = "junit-jupiter", version = "5.7.0")
testCompileOnly(group = "org.mockito", name = "mockito-core", version = "3.+")
diff --git a/gradle/forge/build.gradle.kts b/forge/build.gradle.kts
similarity index 100%
rename from gradle/forge/build.gradle.kts
rename to forge/build.gradle.kts
diff --git a/gradle/forge/gradle.properties b/forge/gradle.properties
similarity index 100%
rename from gradle/forge/gradle.properties
rename to forge/gradle.properties
diff --git a/settings.gradle b/settings.gradle
index 52c8df5e7..25cbd9f3c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,5 +31,5 @@ pluginManagement {
rootProject.name = 'movecraft'
-include ':gradle:vanilla'
-//include ':gradle:forge'
\ No newline at end of file
+include ':vanilla'
+//include ':forge'
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/Movecraft.java b/src/main/java/io/github/pulverizer/movecraft/Movecraft.java
index 7102f09f8..3b6f0f569 100644
--- a/src/main/java/io/github/pulverizer/movecraft/Movecraft.java
+++ b/src/main/java/io/github/pulverizer/movecraft/Movecraft.java
@@ -20,13 +20,16 @@
import io.github.pulverizer.movecraft.map_updater.MapUpdateManager;
import io.github.pulverizer.movecraft.sign.CommanderSign;
import io.github.pulverizer.movecraft.sign.CrewSign;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.api.Server;
import org.spongepowered.api.Sponge;
+import org.spongepowered.api.command.Command;
import org.spongepowered.api.config.ConfigDir;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.Order;
-import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
-import org.spongepowered.api.event.game.state.GameStartedServerEvent;
+import org.spongepowered.api.event.lifecycle.LoadedGameEvent;
+import org.spongepowered.api.event.lifecycle.RegisterCommandEvent;
+import org.spongepowered.api.event.lifecycle.StartedEngineEvent;
import org.spongepowered.plugin.PluginContainer;
import org.spongepowered.api.util.Ticks;
import org.spongepowered.plugin.builtin.jvm.Plugin;
@@ -37,7 +40,6 @@
import java.sql.SQLException;
@Plugin("movecraft")
-
public class Movecraft {
private static Movecraft instance;
@@ -96,40 +98,42 @@ public void registerFeatures(RegisterFeaturesEvent event) {
CrewRoles.register();
}
+ @Listener
+ public void registerCommandsEvent(final RegisterCommandEvent event) {
+ //TODO: Re-add commands!
+
+ /*this.getCommand("movecraft").setExecutor(new MovecraftCommand());
+ this.getCommand("release").setExecutor(new ReleaseCommand());
+ this.getCommand("pilot").setExecutor(new PilotCommand());
+ this.getCommand("add").setExecutor(new RotateCommand());
+ this.getCommand("cruise").setExecutor(new CruiseCommand());
+ this.getCommand("manoverboard").setExecutor(new ManOverboardCommand());
+ this.getCommand("scuttle").setExecutor(new ScuttleCommand());*/
+
+ event.register(container, CraftReportCommand.register(), "craftreport");
+ event.register(container, CrewCommand.register(), "crew");
+ event.register(container, CraftTypesCommand.register(), "crafttypes");
+ event.register(container, DockCommand.register(), "dock");
+ event.register(container, ContactsCommand.register(), "contacts");
+ }
+
/**
* Listener for GamePreInitializationEvent. Loads the Plugin's settings.
* @param event GamePreInitializationEvent from Listener.
*/
@Listener
- public void onLoad(GamePreInitializationEvent event) {
+ public void onLoad(final LoadedGameEvent event) {
instance = this;
// Call feature registration event
RegisterFeaturesEvent registerFeaturesEvent = new RegisterFeaturesEvent();
Sponge.eventManager().post(registerFeaturesEvent);
- // All addon features (eg. craft config settings, crew roles, etc.) should now be registered
+ // All addon features (e.g. craft config settings, crew roles, etc.) should now be registered
ConfigManager.checkSpongeConfig();
ConfigManager.loadMainConfig();
- //TODO: Re-add commands!
-
- /*this.getCommand("movecraft").setExecutor(new MovecraftCommand());
- this.getCommand("release").setExecutor(new ReleaseCommand());
- this.getCommand("pilot").setExecutor(new PilotCommand());
- this.getCommand("add").setExecutor(new RotateCommand());
- this.getCommand("cruise").setExecutor(new CruiseCommand());
- this.getCommand("manoverboard").setExecutor(new ManOverboardCommand());
- this.getCommand("scuttle").setExecutor(new ScuttleCommand());*/
-
- CraftReportCommand.register();
- CrewCommand.register();
- CraftTypesCommand.register();
- DockCommand.register();
- ContactsCommand.register();
-
-
Sponge.eventManager().registerListeners(container, new InteractListener());
Sponge.eventManager().registerListeners(container, new BlockListener());
Sponge.eventManager().registerListeners(container, new PlayerListener());
@@ -150,7 +154,7 @@ public void onLoad(GamePreInitializationEvent event) {
* @param event GameStartedServerEvent from Listener.
*/
@Listener
- public void initializeManagers(GameStartedServerEvent event) {
+ public void initializeManagers(final StartedEngineEvent event) {
CommanderSign.initDatabase();
if (Settings.EnableCrewSigns) {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BlockMapCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BlockMapCraftSetting.java
index e5a70188a..9ddf4cc65 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BlockMapCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BlockMapCraftSetting.java
@@ -1,9 +1,9 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import com.google.common.reflect.TypeToken;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
+import io.leangen.geantyref.TypeToken;
+import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.api.block.BlockType;
+import org.spongepowered.configurate.serialize.SerializationException;
import java.util.ArrayList;
import java.util.Collections;
@@ -14,9 +14,9 @@
public abstract class BlockMapCraftSetting extends CraftSetting, List>> {
@Override
- protected final Map, List> loadValue(ConfigurationNode config) throws ObjectMappingException {
+ protected final Map, List> loadValue(ConfigurationNode config) throws SerializationException {
HashMap, List> returnMap = new HashMap<>();
- Map, List> nodeMap = config.getNode(getNodeString()).getValue(new TypeToken, List>>() {}, new HashMap<>());
+ Map, List> nodeMap = config.node(getNodeString()).get(new TypeToken, List>>() {}, new HashMap<>());
nodeMap.forEach((blockTypeList, minMaxValues) -> {
// then read in the limitation values, low and high
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BooleanCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BooleanCraftSetting.java
index 93ed99e20..fc2c6b1be 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BooleanCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/BooleanCraftSetting.java
@@ -1,12 +1,12 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class BooleanCraftSetting extends CraftSetting {
@Override
protected Boolean loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getBoolean();
+ return config.node(getNodeString()).getBoolean();
}
public static abstract class True extends BooleanCraftSetting {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/CraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/CraftSetting.java
index e1403d4ee..5d2b41c41 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/CraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/CraftSetting.java
@@ -1,8 +1,8 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import com.google.common.reflect.TypeToken;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
+import io.leangen.geantyref.TypeToken;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.serialize.SerializationException;
import java.util.Collections;
import java.util.HashMap;
@@ -33,8 +33,8 @@ public static Map, Supplier(getClass()) {});
+ protected T loadValue(ConfigurationNode config) throws SerializationException {
+ return (T) config.node(getNodeString()).get(TypeToken.get(getClass()));
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/DoubleCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/DoubleCraftSetting.java
index 1bf0e178d..c0bddd040 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/DoubleCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/DoubleCraftSetting.java
@@ -1,12 +1,12 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class DoubleCraftSetting extends CraftSetting {
@Override
protected Double loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getDouble();
+ return config.node(getNodeString()).getDouble();
}
public static abstract class Zero extends DoubleCraftSetting {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/FloatCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/FloatCraftSetting.java
index ec55e9393..c87a45db3 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/FloatCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/FloatCraftSetting.java
@@ -1,12 +1,12 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class FloatCraftSetting extends CraftSetting {
@Override
protected Float loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getFloat();
+ return config.node(getNodeString()).getFloat();
}
public static abstract class Zero extends FloatCraftSetting {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/IntegerCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/IntegerCraftSetting.java
index b0b1ad4ea..4e2eff068 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/IntegerCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/IntegerCraftSetting.java
@@ -1,12 +1,12 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class IntegerCraftSetting extends CraftSetting {
@Override
protected Integer loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getInt();
+ return config.node(getNodeString()).getInt();
}
public static abstract class Zero extends IntegerCraftSetting {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/LongCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/LongCraftSetting.java
index 906992e31..2f17e4b57 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/LongCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/LongCraftSetting.java
@@ -1,12 +1,12 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class LongCraftSetting extends CraftSetting {
@Override
protected Long loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getLong();
+ return config.node(getNodeString()).getLong();
}
public static abstract class Zero extends LongCraftSetting {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/StringCraftSetting.java b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/StringCraftSetting.java
index 3ff9334ed..38104a56f 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/config/craft/StringCraftSetting.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/config/craft/StringCraftSetting.java
@@ -1,11 +1,11 @@
package io.github.pulverizer.movecraft.api.config.craft;
-import ninja.leaping.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationNode;
public abstract class StringCraftSetting extends CraftSetting {
@Override
protected String loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getString();
+ return config.node(getNodeString()).getString();
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftCollisionEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftCollisionEvent.java
index d94c37a78..c0eeb8c86 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftCollisionEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftCollisionEvent.java
@@ -2,11 +2,14 @@
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.utils.HashHitBox;
+import org.spongepowered.api.Sponge;
import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.Cause;
public class CraftCollisionEvent extends AbstractCraftEvent implements Cancellable {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final HashHitBox hitBox;
public CraftCollisionEvent(Craft craft, HashHitBox hitBox) {
@@ -19,7 +22,7 @@ public HashHitBox getHitBox() {
}
@Override
- public Cause getCause() {
- return null;
+ public Cause cause() {
+ return cause;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftDetectEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftDetectEvent.java
index 7db9243da..abeb88f52 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftDetectEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftDetectEvent.java
@@ -3,17 +3,17 @@
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.Craft;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.cause.EventContext;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.EventContext;
+import net.kyori.adventure.text.Component;
public class CraftDetectEvent extends AbstractCraftEvent {
private final Cause cause;
- private final Player player;
+ private final ServerPlayer player;
- public CraftDetectEvent(Craft craft, Player player) {
+ public CraftDetectEvent(Craft craft, ServerPlayer player) {
super(craft);
this.player = player;
@@ -23,20 +23,20 @@ public CraftDetectEvent(Craft craft, Player player) {
.build(EventContext.empty());
//TODO - Add more details - eg. is it a Subcraft?
- player.sendMessage(Text.of("Successfully commandeered " + craft.getType().getValue(CraftSettings.Name.class).get() + " Size: " + craft
+ player.sendMessage(Component.text("Successfully commandeered " + craft.type().getValue(CraftSettings.Name.class).get() + " Size: " + craft
.getHitBox().size()));
Movecraft.getInstance().getLogger()
- .info("New Craft Detected! Commandeered By: " + player.getName() + " CraftType: " + craft.getType().getValue(
+ .info("New Craft Detected! Commandeered By: " + player.name() + " CraftType: " + craft.type().getValue(
CraftSettings.Name.class).get() + " Size: " + craft.getHitBox().size() + " Location: " + craft.getHitBox().getMidPoint()
.toString());
}
@Override
- public Cause getCause() {
+ public Cause cause() {
return cause;
}
- public Player getPlayer() {
+ public ServerPlayer getPlayer() {
return player;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftPilotEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftPilotEvent.java
index b0d58face..5ce164883 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftPilotEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftPilotEvent.java
@@ -1,7 +1,8 @@
package io.github.pulverizer.movecraft.api.event;
import io.github.pulverizer.movecraft.craft.Craft;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.Cause;
/**
* Called whenever a craft is piloted
@@ -10,6 +11,8 @@
@SuppressWarnings("unused")
public class CraftPilotEvent extends AbstractCraftEvent {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final Reason reason;
public CraftPilotEvent(Craft craft, Reason reason) {
@@ -22,8 +25,8 @@ public Reason getReason() {
}
@Override
- public Cause getCause() {
- return null;
+ public Cause cause() {
+ return cause;
}
public enum Reason {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftReleaseEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftReleaseEvent.java
index 2a5165f01..29e26552c 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftReleaseEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftReleaseEvent.java
@@ -1,7 +1,8 @@
package io.github.pulverizer.movecraft.api.event;
import io.github.pulverizer.movecraft.craft.Craft;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.Cause;
/**
* Called whenever a craft is released
@@ -10,6 +11,8 @@
@SuppressWarnings("unused")
public class CraftReleaseEvent extends AbstractCraftEvent {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final Reason reason;
public CraftReleaseEvent(Craft craft, Reason reason) {
@@ -22,8 +25,8 @@ public Reason getReason() {
}
@Override
- public Cause getCause() {
- return null;
+ public Cause cause() {
+ return cause;
}
public enum Reason {
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftRotateEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftRotateEvent.java
index 57d31ed15..4e5f27ece 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftRotateEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftRotateEvent.java
@@ -2,8 +2,9 @@
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.utils.HitBox;
+import org.spongepowered.api.Sponge;
import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.Cause;
/**
* Called whenever a craft is rotated
@@ -13,6 +14,8 @@
@SuppressWarnings("unused")
public class CraftRotateEvent extends AbstractCraftEvent implements Cancellable {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final HitBox oldHitBox;
private final HitBox newHitBox;
private String failMessage = "";
@@ -51,7 +54,7 @@ public void setCancelled(boolean cancel) {
}
@Override
- public Cause getCause() {
- return null;
+ public Cause cause() {
+ return cause;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftSinkEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftSinkEvent.java
index e84ad65dd..0747c2f5b 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftSinkEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftSinkEvent.java
@@ -1,11 +1,14 @@
package io.github.pulverizer.movecraft.api.event;
import io.github.pulverizer.movecraft.craft.Craft;
+import org.spongepowered.api.Sponge;
import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.Cause;
public class CraftSinkEvent extends AbstractCraftEvent implements Cancellable {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private boolean cancelled = false;
public CraftSinkEvent(Craft craft) {
@@ -23,7 +26,7 @@ public void setCancelled(boolean cancel) {
}
@Override
- public Cause getCause() {
- return null;
+ public Cause cause() {
+ return cause;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftTranslateEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftTranslateEvent.java
index 9191be75c..f66bd28c8 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/CraftTranslateEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/CraftTranslateEvent.java
@@ -2,8 +2,9 @@
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.utils.HashHitBox;
+import org.spongepowered.api.Sponge;
import org.spongepowered.api.event.Cancellable;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.Cause;
/**
* Called whenever a craft is translated.
@@ -13,6 +14,8 @@
@SuppressWarnings("unused")
public class CraftTranslateEvent extends AbstractCraftEvent implements Cancellable {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final HashHitBox oldHitBox;
private final HashHitBox newHitBox;
private String failMessage = "";
@@ -51,7 +54,7 @@ public void setFailMessage(String failMessage) {
}
@Override
- public Cause getCause() {
+ public Cause cause() {
return null;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/RegisterFeaturesEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/RegisterFeaturesEvent.java
index c4ed06b38..626895b6a 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/RegisterFeaturesEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/RegisterFeaturesEvent.java
@@ -1,14 +1,14 @@
package io.github.pulverizer.movecraft.api.event;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.event.cause.Cause;
+import org.spongepowered.api.event.Cause;
import org.spongepowered.api.event.impl.AbstractEvent;
public class RegisterFeaturesEvent extends AbstractEvent {
- private final Cause cause = Sponge.getCauseStackManager().getCurrentCause();
+ private final Cause cause = Sponge.systemSubject().contextCause();
- @Override public Cause getCause() {
+ @Override public Cause cause() {
return cause;
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/api/event/SignTranslateEvent.java b/src/main/java/io/github/pulverizer/movecraft/api/event/SignTranslateEvent.java
index 5f9fcf2ae..549f8e9a0 100644
--- a/src/main/java/io/github/pulverizer/movecraft/api/event/SignTranslateEvent.java
+++ b/src/main/java/io/github/pulverizer/movecraft/api/event/SignTranslateEvent.java
@@ -1,16 +1,18 @@
package io.github.pulverizer.movecraft.api.event;
-import com.flowpowered.math.vector.Vector3i;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.event.Cause;
+import org.spongepowered.api.event.EventContext;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.craft.Craft;
-import org.spongepowered.api.event.cause.Cause;
-import org.spongepowered.api.event.cause.EventContext;
-import org.spongepowered.api.world.World;
-
public class SignTranslateEvent extends AbstractCraftEvent {
+ private final Cause cause = Sponge.systemSubject().contextCause();
+
private final Vector3i location;
- private final World world;
+ private final ServerWorld world;
public SignTranslateEvent(Vector3i location, Craft craft) {
super(craft);
@@ -22,22 +24,12 @@ public Vector3i getBlockPosition() {
return location;
}
- public World getWorld() {
+ public ServerWorld getWorld() {
return world;
}
@Override
- public Cause getCause() {
- return null;
- }
-
- @Override
- public Object getSource() {
- return null;
- }
-
- @Override
- public EventContext getContext() {
- return null;
+ public Cause cause() {
+ return cause;
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/async/AsyncManager.java b/src/main/java/io/github/pulverizer/movecraft/async/AsyncManager.java
index 65b405ebc..70ed7bc40 100644
--- a/src/main/java/io/github/pulverizer/movecraft/async/AsyncManager.java
+++ b/src/main/java/io/github/pulverizer/movecraft/async/AsyncManager.java
@@ -1,6 +1,6 @@
package io.github.pulverizer.movecraft.async;
-import com.flowpowered.math.vector.Vector3i;
+import org.spongepowered.math.vector.Vector3i;
import com.google.common.collect.Sets;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -9,8 +9,8 @@
import io.github.pulverizer.movecraft.config.CrewRoles;
import io.github.pulverizer.movecraft.enums.DirectControlMode;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.data.key.Keys;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.item.inventory.entity.PlayerInventory;
import org.spongepowered.api.util.Direction;
@@ -24,7 +24,7 @@ public class AsyncManager implements Runnable {
private final BlockingQueue taskQueue = new LinkedBlockingQueue<>();
private final HashSet clearanceSet = new HashSet<>();
private long lastFadeCheck = 0;
- private int lastContactCheck = 0;
+ private long lastContactCheck = 0;
public static AsyncManager getInstance() {
if (ourInstance == null) {
@@ -67,8 +67,8 @@ private void processCruise() {
continue;
}
- if (craft.getType().getValue(CraftSettings.CruiseOnPilot.class).get() && craft.getType().getValue(CraftSettings.CruiseOnPilotMaxMoves.class).get() > 0
- && craft.getType().getValue(CraftSettings.CruiseOnPilotMaxMoves.class).get() <= craft.getNumberOfMoves()) {
+ if (craft.type().getValue(CraftSettings.CruiseOnPilot.class).get() && craft.type().getValue(CraftSettings.CruiseOnPilotMaxMoves.class).get() > 0
+ && craft.type().getValue(CraftSettings.CruiseOnPilotMaxMoves.class).get() <= craft.getNumberOfMoves()) {
craft.sink();
}
@@ -78,14 +78,14 @@ private void processCruise() {
boolean dive = false;
if (craft.getDirectControlMode().equals(DirectControlMode.B)) {
- Player pilot = Sponge.getServer().getPlayer(craft.getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).get();
+ ServerPlayer pilot = Sponge.server().player(craft.getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).get();
if (pilot.get(Keys.IS_SNEAKING).get()) {
dive = true;
}
- if (((PlayerInventory) pilot.getInventory()).getHotbar().getSelectedSlotIndex() == 3) {
+ if (((PlayerInventory) pilot.inventory()).hotbar().selectedSlotIndex() == 3) {
bankLeft = true;
}
- if (((PlayerInventory) pilot.getInventory()).getHotbar().getSelectedSlotIndex() == 5) {
+ if (((PlayerInventory) pilot.inventory()).hotbar().selectedSlotIndex() == 5) {
bankRight = true;
}
}
@@ -97,70 +97,70 @@ private void processCruise() {
// ascend
if (craft.getVerticalCruiseDirection() == Direction.UP) {
if (craft.getHorizontalCruiseDirection() != Direction.NONE) {
- dy = (1 + craft.getType().getValue(CraftSettings.VertCruiseSkipBlocks.class).get()) >> 1;
+ dy = (1 + craft.type().getValue(CraftSettings.VertCruiseSkipBlocks.class).get()) >> 1;
} else {
- dy = 1 + craft.getType().getValue(CraftSettings.VertCruiseSkipBlocks.class).get();
+ dy = 1 + craft.type().getValue(CraftSettings.VertCruiseSkipBlocks.class).get();
}
}
// descend
if (craft.getVerticalCruiseDirection() == Direction.DOWN) {
if (craft.getHorizontalCruiseDirection() != Direction.NONE) {
- dy = (-1 - craft.getType().getValue(CraftSettings.VertCruiseSkipBlocks.class).get()) >> 1;
+ dy = (-1 - craft.type().getValue(CraftSettings.VertCruiseSkipBlocks.class).get()) >> 1;
} else {
- dy = -1 - craft.getType().getValue(CraftSettings.VertCruiseSkipBlocks.class).get();
+ dy = -1 - craft.type().getValue(CraftSettings.VertCruiseSkipBlocks.class).get();
}
} else if (dive) {
- dy = -((craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get() + 1) >> 1);
- if (craft.getHitBox().getMinY() <= craft.getWorld().getSeaLevel()) {
+ dy = -((craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get() + 1) >> 1);
+ if (craft.getHitBox().getMinY() <= craft.getWorld().seaLevel()) {
dy = -1;
}
}
switch (craft.getHorizontalCruiseDirection()) {
case WEST:
- dx = 1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get();
+ dx = 1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get();
if (bankRight) {
- dz = (-1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dz = (-1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
if (bankLeft) {
- dz = (1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dz = (1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
break;
case EAST:
- dx = -1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get();
+ dx = -1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get();
if (bankRight) {
- dz = (1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dz = (1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
if (bankLeft) {
- dz = (-1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dz = (-1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
break;
case NORTH:
- dz = 1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get();
+ dz = 1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get();
if (bankRight) {
- dx = (-1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dx = (-1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
if (bankLeft) {
- dx = (1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dx = (1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
break;
case SOUTH:
- dz = -1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get();
+ dz = -1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get();
if (bankRight) {
- dx = (1 + craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dx = (1 + craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
if (bankLeft) {
- dx = (-1 - craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
+ dx = (-1 - craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get()) >> 1;
}
break;
@@ -174,7 +174,7 @@ private void detectSinking() {
HashSet crafts = Sets.newHashSet(CraftManager.getInstance());
crafts.forEach(craft -> {
- if (Sponge.getServer().getRunningTimeTicks() - craft.getLastCheckTick() <= Settings.SinkCheckTicks) {
+ if (Sponge.server().runningTimeTicks().ticks() - craft.getLastCheckTick() <= Settings.SinkCheckTicks) {
return;
}
@@ -196,16 +196,16 @@ private void processSinking() {
return;
}
- long ticksElapsed = Sponge.getServer().getRunningTimeTicks() - craft.getLastMoveTick();
- if (Math.abs(ticksElapsed) < craft.getType().getValue(CraftSettings.SinkRateTicks.class).get()) {
+ long ticksElapsed = Sponge.server().runningTimeTicks().ticks() - craft.getLastMoveTick();
+ if (Math.abs(ticksElapsed) < craft.type().getValue(CraftSettings.SinkRateTicks.class).get()) {
return;
}
int dx = 0;
int dz = 0;
- if (craft.getType().getValue(CraftSettings.KeepMovingOnSink.class).get()) {
- dx = craft.getLastMoveVector().getX();
- dz = craft.getLastMoveVector().getZ();
+ if (craft.type().getValue(CraftSettings.KeepMovingOnSink.class).get()) {
+ dx = craft.getLastMoveVector().x();
+ dz = craft.getLastMoveVector().z();
}
craft.translate(new Vector3i(dx, -1, dz));
@@ -213,7 +213,7 @@ private void processSinking() {
}
private void processDetection() {
- long ticksElapsed = (Sponge.getServer().getRunningTimeTicks() - lastContactCheck);
+ long ticksElapsed = (Sponge.server().runningTimeTicks().ticks() - lastContactCheck);
if (ticksElapsed < 22) {
return;
@@ -221,7 +221,7 @@ private void processDetection() {
CraftManager.getInstance().forEach(Craft::runContacts);
- lastContactCheck = Sponge.getServer().getRunningTimeTicks();
+ lastContactCheck = Sponge.server().runningTimeTicks().ticks();
}
public void run() {
@@ -235,12 +235,12 @@ public void run() {
// Cleanup crafts that are bugged and have not moved in the past 60 seconds, but have no crew or are still processing.
for (Craft craft : CraftManager.getInstance()) {
- if (craft.getCrew().isEmpty() && craft.getLastMoveTick() < Sponge.getServer().getRunningTimeTicks() - 1200) {
+ if (craft.getCrew().isEmpty() && craft.getLastMoveTick() < Sponge.server().runningTimeTicks().ticks() - 1200) {
CraftManager.getInstance().forceRemoveCraft(craft);
}
// Stop crafts from moving if they have taken too long to process.
- if (craft.isProcessing() && craft.isCruising() && craft.getProcessingStartTime() < Sponge.getServer().getRunningTimeTicks() - 1200) {
+ if (craft.isProcessing() && craft.isCruising() && craft.getProcessingStartTime() < Sponge.server().runningTimeTicks().ticks() - 1200) {
craft.setProcessing(false);
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/async/AsyncTask.java b/src/main/java/io/github/pulverizer/movecraft/async/AsyncTask.java
index d7fd92de7..a8b3d0f2f 100644
--- a/src/main/java/io/github/pulverizer/movecraft/async/AsyncTask.java
+++ b/src/main/java/io/github/pulverizer/movecraft/async/AsyncTask.java
@@ -3,9 +3,10 @@
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.craft.Craft;
-import org.spongepowered.api.entity.living.player.Player;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.scheduler.Task;
-import org.spongepowered.api.text.Text;
import java.util.Optional;
@@ -27,11 +28,11 @@ public void run() {
String taskName = "Movecraft - " + type + " Task - " + craft.getId();
- Task.builder()
- .async()
- .name(taskName)
+ Sponge.asyncScheduler().submit(
+ Task.builder()
.execute(this::task)
- .submit(Movecraft.getInstance());
+ .build(),
+ taskName);
if (Settings.Debug) {
Movecraft.getInstance().getLogger().info(taskName);
@@ -64,13 +65,13 @@ private void task() {
protected abstract void postProcess();
- protected abstract Optional getNotificationPlayer();
+ protected abstract Optional getNotificationPlayer();
protected void fail(String message) {
failed = true;
failMessage = message;
- getNotificationPlayer().ifPresent(player -> player.sendMessage(Text.of(type + " Failed: " + message)));
+ getNotificationPlayer().ifPresent(player -> player.sendMessage(Component.text(type + " Failed: " + message)));
Movecraft.getInstance().getLogger().info("Craft " + type + " Failed: " + getFailMessage());
diff --git a/src/main/java/io/github/pulverizer/movecraft/async/DetectionTask.java b/src/main/java/io/github/pulverizer/movecraft/async/DetectionTask.java
index ffaab774c..16c4da3b0 100644
--- a/src/main/java/io/github/pulverizer/movecraft/async/DetectionTask.java
+++ b/src/main/java/io/github/pulverizer/movecraft/async/DetectionTask.java
@@ -1,6 +1,11 @@
package io.github.pulverizer.movecraft.async;
-import com.flowpowered.math.vector.Vector3i;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.world.server.ServerLocation;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.Craft;
@@ -13,12 +18,11 @@
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.block.tileentity.Sign;
-import org.spongepowered.api.data.value.mutable.ListValue;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.block.entity.Sign;
+import org.spongepowered.api.data.value.ListValue;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.world.server.ServerLocation;
import java.sql.Date;
import java.sql.Time;
@@ -39,23 +43,23 @@
*/
public class DetectionTask extends AsyncTask {
- private final World world;
+ private final ServerWorld world;
private final Vector3i startLocation;
private final Stack blockStack = new Stack<>();
private final HashHitBox detectedHitBox = new HashHitBox();
private final HashSet visited = new HashSet<>();
private final HashMap, Integer> blockTypeCount = new HashMap<>();
- protected Player player;
+ protected ServerPlayer player;
private HashHitBox hitBox;
private boolean waterContact = false;
private Map.Entry commanderSignTimeStamp;
private String commanderSignUsername;
private int commanderSignId;
- public DetectionTask(Craft craft, Location startLocation, Player player) {
+ public DetectionTask(Craft craft, ServerLocation startLocation, ServerPlayer player) {
super(craft, "Detection");
- world = startLocation.getExtent();
- this.startLocation = startLocation.getBlockPosition();
+ world = startLocation.world();
+ this.startLocation = startLocation.blockPosition();
this.player = player;
}
@@ -109,30 +113,30 @@ private void detectBlock(Vector3i blockPosition) {
}
// Get the BlockType
- BlockType blockType = world.getBlockType(blockPosition);
+ BlockType blockType = world.block(blockPosition).type();
// Return if BlockType is Air OR is forbidden on CraftType
if (blockType.equals(BlockTypes.AIR)) {
return;
}
- if (craft.getType().getValue(CraftSettings.ForbiddenBlocks.class).get().contains(blockType)) {
+ if (craft.type().getValue(CraftSettings.ForbiddenBlocks.class).get().contains(blockType)) {
fail(String.format("Found forbidden block %s at %s", blockType, blockPosition));
return;
}
// Check for water contact
- if (blockType.equals(BlockTypes.FLOWING_WATER) || blockType.equals(BlockTypes.WATER)) {
+ if (blockType.equals(BlockTypes.WATER.get())) {
waterContact = true;
}
// Check if sign, if so, do additional processing
- if (blockType.equals(BlockTypes.STANDING_SIGN) || blockType.equals(BlockTypes.WALL_SIGN)) {
+ if (BlockTypeTags.SIGNS.get().contains(blockType)) {
processSign(blockPosition);
}
// Return if not one of the CraftType's allowed BlockTypes
- if (!craft.getType().getValue(CraftSettings.AllowedBlocks.class).get().contains(blockType)) {
+ if (!craft.type().getValue(CraftSettings.AllowedBlocks.class).get().contains(blockType)) {
return;
}
@@ -158,13 +162,13 @@ private boolean notVisited(Vector3i blockPosition) {
}
private void processSign(Vector3i blockPosition) {
- if (world.getTileEntity(blockPosition).isPresent()) {
+ if (world.blockEntity(blockPosition).isPresent()) {
- ListValue signText = ((Sign) world.getTileEntity(blockPosition).get()).lines();
- if (signText.get(0).toPlain().equalsIgnoreCase("Commander:")) {
+ ListValue.Mutable signText = ((Sign) world.blockEntity(blockPosition).get()).lines();
+ if (PlainTextComponentSerializer.plainText().serialize(signText.get(0)).equalsIgnoreCase("Commander:")) {
- String testUsername = signText.get(1).toPlain();
- int testId = Integer.parseInt(signText.get(2).toPlain());
+ String testUsername = PlainTextComponentSerializer.plainText().serialize(signText.get(1));
+ int testId = Integer.parseInt(PlainTextComponentSerializer.plainText().serialize(signText.get(2)));
Map.Entry timestamp = CommanderSign.getCreationTimeStamp(testUsername, testId);
@@ -190,8 +194,8 @@ private void processSign(Vector3i blockPosition) {
}
}
- for (Text line : signText) {
- if (craft.getType().getValue(CraftSettings.ForbiddenSignStrings.class).get().contains(line.toString())) {
+ for (Component line : signText) {
+ if (craft.type().getValue(CraftSettings.ForbiddenSignStrings.class).get().contains(PlainTextComponentSerializer.plainText().serialize(line))) {
fail("Detection Failed - Forbidden sign string found.");
break;
}
@@ -200,7 +204,7 @@ private void processSign(Vector3i blockPosition) {
}
private void countFlyBlock(BlockType blockType) {
- for (List flyBlockDef : craft.getType().getValue(CraftSettings.FlyBlocks.class).get().keySet()) {
+ for (List flyBlockDef : craft.type().getValue(CraftSettings.FlyBlocks.class).get().keySet()) {
if (flyBlockDef.contains(blockType)) {
blockTypeCount.merge(flyBlockDef, 1, Integer::sum);
} else {
@@ -221,7 +225,7 @@ private void confirmRequirements() {
isWithinSizeLimits();
// Check if CraftType requires contact with water
- if (craft.getType().getValue(CraftSettings.RequireWaterContact.class).get() && !waterContact) {
+ if (craft.type().getValue(CraftSettings.RequireWaterContact.class).get() && !waterContact) {
fail("Detection Failed - Water contact required but not found!");
return;
}
@@ -236,14 +240,14 @@ private void isWithinSizeLimits() {
}
private void isOverMinSize() {
- if (detectedHitBox.size() < craft.getType().getValue(CraftSettings.MinSize.class).get()) {
- fail(String.format("Craft too small! Min Size: %d", craft.getType().getValue(CraftSettings.MinSize.class).get()));
+ if (detectedHitBox.size() < craft.type().getValue(CraftSettings.MinSize.class).get()) {
+ fail(String.format("Craft too small! Min Size: %d", craft.type().getValue(CraftSettings.MinSize.class).get()));
}
}
private boolean isUnderMaxSize() {
- if (detectedHitBox.size() > craft.getType().getValue(CraftSettings.MaxSize.class).get()) {
- fail(String.format("Craft too large! Max Size: %d", craft.getType().getValue(CraftSettings.MaxSize.class).get()));
+ if (detectedHitBox.size() > craft.type().getValue(CraftSettings.MaxSize.class).get()) {
+ fail(String.format("Craft too large! Max Size: %d", craft.type().getValue(CraftSettings.MaxSize.class).get()));
return false;
}
@@ -258,7 +262,7 @@ private void checkCommanderSign() {
Movecraft.getInstance().getLogger().warn("Commander sign not registered in database");
} else if (!commanderSignMemberMap.containsKey(craft.commandeeredBy())
- && !Sponge.getServer().getPlayer(craft.commandeeredBy()).get().hasPermission("movecraft.bypasslock")) {
+ && !Sponge.server().player(craft.commandeeredBy()).get().hasPermission("movecraft.bypasslock")) {
fail("Not one of the registered commanders for this craft.");
}
@@ -266,39 +270,37 @@ private void checkCommanderSign() {
}
private void checkFlyBlocks() {
- Map, List> flyBlocks = craft.getType().getValue(CraftSettings.FlyBlocks.class).get();
+ Map, List> flyBlocks = craft.type().getValue(CraftSettings.FlyBlocks.class).get();
- for (List i : flyBlocks.keySet()) {
- Integer numberOfBlocks = blockTypeCount.get(i);
+ for (List blockTypes : flyBlocks.keySet()) {
+ Integer numberOfBlocks = blockTypeCount.get(blockTypes);
if (numberOfBlocks == null) {
numberOfBlocks = 0;
}
float blockPercentage = (((float) numberOfBlocks / detectedHitBox.size()) * 100);
- Double minPercentage = flyBlocks.get(i).get(0);
- Double maxPercentage = flyBlocks.get(i).get(1);
+ Double minPercentage = flyBlocks.get(blockTypes).get(0);
+ Double maxPercentage = flyBlocks.get(blockTypes).get(1);
if (minPercentage < 10000.0) {
if (blockPercentage < minPercentage) {
- fail(String.format("Not enough flyblock" + ": %s %.2f%% < %.2f%%", i.get(0).getName(), blockPercentage, minPercentage));
+ fail(String.format("Not enough flyblock" + ": %s %.2f%% < %.2f%%", PlainTextComponentSerializer.plainText().serialize(blockTypes.get(0).asComponent()), blockPercentage, minPercentage));
return;
}
- } else if (numberOfBlocks < flyBlocks.get(i).get(0) - 10000.0) {
- fail(String.format("Not enough flyblock" + ": %s %d < %d", i.get(0).getName(), numberOfBlocks,
- flyBlocks.get(i).get(0).intValue() - 10000));
+ } else if (numberOfBlocks < flyBlocks.get(blockTypes).get(0) - 10000.0) {
+ fail(String.format("Not enough flyblock" + ": %s %d < %d", PlainTextComponentSerializer.plainText().serialize(blockTypes.get(0).asComponent()), numberOfBlocks, flyBlocks.get(blockTypes).get(0).intValue() - 10000));
return;
}
if (maxPercentage < 10000.0) {
if (blockPercentage > maxPercentage) {
- fail(String.format("Too much flyblock" + ": %s %.2f%% > %.2f%%", i.get(0).getName(), blockPercentage, maxPercentage));
+ fail(String.format("Too much flyblock" + ": %s %.2f%% > %.2f%%", PlainTextComponentSerializer.plainText().serialize(blockTypes.get(0).asComponent()), blockPercentage, maxPercentage));
return;
}
- } else if (numberOfBlocks > flyBlocks.get(i).get(1) - 10000.0) {
- fail(String.format("Too much flyblock" + ": %s %d > %d", i.get(0).getName(), numberOfBlocks,
- flyBlocks.get(i).get(1).intValue() - 10000));
+ } else if (numberOfBlocks > flyBlocks.get(blockTypes).get(1) - 10000.0) {
+ fail(String.format("Too much flyblock" + ": %s %d > %d", PlainTextComponentSerializer.plainText().serialize(blockTypes.get(0).asComponent()), numberOfBlocks, flyBlocks.get(blockTypes).get(1).intValue() - 10000));
return;
}
@@ -337,9 +339,9 @@ public void postProcess() {
processPhasedBlocks();
// Check if CraftType can have crew
- if (!craft.isSubCraft() && craft.getType().getValue(CraftSettings.CanHaveCrew.class).get()) {
- craft.getCrew().add(player.getUniqueId());
- craft.getCrew().setRole(player.getUniqueId(), CrewRoles.Commander.class);
+ if (!craft.isSubCraft() && craft.type().getValue(CraftSettings.CanHaveCrew.class).get()) {
+ craft.getCrew().add(player.uniqueId());
+ craft.getCrew().setRole(player.uniqueId(), CrewRoles.Commander.class);
}
// Check player is still online
@@ -352,7 +354,7 @@ public void postProcess() {
// Fire craft detection event - Event should notify player and log itself in the console
CraftDetectEvent event = new CraftDetectEvent(craft, player);
- Sponge.getEventManager().post(event);
+ Sponge.eventManager().post(event);
// Act on whether the event was cancelled or not
if (event.isCancelled()) {
@@ -377,7 +379,7 @@ private Craft getParentCraft() {
}
for (Craft testCraft : intersectingCrafts) {
- if (testCraft.getType() == craft.getType() || testCraft.getHitBox().size() <= hitBox.size()) {
+ if (testCraft.type() == craft.type() || testCraft.getHitBox().size() <= hitBox.size()) {
if (testCraft.getCrew().contains(craft.commandeeredBy())) {
fail("You are already in the crew of this craft.");
} else {
@@ -389,7 +391,7 @@ private Craft getParentCraft() {
// Removing to fix issue #63 (Subcrafts disconnecting from parent craft)
// Can't remember why this exists...
- //if (craft.getType().limitToParentHitBox()) {
+ //if (craft.type().limitToParentHitBox()) {
craft.setIsSubCraft();
//}
@@ -401,13 +403,13 @@ private Craft getParentCraft() {
}
private void processIsSubcraft(Craft originCraft) {
- if (originCraft == null && craft.getType().getValue(CraftSettings.MustBeSubcraft.class).get()) {
+ if (originCraft == null && craft.type().getValue(CraftSettings.MustBeSubcraft.class).get()) {
fail("Craft must be part of another craft!");
return;
}
if (originCraft != null) {
- if (!originCraft.getCrew().contains(player.getUniqueId())) {
+ if (!originCraft.getCrew().contains(player.uniqueId())) {
fail("You are not in the crew of the parent craft.");
return;
}
@@ -421,18 +423,17 @@ private void processIsSubcraft(Craft originCraft) {
private void processPhasedBlocks() {
final int waterLine = craft.getWaterLine();
- if (!(!craft.getType().getValue(CraftSettings.PassthroughBlocks.class).get().contains(BlockTypes.WATER) || !craft.getType()
- .getValue(CraftSettings.PassthroughBlocks.class).get().contains(BlockTypes.FLOWING_WATER)) && craft.getHitBox().getMinY() <= waterLine) {
+ if (craft.type().getValue(CraftSettings.PassthroughBlocks.class).get().contains(BlockTypes.WATER.get()) && craft.getHitBox().getMinY() <= waterLine) {
for (Vector3i location : craft.getHitBox().boundingHitBox()) {
- if (location.getY() <= waterLine) {
- craft.getPhasedBlocks().add(BlockTypes.WATER.getDefaultState().snapshotFor(new Location<>(craft.getWorld(), location)));
+ if (location.y() <= waterLine) {
+ craft.getPhasedBlocks().add(BlockTypes.WATER.get().defaultState().snapshotFor(ServerLocation.of(craft.getWorld(), location)));
}
}
}
}
@Override
- protected Optional getNotificationPlayer() {
+ protected Optional getNotificationPlayer() {
return Optional.ofNullable(player);
}
}
\ No newline at end of file
diff --git a/src/main/java/io/github/pulverizer/movecraft/async/RotationTask.java b/src/main/java/io/github/pulverizer/movecraft/async/RotationTask.java
index d93d0dc63..b418d0801 100644
--- a/src/main/java/io/github/pulverizer/movecraft/async/RotationTask.java
+++ b/src/main/java/io/github/pulverizer/movecraft/async/RotationTask.java
@@ -1,7 +1,11 @@
package io.github.pulverizer.movecraft.async;
-import com.flowpowered.math.vector.Vector3d;
-import com.flowpowered.math.vector.Vector3i;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.common.util.SpongeAABB;
+import org.spongepowered.math.vector.Vector3d;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -21,12 +25,11 @@
import org.spongepowered.api.entity.Entity;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.entity.Item;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.scheduler.Task;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
import org.spongepowered.api.util.AABB;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.HashSet;
import java.util.Optional;
@@ -43,12 +46,12 @@ public class RotationTask extends AsyncTask {
};
private final Vector3i originPoint;
private final Rotation rotation;
- private final World world;
+ private final ServerWorld world;
private final Set updates = new HashSet<>();
private final HashHitBox oldHitBox;
private final HashHitBox newHitBox;
- public RotationTask(Craft craft, Vector3i originPoint, Rotation rotation, World world) {
+ public RotationTask(Craft craft, Vector3i originPoint, Rotation rotation, ServerWorld world) {
super(craft, "Rotation");
this.originPoint = originPoint;
this.rotation = rotation;
@@ -66,7 +69,7 @@ protected void execute() throws InterruptedException {
}
// Use some fuel if needed
- double fuelBurnRate = getCraft().getType().getValue(CraftSettings.FuelBurnRate.class).get();
+ double fuelBurnRate = getCraft().type().getValue(CraftSettings.FuelBurnRate.class).get();
if (fuelBurnRate > 0 && !getCraft().isSinking()) {
if (!getCraft().useFuel(fuelBurnRate)) {
fail("Craft out of fuel");
@@ -84,7 +87,7 @@ protected void execute() throws InterruptedException {
// Call event
CraftRotateEvent event = new CraftRotateEvent(craft, oldHitBox, newHitBox);
- Sponge.getEventManager().post(event);
+ Sponge.eventManager().post(event);
if (event.isCancelled()) {
fail(event.getFailMessage());
return;
@@ -116,7 +119,7 @@ private void moveEntities() throws InterruptedException {
final Vector3d tOP = originPoint.toDouble().add(0.5, 0, 0.5);
//prevents torpedo and rocket passengers
- if (craft.getType().getValue(CraftSettings.MoveEntities.class).get() && !craft.isSinking()) {
+ if (craft.type().getValue(CraftSettings.MoveEntities.class).get() && !craft.isSinking()) {
if (Settings.Debug) {
Movecraft.getInstance().getLogger().info("Craft moves Entities.");
@@ -124,28 +127,28 @@ private void moveEntities() throws InterruptedException {
AtomicBoolean processedEntities = new AtomicBoolean(false);
- Task.builder()
+ Task task = Task.builder()
.execute(() -> {
- for (Entity entity : craft.getWorld().getIntersectingEntities(
- new AABB(oldHitBox.getMinX() - 0.5, oldHitBox.getMinY() - 0.5, oldHitBox.getMinZ() - 0.5, oldHitBox.getMaxX() + 1.5,
- oldHitBox.getMaxY() + 1.5, oldHitBox.getMaxZ() + 1.5))) {
+ for (Entity entity : craft.getWorld().entities(
+ new SpongeAABB(new Vector3d(oldHitBox.getMinX() - 0.5, oldHitBox.getMinY() - 0.5, oldHitBox.getMinZ() - 0.5), new Vector3d(oldHitBox.getMaxX() + 1.5,
+ oldHitBox.getMaxY() + 1.5, oldHitBox.getMaxZ() + 1.5)))) {
- if (entity.getType() == EntityTypes.PLAYER || entity.getType() == EntityTypes.PRIMED_TNT
- || entity.getType() == EntityTypes.ITEM || !craft.getType().getValue(CraftSettings.OnlyMovePlayers.class).get()) {
+ if (entity.type() == EntityTypes.PLAYER.get() || entity.type() == EntityTypes.TNT.get()
+ || entity.type() == EntityTypes.ITEM.get() || !craft.type().getValue(CraftSettings.OnlyMovePlayers.class).get()) {
- Location adjustedPLoc = entity.getLocation().sub(tOP);
+ ServerLocation adjustedPLoc = entity.serverLocation().sub(tOP);
- double[] rotatedCoords = MathUtils.rotateVecNoRound(rotation, adjustedPLoc.getX(), adjustedPLoc.getZ());
+ double[] rotatedCoords = MathUtils.rotateVecNoRound(rotation, adjustedPLoc.x(), adjustedPLoc.z());
float newYaw = rotation == Rotation.CLOCKWISE ? 90F : -90F;
EntityUpdateCommand eUp = new EntityUpdateCommand(entity,
- new Vector3d(rotatedCoords[0] + tOP.getX(), entity.getLocation().getY(), rotatedCoords[1] + tOP.getZ()),
+ new Vector3d(rotatedCoords[0] + tOP.x(), entity.serverLocation().y(), rotatedCoords[1] + tOP.z()),
newYaw);
updates.add(eUp);
if (Settings.Debug) {
- Movecraft.getInstance().getLogger().info("Submitting Entity Update: " + entity.getType().getName());
- if (entity instanceof Item) {
- Movecraft.getInstance().getLogger().info("Item Type: " + ((Item) entity).getItemType().getName());
+ Movecraft.getInstance().getLogger().info("Submitting Entity Update: " + PlainTextComponentSerializer.plainText().serialize(entity.type().asComponent()));
+ if (entity instanceof Item item) {
+ Movecraft.getInstance().getLogger().info("Item Type: " + PlainTextComponentSerializer.plainText().serialize(item.item().get().type().asComponent()));
}
}
}
@@ -153,7 +156,9 @@ private void moveEntities() throws InterruptedException {
processedEntities.set(true);
})
- .submit(Movecraft.getInstance());
+ .build();
+
+ Sponge.server().scheduler().submit(task);
synchronized (this) {
@@ -174,16 +179,16 @@ private void checkCraftObstructed() {
}
//prevent chests collision
- BlockType oldMaterial = world.getBlockType(originalLocation);
+ BlockType oldMaterial = world.block(originalLocation).type();
if ((oldMaterial.equals(BlockTypes.CHEST) || oldMaterial.equals(BlockTypes.TRAPPED_CHEST)) && !checkChests(oldMaterial, newLocation)) {
- fail(String.format("Craft is obstructed by chest" + " @ %d,%d,%d", newLocation.getX(), newLocation.getY(), newLocation.getZ()));
+ fail(String.format("Craft is obstructed by chest" + " @ %d,%d,%d", newLocation.x(), newLocation.y(), newLocation.z()));
break;
}
- BlockType newMaterial = world.getBlockType(newLocation);
- if (newMaterial != BlockTypes.AIR && !craft.getType().getValue(CraftSettings.PassthroughBlocks.class).get().contains(newMaterial)) {
- fail(String.format("Craft is obstructed" + " @ %d,%d,%d", newLocation.getX(), newLocation.getY(), newLocation.getZ()));
+ BlockType newMaterial = world.block(newLocation).type();
+ if (newMaterial != BlockTypes.AIR && !craft.type().getValue(CraftSettings.PassthroughBlocks.class).get().contains(newMaterial)) {
+ fail(String.format("Craft is obstructed" + " @ %d,%d,%d", newLocation.x(), newLocation.y(), newLocation.z()));
break;
}
}
@@ -193,28 +198,28 @@ private void notifyPlayerOfNewDirection() {
int farthestX = 0;
int farthestZ = 0;
for (Vector3i loc : newHitBox) {
- if (Math.abs(loc.getX() - originPoint.getX()) > Math.abs(farthestX)) {
- farthestX = loc.getX() - originPoint.getX();
+ if (Math.abs(loc.x() - originPoint.x()) > Math.abs(farthestX)) {
+ farthestX = loc.x() - originPoint.x();
}
- if (Math.abs(loc.getZ() - originPoint.getZ()) > Math.abs(farthestZ)) {
- farthestZ = loc.getZ() - originPoint.getZ();
+ if (Math.abs(loc.z() - originPoint.z()) > Math.abs(farthestZ)) {
+ farthestZ = loc.z() - originPoint.z();
}
}
- Player pilot = getNotificationPlayer().orElse(null);
+ ServerPlayer pilot = getNotificationPlayer().orElse(null);
if (pilot != null) {
if (Math.abs(farthestX) > Math.abs(farthestZ)) {
if (farthestX > 0) {
- pilot.sendMessage(Text.of("The farthest extent now faces East"));
+ pilot.sendMessage(Component.text("The farthest extent now faces East"));
} else {
- pilot.sendMessage(Text.of("The farthest extent now faces West"));
+ pilot.sendMessage(Component.text("The farthest extent now faces West"));
}
} else if (Math.abs(farthestX) < Math.abs(farthestZ)) {
if (farthestZ > 0) {
- pilot.sendMessage(Text.of("The farthest extent now faces South"));
+ pilot.sendMessage(Component.text("The farthest extent now faces South"));
} else {
- pilot.sendMessage(Text.of("The farthest extent now faces North"));
+ pilot.sendMessage(Component.text("The farthest extent now faces North"));
}
}
}
@@ -232,7 +237,7 @@ public void postProcess() {
}
@Override
- protected Optional getNotificationPlayer() {
+ protected Optional getNotificationPlayer() {
return craft.getNotificationPlayer();
}
@@ -251,7 +256,7 @@ public Rotation getRotation() {
private boolean checkChests(BlockType mBlock, Vector3i newLoc) {
for (Vector3i shift : SHIFTS) {
Vector3i aroundNewLoc = newLoc.add(shift);
- BlockType testMaterial = craft.getWorld().getBlockType(aroundNewLoc.getX(), aroundNewLoc.getY(), aroundNewLoc.getZ());
+ BlockType testMaterial = craft.getWorld().block(aroundNewLoc).type();
if (testMaterial.equals(mBlock) && !oldHitBox.contains(aroundNewLoc)) {
return false;
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/async/TranslationTask.java b/src/main/java/io/github/pulverizer/movecraft/async/TranslationTask.java
index 98dd37284..5e4884d7f 100644
--- a/src/main/java/io/github/pulverizer/movecraft/async/TranslationTask.java
+++ b/src/main/java/io/github/pulverizer/movecraft/async/TranslationTask.java
@@ -1,7 +1,12 @@
package io.github.pulverizer.movecraft.async;
-import com.flowpowered.math.vector.Vector3i;
-import com.google.common.collect.ImmutableSet;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.common.util.SpongeAABB;
+import org.spongepowered.math.vector.Vector3d;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -23,11 +28,8 @@
import org.spongepowered.api.entity.Entity;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.entity.Item;
-import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.scheduler.Task;
-import org.spongepowered.api.util.AABB;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.Collection;
import java.util.HashSet;
@@ -39,16 +41,41 @@
public class TranslationTask extends AsyncTask {
//TODO: Move to config.
- private static final ImmutableSet FALL_THROUGH_BLOCKS = ImmutableSet
- .of(BlockTypes.AIR, BlockTypes.WATER, BlockTypes.LAVA, BlockTypes.FLOWING_WATER, BlockTypes.FLOWING_LAVA, BlockTypes.TALLGRASS,
- BlockTypes.YELLOW_FLOWER, BlockTypes.RED_FLOWER, BlockTypes.BROWN_MUSHROOM, BlockTypes.RED_MUSHROOM, BlockTypes.TORCH,
- BlockTypes.FIRE, BlockTypes.REDSTONE_WIRE, BlockTypes.WHEAT, BlockTypes.STANDING_SIGN, BlockTypes.LADDER, BlockTypes.WALL_SIGN,
- BlockTypes.LEVER, BlockTypes.LIGHT_WEIGHTED_PRESSURE_PLATE, BlockTypes.HEAVY_WEIGHTED_PRESSURE_PLATE,
- BlockTypes.STONE_PRESSURE_PLATE, BlockTypes.WOODEN_PRESSURE_PLATE, BlockTypes.UNLIT_REDSTONE_TORCH, BlockTypes.REDSTONE_TORCH,
- BlockTypes.STONE_BUTTON, BlockTypes.SNOW_LAYER, BlockTypes.REEDS, BlockTypes.FENCE, BlockTypes.ACACIA_FENCE,
- BlockTypes.BIRCH_FENCE, BlockTypes.DARK_OAK_FENCE, BlockTypes.JUNGLE_FENCE, BlockTypes.NETHER_BRICK_FENCE,
- BlockTypes.SPRUCE_FENCE, BlockTypes.UNPOWERED_REPEATER, BlockTypes.POWERED_REPEATER, BlockTypes.WATERLILY, BlockTypes.CARROTS,
- BlockTypes.POTATOES, BlockTypes.WOODEN_BUTTON, BlockTypes.CARPET);
+ private static final HashSet FALL_THROUGH_BLOCKS = new HashSet<>();
+
+ static {
+ FALL_THROUGH_BLOCKS.add(BlockTypes.AIR.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.WATER.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.LAVA.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.GRASS.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.TALL_GRASS.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.FLOWERS.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.SMALL_FLOWERS.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.TALL_FLOWERS.get().values());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.BROWN_MUSHROOM.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.RED_MUSHROOM.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.TORCH.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.WALL_TORCH.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.FIRE.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.REDSTONE_WIRE.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.CROPS.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.SIGNS.get().values());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.LADDER.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.LEVER.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.PRESSURE_PLATES.get().values());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.REDSTONE_TORCH.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.REDSTONE_WALL_TORCH.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.BUTTONS.get().values());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.SNOW.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.FENCES.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.WOODEN_FENCES.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.FENCE_GATES.get().values());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.REPEATER.get());
+ FALL_THROUGH_BLOCKS.add(BlockTypes.LILY_PAD.get());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.WOODEN_BUTTONS.get().values());
+ FALL_THROUGH_BLOCKS.addAll(BlockTypeTags.CARPETS.get().values());
+ }
+
private static final Vector3i[] SHIFTS = {
new Vector3i(1, 0, 0),
new Vector3i(-1, 0, 0),
@@ -57,10 +84,10 @@ public class TranslationTask extends AsyncTask {
};
private final HashHitBox oldHitBox;
private final Collection updates = new HashSet<>();
- private final World world;
- private final List harvestBlocks = craft.getType().getValue(CraftSettings.HarvestBlocks.class).get();
+ private final ServerWorld world;
+ private final List harvestBlocks = craft.type().getValue(CraftSettings.HarvestBlocks.class).get();
private final HashSet harvestedBlocks = new HashSet<>();
- private final List harvesterBladeBlocks = craft.getType().getValue(CraftSettings.HarvesterBladeBlocks.class).get();
+ private final List harvesterBladeBlocks = craft.type().getValue(CraftSettings.HarvesterBladeBlocks.class).get();
private final HashHitBox collisionBox = new HashHitBox();
private Vector3i displacement;
private HashHitBox newHitBox;
@@ -87,7 +114,7 @@ protected void execute() throws InterruptedException {
}
// Use some fuel if needed
- double fuelBurnRate = getCraft().getType().getValue(CraftSettings.FuelBurnRate.class).get();
+ double fuelBurnRate = getCraft().type().getValue(CraftSettings.FuelBurnRate.class).get();
if (fuelBurnRate > 0 && !getCraft().isSinking()) {
if (!getCraft().useFuel(fuelBurnRate)) {
fail("Craft out of fuel");
@@ -102,7 +129,7 @@ protected void execute() throws InterruptedException {
// Call the Craft Translate Event
CraftTranslateEvent event = new CraftTranslateEvent(craft, oldHitBox, newHitBox);
- Sponge.getEventManager().post(event);
+ Sponge.eventManager().post(event);
if (event.isCancelled()) {
this.fail(event.getFailMessage());
return;
@@ -116,11 +143,11 @@ protected void execute() throws InterruptedException {
}
// Clean up torpedoes after explosion
- if (!collisionBox.isEmpty() && craft.getType().getValue(CraftSettings.CruiseOnPilot.class).get() && craft.getType().getValue(CraftSettings.CollisionExplosion.class).get() > 0) {
+ if (!collisionBox.isEmpty() && craft.type().getValue(CraftSettings.CruiseOnPilot.class).get() && craft.type().getValue(CraftSettings.CollisionExplosion.class).get() > 0) {
craft.release(null);
for (Vector3i location : oldHitBox) {
- updates.add(new BlockCreateCommand(craft.getWorld(), location, BlockTypes.AIR));
+ updates.add(new BlockCreateCommand(craft.getWorld(), location, BlockTypes.AIR.get()));
}
newHitBox = new HashHitBox();
@@ -145,11 +172,11 @@ private boolean checkCraftHeight() {
final int maxY = oldHitBox.getMaxY();
// Check if the craft is too high
- if (displacement.getY() > -1) {
- if (craft.getMaxHeightLimit() < maxY || (displacement.getY() == 0 && craft.getType().getValue(CraftSettings.UseGravity.class).get())) {
- displacement = new Vector3i(displacement.getX(), -1, displacement.getZ());
+ if (displacement.y() > -1) {
+ if (craft.getMaxHeightLimit() < maxY || (displacement.y() == 0 && craft.type().getValue(CraftSettings.UseGravity.class).get())) {
+ displacement = new Vector3i(displacement.x(), -1, displacement.z());
- } else if (craft.getType().getValue(CraftSettings.MaxHeightAboveGround.class).get() > 0) {
+ } else if (craft.type().getValue(CraftSettings.MaxHeightAboveGround.class).get() > 0) {
final Vector3i middle = oldHitBox.getMidPoint().add(displacement);
int testY = minY;
@@ -158,26 +185,24 @@ private boolean checkCraftHeight() {
testY -= 1;
// TODO - Probably won't work in newer versions with kelp, etc
- if (craft.getWorld().getBlockType(middle.getX(), testY, middle.getZ()) != BlockTypes.AIR && (
- !craft.getType().getValue(CraftSettings.CanHoverOverWater.class).get()
- || craft.getWorld().getBlockType(middle.getX(), testY, middle.getZ()) != BlockTypes.WATER)) {
+ if (craft.getWorld().block(middle.x(), testY, middle.z()).type() != BlockTypes.AIR.get() && (!craft.type().getValue(CraftSettings.CanHoverOverWater.class).get() || craft.getWorld().block(middle.x(), testY, middle.z()).type() != BlockTypes.WATER.get())) {
break;
}
}
- if (minY - testY > craft.getType().getValue(CraftSettings.MaxHeightAboveGround.class).get()) {
- displacement = new Vector3i(displacement.getX(), -1, displacement.getZ());
+ if (minY - testY > craft.type().getValue(CraftSettings.MaxHeightAboveGround.class).get()) {
+ displacement = new Vector3i(displacement.x(), -1, displacement.z());
}
}
}
// Fail the movement if the craft is going to be too high
- if (displacement.getY() > 0 && maxY + displacement.getY() > craft.getMaxHeightLimit()) {
+ if (displacement.y() > 0 && maxY + displacement.y() > craft.getMaxHeightLimit()) {
fail("Translation Failed - Craft hit height limit.");
return false;
// Or too low
- } else if (displacement.getY() < 0 && minY + displacement.getY() < craft.getType().getValue(CraftSettings.MinHeightLimit.class).get() && !craft.isSinking()) {
+ } else if (displacement.y() < 0 && minY + displacement.y() < craft.type().getValue(CraftSettings.MinHeightLimit.class).get() && !craft.isSinking()) {
fail("Translation Failed - Craft hit minimum height limit.");
return false;
}
@@ -188,20 +213,20 @@ private boolean checkCraftHeight() {
// TODO - Review code
private boolean craftObstructed() {
for (Vector3i oldLocation : oldHitBox) {
- final Vector3i newLocation = oldLocation.add(displacement.getX(), displacement.getY(), displacement.getZ());
+ final Vector3i newLocation = oldLocation.add(displacement.x(), displacement.y(), displacement.z());
//If the new location already exists in the old hitbox than this is unnecessary because a craft can't hit itself.
if (oldHitBox.contains(newLocation)) {
newHitBox.add(newLocation);
continue;
}
- final BlockType testMaterial = craft.getWorld().getBlockType(newLocation);
+ final BlockType testMaterial = craft.getWorld().block(newLocation).type();
//prevent chests collision
- BlockType oldMaterial = world.getBlockType(oldLocation);
- if ((oldMaterial.equals(BlockTypes.CHEST) || oldMaterial.equals(BlockTypes.TRAPPED_CHEST)) && checkChests(oldMaterial, newLocation)) {
- fail(String.format("Translation Failed - Craft is obstructed" + " @ %d,%d,%d,%s", newLocation.getX(), newLocation.getY(),
- newLocation.getZ(), craft.getWorld().getBlockType(newLocation).toString()));
+ BlockType oldMaterial = world.block(oldLocation).type();
+ if ((oldMaterial.equals(BlockTypes.CHEST.get()) || oldMaterial.equals(BlockTypes.TRAPPED_CHEST.get())) && checkChests(oldMaterial, newLocation)) {
+ fail(String.format("Translation Failed - Craft is obstructed" + " @ %d,%d,%d,%s", newLocation.x(), newLocation.y(),
+ newLocation.z(), PlainTextComponentSerializer.plainText().serialize(craft.getWorld().block(newLocation).type().asComponent())));
return true;
}
@@ -209,18 +234,18 @@ private boolean craftObstructed() {
if (craft.isSinking()) {
blockObstructed = !FALL_THROUGH_BLOCKS.contains(testMaterial);
} else {
- blockObstructed = !testMaterial.equals(BlockTypes.AIR)
- && !craft.getType().getValue(CraftSettings.PassthroughBlocks.class).get().contains(testMaterial);
+ blockObstructed = !testMaterial.equals(BlockTypes.AIR.get())
+ && !craft.type().getValue(CraftSettings.PassthroughBlocks.class).get().contains(testMaterial);
}
boolean ignoreBlock = false;
// air never obstructs anything (changed 4/18/2017 to prevent drilling machines)
- if (blockObstructed && craft.getWorld().getBlockType(oldLocation).equals(BlockTypes.AIR)) {
+ if (blockObstructed && craft.getWorld().block(oldLocation).type().equals(BlockTypes.AIR.get())) {
blockObstructed = false;
}
if (blockObstructed && harvestBlocks.contains(testMaterial)) {
- BlockType tmpType = craft.getWorld().getBlockType(oldLocation);
+ BlockType tmpType = craft.getWorld().block(oldLocation).type();
if (harvesterBladeBlocks.contains(tmpType)) {
blockObstructed = false;
harvestedBlocks.add(newLocation);
@@ -229,10 +254,10 @@ private boolean craftObstructed() {
}
if (blockObstructed) {
- if (Math.abs(displacement.getX()) > 1 || Math.abs(displacement.getY()) > 1 || Math.abs(displacement.getZ()) > 1) {
- int x = displacement.getX();
- int y = displacement.getY();
- int z = displacement.getZ();
+ if (Math.abs(displacement.x()) > 1 || Math.abs(displacement.y()) > 1 || Math.abs(displacement.z()) > 1) {
+ int x = displacement.x();
+ int y = displacement.y();
+ int z = displacement.z();
if (x < 0) {
x++;
@@ -257,9 +282,9 @@ private boolean craftObstructed() {
harvestedBlocks.clear();
return craftObstructed();
- } else if (!craft.isSinking() && craft.getType().getValue(CraftSettings.CollisionExplosion.class).get() == 0.0F) {
- fail(String.format("Translation Failed - Craft is obstructed" + " @ %d,%d,%d,%s", newLocation.getX(), newLocation.getY(),
- newLocation.getZ(), testMaterial.getName()));
+ } else if (!craft.isSinking() && craft.type().getValue(CraftSettings.CollisionExplosion.class).get() == 0.0F) {
+ fail(String.format("Translation Failed - Craft is obstructed" + " @ %d,%d,%d,%s", newLocation.x(), newLocation.y(),
+ newLocation.z(), PlainTextComponentSerializer.plainText().serialize(testMaterial.asComponent())));
return true;
}
@@ -276,7 +301,7 @@ private boolean craftObstructed() {
private boolean checkChests(BlockType mBlock, Vector3i newLoc) {
for (Vector3i shift : SHIFTS) {
Vector3i aroundNewLoc = newLoc.add(shift);
- BlockType testMaterial = craft.getWorld().getBlockType(aroundNewLoc.getX(), aroundNewLoc.getY(), aroundNewLoc.getZ());
+ BlockType testMaterial = craft.getWorld().block(aroundNewLoc).type();
if (testMaterial.equals(mBlock) && !oldHitBox.contains(aroundNewLoc)) {
return true;
}
@@ -286,12 +311,12 @@ private boolean checkChests(BlockType mBlock, Vector3i newLoc) {
private void processSinking() {
for (Vector3i location : collisionBox) {
- if (craft.getType().getValue(CraftSettings.ExplodeOnCrash.class).get() > 0.0F
- && !world.getBlockType(location).equals(BlockTypes.AIR)
+ if (craft.type().getValue(CraftSettings.ExplodeOnCrash.class).get() > 0.0F
+ && !world.block(location).type().equals(BlockTypes.AIR.get())
&& ThreadLocalRandom.current().nextDouble(1) < .05) {
updates.add(new ExplosionUpdateCommand(world, location,
- craft.getType().getValue(CraftSettings.ExplodeOnCrash.class).get()));
+ craft.type().getValue(CraftSettings.ExplodeOnCrash.class).get()));
collisionExplosion = true;
}
@@ -306,11 +331,11 @@ private void processSinking() {
newHitBox.removeAll(toRemove);
}
- if (craft.getType().getValue(CraftSettings.SmokeOnSink.class).get() > 0) {
+ if (craft.type().getValue(CraftSettings.SmokeOnSink.class).get() > 0) {
for (Vector3i location : newHitBox) {
- if (ThreadLocalRandom.current().nextInt(craft.getType().getValue(CraftSettings.SmokeOnSink.class).get()) < 1) {
- updates.add(new ParticleUpdateCommand(new Location<>(world, location), ParticleTypes.LARGE_SMOKE,
- craft.getType().getValue(CraftSettings.SmokeOnSinkQuantity.class).get()));
+ if (ThreadLocalRandom.current().nextInt(craft.type().getValue(CraftSettings.SmokeOnSink.class).get()) < 1) {
+ updates.add(new ParticleUpdateCommand(ServerLocation.of(world, location), ParticleTypes.LARGE_SMOKE.get(),
+ craft.type().getValue(CraftSettings.SmokeOnSinkQuantity.class).get()));
}
}
}
@@ -319,31 +344,31 @@ private void processSinking() {
private void processNotSinking() {
//TODO - Make arming time a craft config setting
// Use number of moves instead? - System time doesn't work so well if the server is lagging
- if (craft.getType().getValue(CraftSettings.CollisionExplosion.class).get() > 0.0F
+ if (craft.type().getValue(CraftSettings.CollisionExplosion.class).get() > 0.0F
&& System.currentTimeMillis() - craft.commandeeredAt() >= 1000) {
for (Vector3i location : collisionBox) {
float explosionKey;
- float explosionForce = craft.getType().getValue(CraftSettings.CollisionExplosion.class).get();
+ float explosionForce = craft.type().getValue(CraftSettings.CollisionExplosion.class).get();
- if (craft.getType().getValue(CraftSettings.FocusedExplosion.class).get()) {
+ if (craft.type().getValue(CraftSettings.FocusedExplosion.class).get()) {
explosionForce *= oldHitBox.size();
}
//TODO: Account for underwater explosions
- /*if (location.getY() < waterLine) { // underwater explosions require more force to do anything
+ /*if (location.y() < waterLine) { // underwater explosions require more force to do anything
explosionForce += 25; //find the correct amount
}*/
explosionKey = explosionForce;
- if (!world.getBlockType(location).equals(BlockTypes.AIR)) {
+ if (!world.block(location).type().equals(BlockTypes.AIR.get())) {
updates.add(new ExplosionUpdateCommand(world, location, explosionKey));
collisionExplosion = true;
}
- if (craft.getType().getValue(CraftSettings.FocusedExplosion.class).get()) { // don't handle any further collisions if
+ if (craft.type().getValue(CraftSettings.FocusedExplosion.class).get()) { // don't handle any further collisions if
// it is set to focusedexplosion
break;
}
@@ -352,31 +377,31 @@ private void processNotSinking() {
}
private void moveEntities() throws InterruptedException {
- if (craft.getType().getValue(CraftSettings.MoveEntities.class).get() && !craft.isSinking()) {
+ if (craft.type().getValue(CraftSettings.MoveEntities.class).get() && !craft.isSinking()) {
AtomicBoolean processedEntities = new AtomicBoolean(false);
- Task.builder()
+ Task task = Task.builder()
.execute(() -> {
- for (Entity entity : craft.getWorld().getIntersectingEntities(
- new AABB(oldHitBox.getMinX() - 0.5, oldHitBox.getMinY() - 0.5, oldHitBox.getMinZ() - 0.5, oldHitBox.getMaxX() + 1.5,
- oldHitBox.getMaxY() + 1.5, oldHitBox.getMaxZ() + 1.5))) {
+ for (Entity entity : craft.getWorld().entities(
+ new SpongeAABB(new Vector3d(oldHitBox.getMinX() - 0.5, oldHitBox.getMinY() - 0.5, oldHitBox.getMinZ() - 0.5), new Vector3d(oldHitBox.getMaxX() + 1.5,
+ oldHitBox.getMaxY() + 1.5, oldHitBox.getMaxZ() + 1.5)))) {
- if (entity.getType() == EntityTypes.PLAYER || entity.getType() == EntityTypes.PRIMED_TNT
- || entity.getType() == EntityTypes.ITEM || !craft.getType().getValue(CraftSettings.OnlyMovePlayers.class).get()
+ if (entity.type() == EntityTypes.PLAYER.get() || entity.type() == EntityTypes.TNT.get()
+ || entity.type() == EntityTypes.ITEM.get() || !craft.type().getValue(CraftSettings.OnlyMovePlayers.class).get()
) {
EntityUpdateCommand eUp = new EntityUpdateCommand(entity,
- entity.getLocation().getPosition().add(displacement.getX(), displacement.getY(), displacement.getZ()), 0);
+ entity.location().position().add(displacement.x(), displacement.y(), displacement.z()), 0);
updates.add(eUp);
if (Settings.Debug) {
StringBuilder debug = new StringBuilder()
.append("Submitting Entity Update: ")
- .append(entity.getType().getName());
+ .append(PlainTextComponentSerializer.plainText().serialize(entity.type().asComponent()));
- if (entity instanceof Item) {
+ if (entity instanceof Item item) {
debug.append(" - Item Type: ")
- .append(((Item) entity).getItemType().getName());
+ .append(PlainTextComponentSerializer.plainText().serialize(item.item().get().type().asComponent()));
}
Movecraft.getInstance().getLogger().info(debug.toString());
@@ -386,7 +411,9 @@ private void moveEntities() throws InterruptedException {
processedEntities.set(true);
})
- .submit(Movecraft.getInstance());
+ .build();
+
+ Sponge.server().scheduler().submit(task);
synchronized (this) {
@@ -398,9 +425,7 @@ private void moveEntities() throws InterruptedException {
} else {
// Handle auto Craft release
//add releaseTask without playermove to manager
- if (!craft.getType().getValue(CraftSettings.CruiseOnPilot.class).get() && !craft
- .isSinking()) // not necessary to release cruiseonpilot crafts, because they will already be released
- {
+ if (!craft.type().getValue(CraftSettings.CruiseOnPilot.class).get() && !craft.isSinking()) { // not necessary to release cruiseonpilot crafts, because they will already be released
CraftManager.getInstance().addReleaseTask(craft);
}
}
@@ -427,7 +452,7 @@ public void postProcess() {
}
@Override
- protected Optional getNotificationPlayer() {
+ protected Optional getNotificationPlayer() {
return craft.getNotificationPlayer();
}
@@ -440,21 +465,21 @@ private void captureYield(List harvestedBlocks) {
ArrayList chests = new ArrayList<>();
//find chests
for (Vector3i loc : oldHitBox) {
- BlockSnapshot block = craft.getWorld().createSnapshot(loc.getX(), loc.getY(), loc.getZ());
+ BlockSnapshot block = craft.getWorld().createSnapshot(loc.x(), loc.y(), loc.z());
block.getLocation().ifPresent(worldLocation -> {
- worldLocation.getTileEntity().ifPresent(tileEntity -> {
- if (tileEntity.getType() == TileEntityTypes.CHEST) {
- chests.add(((TileEntityCarrier) tileEntity).getInventory());
+ worldLocation.blockEntity().ifPresent(tileEntity -> {
+ if (tileEntity.type() == TileEntityTypes.CHEST) {
+ chests.add(((CarrierBlockEntity) tileEntity).inventory());
}
});
});
}
for (Vector3i harvestedBlock : harvestedBlocks) {
- BlockSnapshot block = craft.getWorld().createSnapshot(harvestedBlock.getX(), harvestedBlock.getY(), harvestedBlock.getZ());
+ BlockSnapshot block = craft.getWorld().createSnapshot(harvestedBlock.x(), harvestedBlock.y(), harvestedBlock.z());
List drops = new ArrayList<>(block.getDrops());
//generate seed drops
- if (block.getState().getType() == BlockTypes.CROPS) {
+ if (block.getState().type() == BlockTypes.CROPS) {
Random rand = new Random();
int amount = rand.nextInt(4);
if (amount > 0) {
@@ -464,11 +489,11 @@ private void captureYield(List harvestedBlocks) {
}
//get contents of inventories before depositing
block.getLocation().ifPresent(worldLocation -> {
- worldLocation.getTileEntity().ifPresent(tileEntity -> {
+ worldLocation.blockEntity().ifPresent(tileEntity -> {
- if (tileEntity instanceof TileEntityCarrier) {
+ if (tileEntity instanceof CarrierBlockEntity) {
- drops.addAll(Arrays.asList(StreamSupport.stream(((TileEntityCarrier) tileEntity).getInventory().slots().spliterator()
+ drops.addAll(Arrays.asList(StreamSupport.stream(((CarrierBlockEntity) tileEntity).inventory().slots().spliterator()
, false).map(Slot::peek).toArray(ItemStack[]::new)));
}
@@ -479,8 +504,8 @@ private void captureYield(List harvestedBlocks) {
ItemStack retStack = putInToChests(drop, chests);
if (retStack != null)
//drop items on position
- updates.add(new ItemDropUpdateCommand(new Location<>(craft.getWorld(), harvestedBlock.getX(), harvestedBlock.getY(),
- harvestedBlock.getZ()), retStack));
+ updates.add(new ItemDropUpdateCommand(ServerLocation.of(craft.getWorld(), harvestedBlock.x(), harvestedBlock.y(),
+ harvestedBlock.z()), retStack));
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/commands/ContactsCommand.java b/src/main/java/io/github/pulverizer/movecraft/commands/ContactsCommand.java
index e54e5adc8..3ba0c271c 100644
--- a/src/main/java/io/github/pulverizer/movecraft/commands/ContactsCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/commands/ContactsCommand.java
@@ -1,53 +1,51 @@
package io.github.pulverizer.movecraft.commands;
-import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.craft.CraftManager;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandException;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandExecutor;
import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.command.spec.CommandExecutor;
-import org.spongepowered.api.command.spec.CommandSpec;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.command.exception.CommandException;
+import org.spongepowered.api.command.parameter.CommandContext;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import java.util.ArrayList;
public class ContactsCommand implements CommandExecutor {
- public static void register() {
- CommandSpec commandSpec = CommandSpec.builder()
- .description(Text.of("Lists all contacts from radar"))
+ public static Command.Parameterized register() {
+ return Command.builder()
+ .shortDescription(Component.text("Lists all contacts from radar"))
.executor(new ContactsCommand())
+ .executionRequirements(context -> context.cause().root() instanceof ServerPlayer)
.build();
-
- Sponge.getCommandManager().register(Movecraft.getInstance(), commandSpec, "contacts");
}
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
// Contacts:
// [CraftType] [Size] [Name] [Commanded/Piloted By] [Range]
// FULL: Airship (8,560) MSV Grasshopper commanded by BernardisGood - 3,500m - North-West - (250, 178, -3000)
// FAR PING: UNKNOWN CONTACT (600) - 3750m - North-West
- if (src instanceof Player) {
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
- ArrayList messages = new ArrayList<>();
+ ArrayList messages = new ArrayList<>();
- messages.add(Text.of("Contacts:"));
+ messages.add(Component.text("Contacts:"));
- Craft craft = CraftManager.getInstance().getCraftByPlayer(((Player) src).getUniqueId());
- craft.getContacts().forEach(contact -> messages.add(Text.of(craft.getContactChatMessage(contact))));
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
+ craft.getContacts().forEach(contact -> messages.add(Component.text(craft.getContactChatMessage(contact))));
// send Output
- src.sendMessages(messages);
+ for (Component message : messages) {
+ player.sendMessage(message);
+ }
return CommandResult.success();
- } else {
- return CommandResult.empty();
}
+
+ return CommandResult.error(Component.text("Command was not executed by a player!"));
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/commands/CraftReportCommand.java b/src/main/java/io/github/pulverizer/movecraft/commands/CraftReportCommand.java
index fae7714fe..354b586dd 100644
--- a/src/main/java/io/github/pulverizer/movecraft/commands/CraftReportCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/commands/CraftReportCommand.java
@@ -1,41 +1,43 @@
package io.github.pulverizer.movecraft.commands;
-import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.craft.CraftManager;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandException;
+import net.kyori.adventure.audience.Audience;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandExecutor;
import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.command.spec.CommandExecutor;
-import org.spongepowered.api.command.spec.CommandSpec;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.command.exception.CommandException;
+import org.spongepowered.api.command.parameter.CommandContext;
import java.util.ArrayList;
public class CraftReportCommand implements CommandExecutor {
- public static void register() {
- CommandSpec commandSpec = CommandSpec.builder()
- .description(Text.of("Provides details on all active crafts on the server"))
+ public static Command.Parameterized register() {
+ return Command.builder()
+ .shortDescription(Component.text("Provides details on all active crafts on the server"))
.permission("movecraft.admin")
.executor(new CraftReportCommand())
.build();
-
- Sponge.getCommandManager().register(Movecraft.getInstance(), commandSpec, "craftreport");
}
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- ArrayList messages = new ArrayList<>();
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof Audience audience) {
+ ArrayList messages = new ArrayList<>();
+
+ // TODO - Fix output
+ CraftManager.getInstance().forEach(craft -> messages.add(Component.text(craft.toString())));
- // TODO - Fix output
- CraftManager.getInstance().forEach(craft -> messages.add(Text.of(craft.toString())));
+ // send Output
+ audience.sendMessage(Component.text("Craft Report:"));
+ for (Component message : messages) {
+ audience.sendMessage(message);
+ }
- // send Output
- src.sendMessage(Text.of("Craft Report:"));
- src.sendMessages(messages);
+ return CommandResult.success();
+ }
- return CommandResult.success();
+ return CommandResult.error(Component.text("Command was not executed by an Audience, e.g. a player or the console"));
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/commands/CraftTypesCommand.java b/src/main/java/io/github/pulverizer/movecraft/commands/CraftTypesCommand.java
index 110049be5..22fdf8bb5 100644
--- a/src/main/java/io/github/pulverizer/movecraft/commands/CraftTypesCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/commands/CraftTypesCommand.java
@@ -4,85 +4,101 @@
import io.github.pulverizer.movecraft.config.craft.CraftType;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.CraftManager;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandException;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandExecutor;
import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.command.args.GenericArguments;
-import org.spongepowered.api.command.spec.CommandExecutor;
-import org.spongepowered.api.command.spec.CommandSpec;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.command.exception.CommandException;
+import org.spongepowered.api.command.parameter.CommandContext;
+import org.spongepowered.api.command.parameter.Parameter;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import java.util.ArrayList;
public class CraftTypesCommand implements CommandExecutor {
- public static void register() {
- CommandSpec listCommand = CommandSpec.builder()
- .description(Text.of("Lists the name of all the craft types available on the server."))
+ public static Command.Parameterized register() {
+ Command.Parameterized listCommand = Command.builder()
+ .shortDescription(Component.text("Lists the name of all the craft types available on the server."))
.executor(new CraftTypesCommand.List())
.build();
- CommandSpec infoCommand = CommandSpec.builder()
- .description(Text.of("Provides a list of allowed, fly and move blocks for the provided craft type."))
- .arguments(GenericArguments.string(Text.of("crafttype")))
+ Command.Parameterized infoCommand = Command.builder()
+ .shortDescription(Component.text("Provides a list of allowed fly and move blocks for the provided craft type."))
+ .addParameter(Parameter.string().key("crafttype").build())
.executor(new CraftTypesCommand.Info())
.build();
- CommandSpec commandSpec = CommandSpec.builder()
- .description(Text.of("/crafttypes [list] || [info ]"))
- .child(listCommand, "list")
- .child(infoCommand, "info")
+ return Command.builder()
+ .shortDescription(Component.text("/crafttypes [list] || [info ]"))
+ .addChild(listCommand, "list")
+ .addChild(infoCommand, "info")
.permission("movecraft.admin")
.executor(new CraftTypesCommand())
.build();
-
- Sponge.getCommandManager().register(Movecraft.getInstance(), commandSpec, "crafttypes");
}
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- // send Output
- src.sendMessage(Text.of("/crafttypes [list] || [info ]"));
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof Audience audience) {
+ // send Output
+ audience.sendMessage(Component.text("/crafttypes [list] || [info ]"));
+
+ return CommandResult.success();
+ }
- return CommandResult.success();
+ return CommandResult.error(Component.text("Command was not executed by an Audience, e.g. a player or the console"));
}
public static class List extends CraftTypesCommand {
// TODO - Change to show only craft types the player has permissions for?
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- ArrayList messages = new ArrayList<>();
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof Audience audience) {
+ ArrayList messages = new ArrayList<>();
- CraftManager.getInstance().getCraftTypes()
- .forEach(craftType -> messages.add(Text.of(craftType.getValue(CraftSettings.Name.class).get())));
+ CraftManager.getInstance().getCraftTypes()
+ .forEach(craftType -> messages.add(Component.text(craftType.getValue(CraftSettings.Name.class).get())));
- // send Output
- src.sendMessage(Text.of("Craft Types:"));
- src.sendMessages(messages);
+ // send Output
+ audience.sendMessage(Component.text("Craft Types:"));
+ for (Component message : messages) {
+ audience.sendMessage(message);
+ }
- return CommandResult.success();
+ return CommandResult.success();
+ }
+
+ return CommandResult.error(Component.text("Command was not executed by an Audience, e.g. a player or the console"));
}
}
public static class Info extends CraftTypesCommand {
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- ArrayList messages = new ArrayList<>();
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof Audience audience) {
+ ArrayList messages = new ArrayList<>();
- CraftType craftType = CraftManager.getInstance().getCraftTypeFromString((String) args.getOne("crafttype").get());
+ CraftType craftType = CraftManager.getInstance().getCraftTypeFromString(commandContext.requireOne(Parameter.string().key("crafttype").build()));
- messages.add(Text.of("Name: " + craftType.getValue(CraftSettings.Name.class).get()));
- messages.add(Text.of("Allowed Blocks:"));
- craftType.getValue(CraftSettings.AllowedBlocks.class).get().forEach(blockType -> messages.add(Text.of(" " + blockType.getTranslation().get(src.getLocale()))));
+ messages.add(Component.text("Name: " + craftType.getValue(CraftSettings.Name.class).get()));
+ messages.add(Component.text("Allowed Blocks:"));
+ craftType.getValue(CraftSettings.AllowedBlocks.class).get().forEach(blockType -> messages.add(Component.text(" " + PlainTextComponentSerializer.plainText().serialize(blockType.asComponent()))));
- // send Output
- src.sendMessages(messages);
+ // send Output
+ for (Component message : messages) {
+ audience.sendMessage(message);
+ }
- return CommandResult.success();
+ return CommandResult.success();
+ }
+
+ return CommandResult.error(Component.text("Command was not executed by an Audience, e.g. a player or the console"));
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/commands/CrewCommand.java b/src/main/java/io/github/pulverizer/movecraft/commands/CrewCommand.java
index 5a96fb717..0100b1049 100644
--- a/src/main/java/io/github/pulverizer/movecraft/commands/CrewCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/commands/CrewCommand.java
@@ -3,60 +3,58 @@
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.craft.crew.CrewManager;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandException;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandExecutor;
import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.command.args.GenericArguments;
-import org.spongepowered.api.command.spec.CommandExecutor;
-import org.spongepowered.api.command.spec.CommandSpec;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.command.exception.CommandException;
+import org.spongepowered.api.command.parameter.CommandContext;
+import org.spongepowered.api.command.parameter.Parameter;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
public class CrewCommand implements CommandExecutor {
- public static void register() {
- // TODO - these might be buggy as it does not enforce exact matches!
- CommandSpec crewJoinCommand = CommandSpec.builder()
- .description(Text.of("Join the crew of the craft after being invited"))
- .arguments(GenericArguments.onlyOne(GenericArguments.player(Text.of("username"))))
+ public static Command.Parameterized register() {
+ // TODO - these might be buggy as it does not enforce exact matches! - "Does it still do that?" -Pulverizer when moving to API 8
+ Command.Parameterized crewJoinCommand = Command.builder()
+ .shortDescription(Component.text("Join the crew of the craft after being invited"))
+ .addParameter(Parameter.player().key("username").build())
.executor(new Join())
.build();
- CommandSpec crewInviteCommand = CommandSpec.builder()
- .description(Text.of("Invite a player to join your crew"))
- .arguments(GenericArguments.onlyOne(GenericArguments.player(Text.of("username"))))
+ Command.Parameterized crewInviteCommand = Command.builder()
+ .shortDescription(Component.text("Invite a player to join your crew"))
+ .addParameter(Parameter.player().key("username").build())
.executor(new Invite())
.build();
- CommandSpec crewKickCommand = CommandSpec.builder()
- .description(Text.of("Kick a player from your crew"))
- .arguments(GenericArguments.onlyOne(GenericArguments.player(Text.of("username"))))
+ Command.Parameterized crewKickCommand = Command.builder()
+ .shortDescription(Component.text("Kick a player from your crew"))
+ .addParameter(Parameter.player().key("username").build())
.executor(new Kick())
.build();
- CommandSpec crewLeaveCommand = CommandSpec.builder()
- .description(Text.of("Leave the your current crew"))
+ Command.Parameterized crewLeaveCommand = Command.builder()
+ .shortDescription(Component.text("Leave the your current crew"))
.executor(new Leave())
.build();
- CommandSpec crewCommand = CommandSpec.builder()
- .description(Text.of("Information on your current crew"))
- .child(crewJoinCommand, "join")
- .child(crewInviteCommand, "invite")
- .child(crewKickCommand, "kick")
- .child(crewLeaveCommand, "leave")
+ return Command.builder()
+ .shortDescription(Component.text("Information on your current crew"))
+ .addChild(crewJoinCommand, "join")
+ .addChild(crewInviteCommand, "invite")
+ .addChild(crewKickCommand, "kick")
+ .addChild(crewLeaveCommand, "leave")
.executor(new CrewCommand())
+ .executionRequirements(context -> context.cause().root() instanceof ServerPlayer)
.build();
-
- Sponge.getCommandManager().register(Movecraft.getInstance(), crewCommand, "crew");
}
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
- if (src instanceof Player) {
- CrewManager.getPrintedCrewList((Player) src).forEach(line -> src.sendMessage(Text.of(line)));
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
+ CrewManager.getPrintedCrewList(player).forEach(line -> player.sendMessage(Component.text(line)));
}
return CommandResult.success();
@@ -65,52 +63,52 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
public static class Join extends CrewCommand {
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- if (src instanceof Player) {
- CrewManager.acceptInvite((Player) src, ((Player) args.getOne("username").get()));
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext instanceof ServerPlayer player) {
+ CrewManager.acceptInvite(player, commandContext.one(Parameter.player().key("username").build()).get());
return CommandResult.success();
}
- return CommandResult.empty();
+ return CommandResult.error(Component.text("Command was not executed by a player!"));
}
}
public static class Invite extends CrewCommand {
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- if (src instanceof Player) {
- CrewManager.createInvite((Player) src, ((Player) args.getOne("username").get()));
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
+ CrewManager.createInvite(player, commandContext.one(Parameter.player().key("username").build()).get());
return CommandResult.success();
}
- return CommandResult.empty();
+ return CommandResult.error(Component.text("Command was not executed by a player!"));
}
}
public static class Kick extends CrewCommand {
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- if (src instanceof Player) {
- CrewManager.kickCrewMember((Player) src, ((Player) args.getOne("username").get()));
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
+ CrewManager.kickCrewMember(player, commandContext.one(Parameter.player().key("username").build()).get());
return CommandResult.success();
}
- return CommandResult.empty();
+ return CommandResult.error(Component.text("Command was not executed by a player!"));
}
}
public static class Leave extends CrewCommand {
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
- if (src instanceof Player) {
- CrewManager.leaveCrew((Player) src);
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
+ CrewManager.leaveCrew(player);
return CommandResult.success();
}
- return CommandResult.empty();
+ return CommandResult.error(Component.text("Command was not executed by a player!"));
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/commands/DockCommand.java b/src/main/java/io/github/pulverizer/movecraft/commands/DockCommand.java
index 27e50ab5c..2ab0f30b6 100644
--- a/src/main/java/io/github/pulverizer/movecraft/commands/DockCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/commands/DockCommand.java
@@ -1,51 +1,45 @@
package io.github.pulverizer.movecraft.commands;
-import com.flowpowered.math.vector.Vector3i;
-import io.github.pulverizer.movecraft.Movecraft;
+import org.spongepowered.api.command.Command;
+import org.spongepowered.api.command.CommandExecutor;
+import org.spongepowered.api.command.exception.CommandException;
+import org.spongepowered.api.command.parameter.CommandContext;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.craft.CraftManager;
import io.github.pulverizer.movecraft.config.CrewRoles;
-import org.spongepowered.api.Sponge;
-import org.spongepowered.api.command.CommandException;
import org.spongepowered.api.command.CommandResult;
-import org.spongepowered.api.command.CommandSource;
-import org.spongepowered.api.command.args.CommandContext;
-import org.spongepowered.api.command.spec.CommandExecutor;
-import org.spongepowered.api.command.spec.CommandSpec;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.world.server.ServerLocation;
public class DockCommand implements CommandExecutor {
- public static void register() {
- CommandSpec dockCommand = CommandSpec.builder()
- .description(Text.of("Merge to the craft you are landed on"))
- .permission("movecraft.command.dock")
+ public static Command.Parameterized register() {
+ return Command.builder()
.executor(new DockCommand())
+ .permission("movecraft.command.dock")
+ .shortDescription(Component.text("Merge to the craft you are landed on"))
+ .executionRequirements(context -> context.cause().root() instanceof ServerPlayer)
.build();
-
- Sponge.getCommandManager().register(Movecraft.getInstance(), dockCommand, "dock");
}
@Override
- public CommandResult execute(CommandSource src, CommandContext args) throws CommandException {
+ public CommandResult execute(CommandContext commandContext) throws CommandException {
- if (src instanceof Player) {
- Player player = (Player) src;
+ if (commandContext.cause().root() instanceof ServerPlayer player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
- if (craft != null && craft.getCrew().hasRole(player.getUniqueId(), CrewRoles.Commander.class)) {
+ if (craft != null && craft.getCrew().hasRole(player.uniqueId(), CrewRoles.Commander.class)) {
Vector3i midpoint = craft.getHitBox().getMidPoint();
- midpoint = new Vector3i(midpoint.getX(), craft.getHitBox().getMinY() - 1, midpoint.getZ());
+ midpoint = new Vector3i(midpoint.x(), craft.getHitBox().getMinY() - 1, midpoint.z());
- Location location = new Location<>(craft.getWorld(), midpoint);
+ ServerLocation location = ServerLocation.of(craft.getWorld(), midpoint);
- if (Settings.FlightDeckBlocks.contains(location.getBlockType())) {
+ if (Settings.FlightDeckBlocks.contains(location.block().type())) {
Craft parentCraft = null;
for (Craft testCraft : CraftManager.getInstance().getCraftsFromLocation(location)) {
@@ -60,7 +54,7 @@ public CommandResult execute(CommandSource src, CommandContext args) throws Comm
if (parentCraft != null && !parentCraft.isProcessing()) {
parentCraft.getHitBox().addAll(craft.getHitBox());
craft.release(player);
- player.sendMessage(Text.of("You have docked"));
+ player.sendMessage(Component.text("You have docked"));
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/config/ConfigManager.java b/src/main/java/io/github/pulverizer/movecraft/config/ConfigManager.java
index e4e70535f..79eaf6770 100644
--- a/src/main/java/io/github/pulverizer/movecraft/config/ConfigManager.java
+++ b/src/main/java/io/github/pulverizer/movecraft/config/ConfigManager.java
@@ -2,12 +2,13 @@
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.craft.CraftType;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.ConfigurationOptions;
-import ninja.leaping.configurate.loader.ConfigurationLoader;
-import ninja.leaping.configurate.yaml.YAMLConfigurationLoader;
+import org.spongepowered.common.SpongeCommon;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.ConfigurationOptions;
+import org.spongepowered.configurate.loader.ConfigurationLoader;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
import org.spongepowered.api.Sponge;
-import org.spongepowered.common.SpongeImpl;
+import org.spongepowered.common.SpongeCommon.SpongeImpl;
import org.spongepowered.common.config.category.EntityActivationModCategory;
import java.io.File;
@@ -18,29 +19,27 @@
public abstract class ConfigManager {
- public static ConfigurationLoader createConfigLoader(Path file) {
- return YAMLConfigurationLoader.builder().setPath(file).setDefaultOptions(ConfigurationOptions.defaults()).build();
+ public static YamlConfigurationLoader createConfigLoader(Path file) {
+ return YamlConfigurationLoader.builder().path(file).defaultOptions(ConfigurationOptions.defaults()).build();
}
//TODO - Improve this
public static void checkSpongeConfig() {
- if (!SpongeImpl.getGlobalConfigAdapter().getConfig().getOptimizations().usePandaRedstone()) {
+ if (!SpongeCommon.getGlobalConfigAdapter().getConfig().getOptimizations().usePandaRedstone()) {
Movecraft.getInstance().getLogger().warn("Panda redstone patch not applied! Please edit your Sponge config.");
}
if (SpongeImpl.getGlobalConfigAdapter().getConfig().getEntity().getMaxSpeed() < 1200) {
Movecraft.getInstance().getLogger().warn("Max entity speed is less than 1200! Please edit your Sponge config.");
}
- for (Map.Entry entry : SpongeImpl.getGlobalConfigAdapter().getConfig().getEntityActivationRange().getDefaultRanges()
- .entrySet()) {
+ for (Map.Entry entry : SpongeImpl.getGlobalConfigAdapter().getConfig().getEntityActivationRange().getDefaultRanges().entrySet()) {
if (entry.getValue() < 256) {
Movecraft.getInstance().getLogger().warn("An entity activation range is less than 256! Please edit your Sponge config.");
break;
}
}
- for (Map.Entry mod :
- SpongeImpl.getGlobalConfigAdapter().getConfig().getEntityActivationRange().getModList().entrySet()) {
+ for (Map.Entry mod : SpongeImpl.getGlobalConfigAdapter().getConfig().getEntityActivationRange().getModList().entrySet()) {
for (Map.Entry entity : mod.getValue().getEntityList().entrySet()) {
if (entity.getValue() < 256) {
Movecraft.getInstance().getLogger()
@@ -67,7 +66,7 @@ public static void loadMainConfig() {
}
}
- ConfigurationLoader mainConfigLoader = createConfigLoader(mainConfigPath);
+ YamlConfigurationLoader mainConfigLoader = createConfigLoader(mainConfigPath);
ConfigurationNode mainConfigNode;
try {
@@ -92,7 +91,7 @@ public static HashSet loadCraftTypes() {
if (files == null || files.length == 0) {
Movecraft.getInstance().getLogger().info("No craft configs found! Generating defaults...");
try {
- Sponge.getAssetManager().getAsset(Movecraft.getInstance(), "types/Airship.craft").get().copyToDirectory(typesDir);
+ Sponge.assetManager().getAsset(Movecraft.getInstance(), "types/Airship.craft").get().copyToDirectory(typesDir);
Sponge.getAssetManager().getAsset(Movecraft.getInstance(), "types/Airskiff.craft").get().copyToDirectory(typesDir);
Sponge.getAssetManager().getAsset(Movecraft.getInstance(), "types/BigAirskiff.craft").get().copyToDirectory(typesDir);
Sponge.getAssetManager().getAsset(Movecraft.getInstance(), "types/Bomb.craft").get().copyToDirectory(typesDir);
diff --git a/src/main/java/io/github/pulverizer/movecraft/config/Settings.java b/src/main/java/io/github/pulverizer/movecraft/config/Settings.java
index d18b9da05..332c8cc49 100644
--- a/src/main/java/io/github/pulverizer/movecraft/config/Settings.java
+++ b/src/main/java/io/github/pulverizer/movecraft/config/Settings.java
@@ -1,13 +1,13 @@
package io.github.pulverizer.movecraft.config;
-import com.google.common.reflect.TypeToken;
+import io.leangen.geantyref.TypeToken;
import io.github.pulverizer.movecraft.Movecraft;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
-import org.slf4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.ItemTypes;
+import org.spongepowered.configurate.serialize.SerializationException;
import java.util.ArrayList;
import java.util.HashMap;
@@ -23,7 +23,7 @@ public class Settings {
// Craft
- public static ItemType PilotTool = ItemTypes.STICK;
+ public static ItemType PilotTool = ItemTypes.STICK.get();
public static boolean ProtectPilotedCrafts = false;
public static boolean DisableSpillProtection = false;
public static boolean CraftsUseNetherPortals = false;
@@ -90,51 +90,50 @@ static void load(ConfigurationNode mainConfigNode) {
// Read in config
- Settings.LOCALE = mainConfigNode.getNode("Locale").getString("en");
- Settings.Debug = mainConfigNode.getNode("Debug").getBoolean(false);
- Settings.DisableSpillProtection = mainConfigNode.getNode("DisableSpillProtection").getBoolean(false);
+ Settings.LOCALE = mainConfigNode.node("Locale").getString("en");
+ Settings.Debug = mainConfigNode.node("Debug").getBoolean(false);
+ Settings.DisableSpillProtection = mainConfigNode.node("DisableSpillProtection").getBoolean(false);
- ItemType pilotStick = ItemTypes.AIR;
+ ItemType pilotStick = ItemTypes.AIR.get();
try {
// if the PilotTool is specified in the movecraft.cfg file, use it
- ItemType temp = mainConfigNode.getNode("PilotTool").getValue(TypeToken.of(ItemType.class));
+ ItemType temp = mainConfigNode.node("PilotTool").get(TypeToken.get(ItemType.class));
if (temp != null) {
logger.info("Recognized PilotTool setting of: " + temp);
pilotStick = temp;
}
- } catch (ObjectMappingException e) {
+ } catch (SerializationException e) {
e.printStackTrace();
}
- if (pilotStick == ItemTypes.AIR) {
+ if (pilotStick == ItemTypes.AIR.get()) {
logger.info("No PilotTool setting, using default of minecraft:stick");
- Settings.PilotTool = ItemTypes.STICK;
+ Settings.PilotTool = ItemTypes.STICK.get();
} else {
Settings.PilotTool = pilotStick;
}
- Settings.SinkCheckTicks = mainConfigNode.getNode("SinkCheckTicks").getDouble(100.0);
- Settings.TracerRateTicks = mainConfigNode.getNode("TracerRateTicks").getInt(5);
- Settings.ManOverboardTimeout = mainConfigNode.getNode("ManOverBoardTimeout").getInt(30);
- Settings.SilhouetteViewDistance = mainConfigNode.getNode("SilhouetteViewDistance").getInt(200);
- Settings.SilhouetteBlockCount = mainConfigNode.getNode("SilhouetteBlockCount").getInt(20);
- Settings.FireballLifespan = mainConfigNode.getNode("FireballLifespan").getInt(6);
- Settings.FireballPenetration = mainConfigNode.getNode("FireballPenetration").getBoolean(true);
- Settings.ProtectPilotedCrafts = mainConfigNode.getNode("ProtectPilotedCrafts").getBoolean(true);
- Settings.EnableCrewSigns = mainConfigNode.getNode("AllowCrewSigns").getBoolean(true);
- //Settings.SetHomeToCrewSign = mainConfigNode.getNode("SetHomeToCrewSign").getBoolean(true);
- Settings.RequireCreateSignPerm = mainConfigNode.getNode("RequireCreatePerm").getBoolean(false);
- Settings.TNTContactExplosives = mainConfigNode.getNode("TNTContactExplosives").getBoolean(true);
- Settings.FadeWrecksAfter = mainConfigNode.getNode("FadeWrecksAfter").getInt(0);
- Settings.ReleaseOnCrewDeath = mainConfigNode.getNode("ReleaseOnCrewDeath").getBoolean(true);
+ Settings.SinkCheckTicks = mainConfigNode.node("SinkCheckTicks").getDouble(100.0);
+ Settings.TracerRateTicks = mainConfigNode.node("TracerRateTicks").getInt(5);
+ Settings.ManOverboardTimeout = mainConfigNode.node("ManOverBoardTimeout").getInt(30);
+ Settings.SilhouetteViewDistance = mainConfigNode.node("SilhouetteViewDistance").getInt(200);
+ Settings.SilhouetteBlockCount = mainConfigNode.node("SilhouetteBlockCount").getInt(20);
+ Settings.FireballLifespan = mainConfigNode.node("FireballLifespan").getInt(6);
+ Settings.FireballPenetration = mainConfigNode.node("FireballPenetration").getBoolean(true);
+ Settings.ProtectPilotedCrafts = mainConfigNode.node("ProtectPilotedCrafts").getBoolean(true);
+ Settings.EnableCrewSigns = mainConfigNode.node("AllowCrewSigns").getBoolean(true);
+ //Settings.SetHomeToCrewSign = mainConfigNode.node("SetHomeToCrewSign").getBoolean(true);
+ Settings.RequireCreateSignPerm = mainConfigNode.node("RequireCreatePerm").getBoolean(false);
+ Settings.TNTContactExplosives = mainConfigNode.node("TNTContactExplosives").getBoolean(true);
+ Settings.FadeWrecksAfter = mainConfigNode.node("FadeWrecksAfter").getInt(0);
+ Settings.ReleaseOnCrewDeath = mainConfigNode.node("ReleaseOnCrewDeath").getBoolean(true);
Settings.DurabilityOverride = new HashMap<>();
try {
Map> tempMap =
- mainConfigNode.getNode("DurabilityOverride").getValue(new TypeToken>>() {
- });
+ mainConfigNode.node("DurabilityOverride").get(new TypeToken>>() {});
if (tempMap != null) {
tempMap.forEach((blockType, doubles) -> {
@@ -144,30 +143,30 @@ static void load(ConfigurationNode mainConfigNode) {
});
}
- } catch (ObjectMappingException e) {
+ } catch (SerializationException e) {
e.printStackTrace();
}
try {
Settings.DisableShadowBlocks =
- new HashSet<>(mainConfigNode.getNode("DisableShadowBlocks").getList(TypeToken.of(BlockType.class))); //REMOVE FOR PUBLIC VERSION
- } catch (ObjectMappingException e) {
+ new HashSet<>(mainConfigNode.node("DisableShadowBlocks").getList(TypeToken.get(BlockType.class))); //REMOVE FOR PUBLIC VERSION
+ } catch (SerializationException e) {
e.printStackTrace();
Settings.DisableShadowBlocks = new HashSet<>();
}
- Settings.CrewInviteTimeout = mainConfigNode.getNode("InviteTimeout").getInt(60 * 20); // default = 1 minute
+ Settings.CrewInviteTimeout = mainConfigNode.node("InviteTimeout").getInt(60 * 20); // default = 1 minute
try {
- Settings.FlightDeckBlocks = new HashSet<>(mainConfigNode.getNode("FlightDeckBlocks").getList(TypeToken.of(BlockType.class)));
- } catch (ObjectMappingException e) {
+ Settings.FlightDeckBlocks = new HashSet<>(mainConfigNode.node("FlightDeckBlocks").getList(TypeToken.get(BlockType.class)));
+ } catch (SerializationException e) {
e.printStackTrace();
Settings.FlightDeckBlocks = new HashSet<>();
}
- Settings.AmmoDetonationMultiplier = mainConfigNode.getNode("AmmoDetonationMultiplier").getInt(0);
+ Settings.AmmoDetonationMultiplier = mainConfigNode.node("AmmoDetonationMultiplier").getInt(0);
// TODO: Re-enable this?
diff --git a/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftSettings.java b/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftSettings.java
index 27be78c9d..033dfdd18 100644
--- a/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftSettings.java
+++ b/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftSettings.java
@@ -9,13 +9,13 @@
import io.github.pulverizer.movecraft.api.config.craft.FloatCraftSetting;
import io.github.pulverizer.movecraft.api.config.craft.IntegerCraftSetting;
import io.github.pulverizer.movecraft.api.config.craft.StringCraftSetting;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
+import org.spongepowered.configurate.ConfigurationNode;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.ItemTypes;
import org.spongepowered.api.util.Direction;
+import org.spongepowered.configurate.serialize.SerializationException;
import java.util.Collections;
import java.util.List;
@@ -119,7 +119,7 @@ public static class MustBeSubcraft extends BooleanCraftSetting.False {}
public static class ForbiddenSignStrings extends CraftSetting> {
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
@@ -151,10 +151,10 @@ public static class AllowRemoteSign extends BooleanCraftSetting.True {}
public static class FurnaceBlocks extends CraftSetting> {
@Override public Set getDefaultValue() {
- return ImmutableSet.of(BlockTypes.FURNACE, BlockTypes.LIT_FURNACE);
+ return ImmutableSet.of(BlockTypes.FURNACE.get());
}
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
}
@@ -163,10 +163,10 @@ public static class FurnaceBlocks extends CraftSetting> {
public static class FuelItems extends CraftSetting> {
@Override public Map getDefaultValue() {
- return ImmutableMap.of(ItemTypes.COAL, 8.0, ItemTypes.COAL_BLOCK, 72.0);
+ return ImmutableMap.of(ItemTypes.COAL.get(), 8.0, ItemTypes.COAL_BLOCK.get(), 72.0);
}
- @Override public Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override public Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
}
@@ -176,7 +176,7 @@ public static class FuelBurnRate extends DoubleCraftSetting.Zero {}
//TODO - Implement
public static class PerWorldFuelBurnRate extends CraftSetting> {
- @Override public Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override public Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -188,7 +188,7 @@ public static class PerWorldFuelBurnRate extends CraftSetting> {
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
}
@@ -199,7 +199,7 @@ public static class ForbiddenBlocks extends CraftSetting> {
return Collections.emptySet();
}
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
}
@@ -210,7 +210,7 @@ public static class MoveBlocks extends BlockMapCraftSetting.Empty {}
public static class HarvestBlocks extends CraftSetting> {
- @Override protected List loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected List loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableList(super.loadValue(config));
}
@@ -225,14 +225,14 @@ public static class HarvesterBladeBlocks extends CraftSetting> {
return Collections.emptyList();
}
- @Override protected List loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected List loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableList(super.loadValue(config));
}
}
public static class PassthroughBlocks extends CraftSetting> {
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
@@ -243,7 +243,7 @@ public static class PassthroughBlocks extends CraftSetting> {
public static class SpeedBlocks extends CraftSetting, Double>> {
- @Override protected Map, Double> loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map, Double> loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -255,7 +255,7 @@ public static class SpeedBlocks extends CraftSetting, Double>
//TODO - Implement
public static class ExposedSpeedBlocks extends CraftSetting, List>> {
- @Override protected Map, List> loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map, List> loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -275,7 +275,7 @@ public static class SpottingMultiplier extends DoubleCraftSetting {
//TODO - Implement
public static class PerWorldSpottingMultiplier extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -289,7 +289,7 @@ public static class DetectionMultiplier extends DoubleCraftSetting.Zero {}
//TODO - Implement
public static class PerWorldDetectionMultiplier extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -302,14 +302,14 @@ public static class PerWorldDetectionMultiplier extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -342,7 +342,7 @@ public static class PerWorldMinHeightLimit extends CraftSetting loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
}
@@ -357,7 +357,7 @@ public static class MaxHeightLimit extends IntegerCraftSetting {
//TODO - Implement
public static class PerWorldMaxHeightLimit extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -371,7 +371,7 @@ public static class MaxHeightAboveGround extends IntegerCraftSetting.MinusOne {}
//TODO - Implement
public static class PerWorldMaxHeightAboveGround extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -392,7 +392,7 @@ public static class CanHoverOverWater extends BooleanCraftSetting.True {}
//TODO - Implement
public static class ForbiddenHoverOverBlocks extends CraftSetting> {
- @Override protected Set loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Set loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableSet(super.loadValue(config));
}
@@ -422,7 +422,7 @@ public static class PerWorldCruiseSkipBlocks extends CraftSetting loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
}
@@ -430,14 +430,14 @@ public static class PerWorldCruiseSkipBlocks extends CraftSetting> {
- @Override protected Map loadValue(ConfigurationNode config) throws ObjectMappingException {
+ @Override protected Map loadValue(ConfigurationNode config) throws SerializationException {
return Collections.unmodifiableMap(super.loadValue(config));
}
@@ -459,7 +459,7 @@ public static class CruiseOnPilotMaxMoves extends IntegerCraftSetting {
public static class CruiseOnPilotVertDirection extends CraftSetting {
@Override public Direction loadValue(ConfigurationNode config) {
- int tempInt = config.getNode(getNodeString()).getInt(0);
+ int tempInt = config.node(getNodeString()).getInt(0);
Direction temp;
if (tempInt < 0) {
@@ -503,7 +503,7 @@ public static class MaxStaticMove extends IntegerCraftSetting {
public static class TickCooldown extends DoubleCraftSetting.One {
@Override public Double loadValue(ConfigurationNode config) {
- return Math.ceil(20 / config.getNode(getNodeString()).getDouble());
+ return Math.ceil(20 / config.node(getNodeString()).getDouble());
}
@Override public String getNodeString() {
@@ -520,7 +520,7 @@ public static class TickCooldown extends DoubleCraftSetting.One {
public static class CruiseTickCooldown extends DoubleCraftSetting.One {
@Override public Double loadValue(ConfigurationNode config) {
- return Math.ceil(20 / config.getNode(getNodeString()).getDouble(config.getNode("speed").getDouble()));
+ return Math.ceil(20 / config.node(getNodeString()).getDouble(config.node("speed").getDouble()));
}
@Override public String getNodeString() {
@@ -533,7 +533,7 @@ public static class IgnoreMapUpdateTime extends BooleanCraftSetting.False {}
public static class TargetMoveTime extends DoubleCraftSetting.One {
@Override public Double loadValue(ConfigurationNode config) {
- return config.getNode(getNodeString()).getDouble(((double) config.getNode("maxSize").getInt()) / 1000f);
+ return config.node(getNodeString()).getDouble(((double) config.node("maxSize").getInt()) / 1000f);
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftType.java b/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftType.java
index cf0f4edf0..89d32cb73 100644
--- a/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftType.java
+++ b/src/main/java/io/github/pulverizer/movecraft/config/craft/CraftType.java
@@ -3,9 +3,10 @@
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.api.config.craft.CraftSetting;
import io.github.pulverizer.movecraft.config.ConfigManager;
-import ninja.leaping.configurate.ConfigurationNode;
-import ninja.leaping.configurate.loader.ConfigurationLoader;
-import ninja.leaping.configurate.objectmapping.ObjectMappingException;
+import org.spongepowered.configurate.ConfigurationNode;
+import org.spongepowered.configurate.loader.ConfigurationLoader;
+import org.spongepowered.configurate.serialize.SerializationException;
+import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
import java.io.IOException;
import java.nio.file.Path;
@@ -21,9 +22,9 @@ final public class CraftType {
private boolean isValid = true;
@SuppressWarnings("rawtypes") // Raw use of CraftSetting
- public CraftType(Path file) throws IOException, IllegalAccessException, InstantiationException, ObjectMappingException {
+ public CraftType(Path file) throws IOException, IllegalAccessException, InstantiationException, SerializationException {
- ConfigurationLoader configLoader = ConfigManager.createConfigLoader(file);
+ YamlConfigurationLoader configLoader = ConfigManager.createConfigLoader(file);
ConfigurationNode craftConfigNode = configLoader.load();
// Load config file
diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java b/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java
index 5c0aef6ca..9771f413c 100644
--- a/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java
+++ b/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java
@@ -1,6 +1,12 @@
package io.github.pulverizer.movecraft.craft;
-import com.flowpowered.math.vector.Vector3i;
+import net.kyori.adventure.sound.Sound;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.world.server.ServerLocation;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.api.event.CraftSinkEvent;
import io.github.pulverizer.movecraft.async.AsyncTask;
@@ -20,21 +26,16 @@
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.block.tileentity.Sign;
-import org.spongepowered.api.block.tileentity.TileEntity;
-import org.spongepowered.api.block.tileentity.carrier.TileEntityCarrier;
-import org.spongepowered.api.data.key.Keys;
-import org.spongepowered.api.data.value.mutable.ListValue;
+import org.spongepowered.api.block.entity.Sign;
+import org.spongepowered.api.block.entity.BlockEntity;
+import org.spongepowered.api.block.entity.carrier.CarrierBlockEntity;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.value.ListValue;
import org.spongepowered.api.effect.sound.SoundTypes;
-import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.item.ItemType;
import org.spongepowered.api.item.inventory.Inventory;
-import org.spongepowered.api.item.inventory.query.QueryOperationTypes;
-import org.spongepowered.api.text.Text;
-import org.spongepowered.api.text.chat.ChatTypes;
+import org.spongepowered.api.item.inventory.query.QueryTypes;
import org.spongepowered.api.util.Direction;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
import java.util.HashMap;
import java.util.HashSet;
@@ -67,14 +68,14 @@ public class Craft {
// State
private String name;
private final AtomicBoolean processing = new AtomicBoolean();
- private int processingStartTime = 0;
+ private long processingStartTime = 0;
private HashHitBox hitBox;
// TODO - Sinking related - Use Implementation
// makes it so the craft can't collapse on itself
// CollapsedHitbox is to prevent the wrecks from despawning when sinking into water
protected HashHitBox collapsedHitBox = new HashHitBox();
private long lastCheckTick = 0L;
- private World world; //TODO - Make cross-dimension travel possible
+ private ServerWorld world; //TODO - Make cross-dimension travel possible
private boolean sinking = false;
private boolean disabled = false;
private boolean isSubCraft = false;
@@ -85,7 +86,7 @@ public class Craft {
// Movement
- private Vector3i lastMoveVector = new Vector3i();
+ private Vector3i lastMoveVector;
@Deprecated
private HashSet phasedBlocks = new HashSet<>(); //TODO - move to listener database thingy
private double movePoints;
@@ -97,7 +98,7 @@ public class Craft {
// Init with value > 0 or else getTickCooldown() will silently fail
private float meanMoveTime = 1;
private long lastRotateTime = 0;
- private int lastMoveTick = Sponge.getServer().getRunningTimeTicks() - 100;
+ private long lastMoveTick = Sponge.server().runningTimeTicks().ticks() - 100;
private float speedBlockEffect = 1;
@@ -105,7 +106,7 @@ public class Craft {
private DirectControlMode directControl = DirectControlMode.OFF;
//Contacts
- HashMap contactTracking = new HashMap<>();
+ HashMap contactTracking = new HashMap();
/**
@@ -115,19 +116,19 @@ public class Craft {
* @param player The player that triggered craft detection
* @param startLocation The location from which to start craft detection
*/
- public Craft(CraftType type, Player player, Location startLocation) {
+ public Craft(CraftType type, ServerPlayer player, ServerLocation startLocation) {
this.type = type;
- world = startLocation.getExtent();
+ world = startLocation.world();
- commandeeredBy = player.getUniqueId();
- maxHeightLimit = Math.min(type.getValue(CraftSettings.MaxHeightLimit.class).get(), world.getDimension().getBuildHeight() - 1);
+ commandeeredBy = player.uniqueId();
+ maxHeightLimit = Math.min(type.getValue(CraftSettings.MaxHeightLimit.class).get(), world.maximumHeight() - 1);
submitTask(new DetectionTask(this, startLocation, player));
}
// Facts
- public CraftType getType() {
+ public CraftType type() {
return type;
}
@@ -176,11 +177,11 @@ public boolean isProcessing() {
}
public void setProcessing(boolean isProcessing) {
- processingStartTime = Sponge.getServer().getRunningTimeTicks();
+ processingStartTime = Sponge.server().runningTimeTicks().ticks();
processing.set(isProcessing);
}
- public int getProcessingStartTime() {
+ public long getProcessingStartTime() {
return processingStartTime;
}
@@ -323,9 +324,9 @@ public void runChecks() {
disable();
if (getCrew().get(CrewRoles.Pilot.class).isPresent()) {
- Location loc =
- Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).get().getLocation();
- world.playSound(SoundTypes.ENTITY_IRONGOLEM_DEATH, loc.getPosition(), 5.0f, 5.0f);
+ ServerLocation loc =
+ Sponge.server().player(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).get().serverLocation();
+ world.playSound(Sound.sound(SoundTypes.ENTITY_IRON_GOLEM_DEATH.get(), Sound.Source.BLOCK, 5.0f, 5.0f), loc.position());
}
}
}
@@ -339,20 +340,20 @@ public void runChecks() {
}
}
- // if the craft is sinking, let the player know and release the craft. Otherwise update the time for the next check
+ // if the craft is sinking, let the player know and release the craft. Otherwise, update the time for the next check
if (shouldSink) {
sink();
CraftManager.getInstance().removeReleaseTask(this);
} else {
- lastCheckTick = Sponge.getServer().getRunningTimeTicks();
+ lastCheckTick = Sponge.server().runningTimeTicks().ticks();
}
}
}
}
- public World getWorld() {
+ public ServerWorld getWorld() {
return world;
}
@@ -363,7 +364,7 @@ public boolean isSinking() {
public void sink() {
// Throw an event
CraftSinkEvent event = new CraftSinkEvent(this);
- Sponge.getEventManager().post(event);
+ Sponge.eventManager().post(event);
// Check if the event has been cancelled
if (event.isCancelled()) {
@@ -379,11 +380,11 @@ public void sink() {
// And log it in the console
Movecraft.getInstance().getLogger().info("Craft " + id + " is sinking: \r" +
- "Originally commandeered by " + Sponge.getServer().getPlayer(commandeeredBy).orElse(null) + " at " + commandeeredAt + " ticks \r" +
- "Currently commanded by " + Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).orElse(null) +
+ "Originally commandeered by " + Sponge.server().player(commandeeredBy).orElse(null) + " at " + commandeeredAt + " ticks \r" +
+ "Currently commanded by " + Sponge.server().player(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).orElse(null) +
"\r"
+
- "Currently piloted by " + Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).orElse(null) + "\r" +
+ "Currently piloted by " + Sponge.server().player(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).orElse(null) + "\r" +
"\r" +
"Craft type: " + type.getValue(CraftSettings.Name.class).get() + "\r" +
"Size " + hitBox.size() + " of original " + initialSize + "\r" +
@@ -421,7 +422,7 @@ public Crew getCrew() {
public void notifyCrew(String message) {
//TODO - Add Main Config setting to decide if the crew should be notified of such events
- getCrew().getMembers().forEach(crewMember -> Sponge.getServer().getPlayer(crewMember).ifPresent(player -> player.sendMessage(Text.of(message))));
+ getCrew().getMembers().forEach(crewMember -> Sponge.server().player(crewMember).ifPresent(player -> player.sendMessage(Component.text(message))));
}
@@ -456,7 +457,7 @@ public boolean useFuel(double requiredPoints) {
Map> blockMap = hitBox.map(world);
//Find all the furnace blocks
- getType().getValue(CraftSettings.FurnaceBlocks.class).get().forEach(blockType -> {
+ type().getValue(CraftSettings.FurnaceBlocks.class).get().forEach(blockType -> {
if (blockMap.containsKey(blockType)) {
furnaceBlocks.addAll(blockMap.get(blockType));
}
@@ -464,18 +465,18 @@ public boolean useFuel(double requiredPoints) {
//Find and burn fuel
for (Vector3i furnaceLocation : furnaceBlocks) {
- if (world.getTileEntity(furnaceLocation).isPresent() && world.getTileEntity(furnaceLocation).get() instanceof TileEntityCarrier) {
- Inventory inventory = ((TileEntityCarrier) world.getTileEntity(furnaceLocation).get()).getInventory();
+ if (world.blockEntity(furnaceLocation).isPresent() && world.blockEntity(furnaceLocation).get() instanceof CarrierBlockEntity) {
+ Inventory inventory = ((CarrierBlockEntity) world.blockEntity(furnaceLocation).get()).inventory();
- Set fuelItems = getType().getValue(CraftSettings.FuelItems.class).get().keySet();
+ Set fuelItems = type().getValue(CraftSettings.FuelItems.class).get().keySet();
for (ItemType fuelItem : fuelItems) {
if (inventory.contains(fuelItem)) {
- double fuelItemValue = getType().getValue(CraftSettings.FuelItems.class).get().get(fuelItem);
+ double fuelItemValue = type().getValue(CraftSettings.FuelItems.class).get().get(fuelItem);
int oldValue = (int) Math.ceil((requiredPoints - movePoints) / fuelItemValue);
- int newValue = inventory.query(QueryOperationTypes.ITEM_TYPE.of(fuelItem)).poll(oldValue).get().getQuantity();
+ int newValue = inventory.query(QueryTypes.ITEM_TYPE.get().of(fuelItem)).poll(oldValue).polledItem().quantity();
movePoints += newValue * fuelItemValue;
}
@@ -508,7 +509,7 @@ public int checkFuelStored() {
Map> blockMap = hitBox.map(world);
//Find all the furnace blocks
- getType().getValue(CraftSettings.FurnaceBlocks.class).get().forEach(blockType -> {
+ type().getValue(CraftSettings.FurnaceBlocks.class).get().forEach(blockType -> {
if (blockMap.containsKey(blockType)) {
furnaceBlocks.addAll(blockMap.get(blockType));
}
@@ -516,17 +517,15 @@ public int checkFuelStored() {
//Find and count the fuel
for (Vector3i furnaceLocation : furnaceBlocks) {
- if (world.getTileEntity(furnaceLocation).isPresent() && world.getTileEntity(furnaceLocation).get() instanceof TileEntityCarrier) {
- Inventory inventory = ((TileEntityCarrier) world.getTileEntity(furnaceLocation).get()).getInventory();
+ if (world.blockEntity(furnaceLocation).isPresent() && world.blockEntity(furnaceLocation).get() instanceof CarrierBlockEntity) {
+ Inventory inventory = ((CarrierBlockEntity) world.blockEntity(furnaceLocation).get()).inventory();
- Set fuelItems = getType().getValue(CraftSettings.FuelItems.class).get().keySet();
+ Set fuelItems = type().getValue(CraftSettings.FuelItems.class).get().keySet();
for (ItemType fuelItem : fuelItems) {
if (inventory.contains(fuelItem)) {
- fuelStored +=
- inventory.query(QueryOperationTypes.ITEM_TYPE.of(fuelItem)).totalItems() * getType()
- .getValue(CraftSettings.FuelItems.class).get().get(fuelItem);
+ fuelStored += (int) (inventory.query(QueryTypes.ITEM_TYPE, fuelItem).totalQuantity() * type().getValue(CraftSettings.FuelItems.class).get().get(fuelItem));
}
}
@@ -548,12 +547,12 @@ public void addMoveTime(float moveTime) {
meanMoveTime = (meanMoveTime * numberOfMoves + moveTime) / (++numberOfMoves);
}
- public int getLastMoveTick() {
+ public long getLastMoveTick() {
return lastMoveTick;
}
public void updateLastMoveTick() {
- lastMoveTick = Sponge.getServer().getRunningTimeTicks();
+ lastMoveTick = Sponge.server().runningTimeTicks().ticks();
}
public void setCruising(Direction vertical, Direction horizontal) {
@@ -566,8 +565,7 @@ public void setCruising(Direction vertical, Direction horizontal) {
return;
}
- Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).ifPresent(player -> player.sendMessage(ChatTypes.ACTION_BAR,
- Text.of("Cruising " + ((vertical != Direction.NONE || horizontal != Direction.NONE) ? "Enabled" : "Disabled"))));
+ Sponge.server().player(getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).ifPresent(player -> player.sendActionBar(Component.text("Cruising " + ((vertical != Direction.NONE || horizontal != Direction.NONE) ? "Enabled" : "Disabled"))));
horizontalCruiseDirection = horizontal;
verticalCruiseDirection = vertical;
@@ -592,7 +590,7 @@ public boolean isCruising() {
private void resetSigns() {
for (Vector3i loc : hitBox) {
- final TileEntity tileEntity = world.getTileEntity(loc).orElse(null);
+ final BlockEntity tileEntity = world.blockEntity(loc).orElse(null);
if (!(tileEntity instanceof Sign)) {
continue;
@@ -600,30 +598,31 @@ private void resetSigns() {
final Sign sign = (Sign) tileEntity;
- ListValue signLines = sign.lines();
+ ListValue.Mutable signLines = sign.lines();
// Reset ALL signs
// Do Vertical first
- if (signLines.get(0).toPlain().equalsIgnoreCase("Ascend: ON") && verticalCruiseDirection != Direction.UP) {
- signLines.set(0, Text.of("Ascend: OFF"));
+ String line = PlainTextComponentSerializer.plainText().serialize(signLines.get(0));
+ if (line.equalsIgnoreCase("Ascend: ON") && verticalCruiseDirection != Direction.UP) {
+ signLines.set(0, Component.text("Ascend: OFF"));
- } else if (signLines.get(0).toPlain().equalsIgnoreCase("Ascend: OFF") && verticalCruiseDirection == Direction.UP) {
- signLines.set(0, Text.of("Ascend: ON"));
+ } else if (line.equalsIgnoreCase("Ascend: OFF") && verticalCruiseDirection == Direction.UP) {
+ signLines.set(0, Component.text("Ascend: ON"));
- } else if (signLines.get(0).toPlain().equalsIgnoreCase("Descend: ON") && verticalCruiseDirection != Direction.DOWN) {
- signLines.set(0, Text.of("Descend: OFF"));
+ } else if (line.equalsIgnoreCase("Descend: ON") && verticalCruiseDirection != Direction.DOWN) {
+ signLines.set(0, Component.text("Descend: OFF"));
- } else if (signLines.get(0).toPlain().equalsIgnoreCase("Descend: OFF") && verticalCruiseDirection == Direction.DOWN) {
- signLines.set(0, Text.of("Descend: ON"));
+ } else if (line.equalsIgnoreCase("Descend: OFF") && verticalCruiseDirection == Direction.DOWN) {
+ signLines.set(0, Component.text("Descend: ON"));
// Then do Horizontal
- } else if (signLines.get(0).toPlain().equalsIgnoreCase("Cruise: ON")
- && sign.getBlock().get(Keys.DIRECTION).get() != horizontalCruiseDirection) {
- signLines.set(0, Text.of("Cruise: OFF"));
+ } else if (line.equalsIgnoreCase("Cruise: ON")
+ && sign.block().get(Keys.DIRECTION).get() != horizontalCruiseDirection) {
+ signLines.set(0, Component.text("Cruise: OFF"));
- } else if (signLines.get(0).toPlain().equalsIgnoreCase("Cruise: OFF")
- && sign.getBlock().get(Keys.DIRECTION).get() == horizontalCruiseDirection) {
- signLines.set(0, Text.of("Cruise: ON"));
+ } else if (line.equalsIgnoreCase("Cruise: OFF")
+ && sign.block().get(Keys.DIRECTION).get() == horizontalCruiseDirection) {
+ signLines.set(0, Component.text("Cruise: ON"));
}
sign.offer(signLines);
@@ -632,25 +631,25 @@ private void resetSigns() {
public void translate(Vector3i displacement) {
// check to see if the craft is trying to move in a direction not permitted by the type
- if (!this.getType().getValue(CraftSettings.AllowHorizontalMovement.class).get() && !sinking) {
- displacement = new Vector3i(0, displacement.getY(), 0);
+ if (!this.type().getValue(CraftSettings.AllowHorizontalMovement.class).get() && !sinking) {
+ displacement = new Vector3i(0, displacement.y(), 0);
}
- if (!this.getType().getValue(CraftSettings.AllowVerticalMovement.class).get() && !sinking) {
- displacement = new Vector3i(displacement.getX(), 0, displacement.getZ());
+ if (!this.type().getValue(CraftSettings.AllowVerticalMovement.class).get() && !sinking) {
+ displacement = new Vector3i(displacement.x(), 0, displacement.z());
}
- if (displacement.getX() == 0 && displacement.getY() == 0 && displacement.getZ() == 0) {
+ if (displacement.x() == 0 && displacement.y() == 0 && displacement.z() == 0) {
return;
}
- if (!this.getType().getValue(CraftSettings.AllowVerticalTakeoffAndLanding.class).get() && displacement.getY() != 0 && !sinking) {
- if (displacement.getX() == 0 && displacement.getZ() == 0) {
+ if (!this.type().getValue(CraftSettings.AllowVerticalTakeoffAndLanding.class).get() && displacement.y() != 0 && !sinking) {
+ if (displacement.x() == 0 && displacement.z() == 0) {
return;
}
}
- AsyncTask task = new TranslationTask(this, new Vector3i(displacement.getX(), displacement.getY(), displacement.getZ()));
+ AsyncTask task = new TranslationTask(this, new Vector3i(displacement.x(), displacement.y(), displacement.z()));
if (!isProcessing()) {
submitTask(task);
@@ -659,8 +658,8 @@ public void translate(Vector3i displacement) {
public void rotate(Vector3i originPoint, Rotation rotation) {
if (lastRotateTime + 1e9 > System.nanoTime() && !isSubCraft()) {
- Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Pilot.class).get().getPlayer())
- .ifPresent(player -> player.sendMessage(Text.of("Rotation - Turning Too Quickly")));
+ Sponge.server().player(getCrew().get(CrewRoles.Pilot.class).get().getPlayer())
+ .ifPresent(player -> player.sendMessage(Component.text("Rotation - Turning Too Quickly")));
return;
}
@@ -673,7 +672,7 @@ public void rotate(Vector3i originPoint, Rotation rotation) {
}
public float getActualSpeed() {
- return (float) Sponge.getServer().getTicksPerSecond() * lastMoveVector.length() / getTickCooldown();
+ return (float) Sponge.server().ticksPerSecond() * lastMoveVector.length() / getTickCooldown();
}
public float getSimulatedSpeed() {
@@ -726,15 +725,15 @@ public String getContactChatMessage(Craft contact) {
// TODO - Code correctly
String commanderName = null;
if (contact.getCrew().get(CrewRoles.Commander.class).get().getPlayer() != null) {
- commanderName = Sponge.getServer().getPlayer(contact.getCrew().get(CrewRoles.Commander.class).get().getPlayer()).get().getName();
+ commanderName = Sponge.server().player(contact.getCrew().get(CrewRoles.Commander.class).get().getPlayer()).get().name();
}
return String.format("%s commanded by %s, size: %d, range: %d to the %s.",
- contact.getType().getValue(CraftSettings.Name.class).get(),
+ contact.type().getValue(CraftSettings.Name.class).get(),
commanderName,
contact.getInitialSize(),
(int) hitBox.getMidPoint().toFloat().distance(contact.getHitBox().getMidPoint().toFloat()),
- ChatUtils.abbreviateDirection(Direction.getClosest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
+ ChatUtils.abbreviateDirection(Direction.closest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
contact.getHitBox().getMidPoint()).toDouble())));
}
@@ -742,7 +741,7 @@ public String getContactSignMessage(Craft contact) {
float distance = hitBox.getMidPoint().toFloat().distance(contact.getHitBox().getMidPoint().toFloat());
- String type = contact.getType().getValue(CraftSettings.Name.class).get();
+ String type = contact.type().getValue(CraftSettings.Name.class).get();
if (type.length() > 7) {
type = type.substring(0, 7);
@@ -754,14 +753,14 @@ public String getContactSignMessage(Craft contact) {
string = String.format("%s %.0fk %s",
type,
distance / 1000,
- ChatUtils.abbreviateDirection(Direction.getClosest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
+ ChatUtils.abbreviateDirection(Direction.closest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
contact.getHitBox().getMidPoint()).toDouble())));
} else {
string = String.format("%s %.0f %s",
type,
distance,
- ChatUtils.abbreviateDirection(Direction.getClosest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
+ ChatUtils.abbreviateDirection(Direction.closest(MathUtils.vector3iDirectionalDiff(hitBox.getMidPoint(),
contact.getHitBox().getMidPoint()).toDouble())));
}
@@ -783,7 +782,7 @@ public void runContacts() {
double viewRangeSquared = viewRange * viewRange;
for (final Craft contact : CraftManager.getInstance().getCraftsInWorld(world)) {
- if (contact.getType().getValue(CraftSettings.DetectionMultiplier.class).get() > 0) {
+ if (contact.type().getValue(CraftSettings.DetectionMultiplier.class).get() > 0) {
Vector3i contactMiddle = contact.getHitBox().getMidPoint();
float distanceSquared = contactMiddle.toFloat().distanceSquared(spotterMiddle.toFloat());
@@ -791,23 +790,23 @@ public void runContacts() {
if (distanceSquared <= viewRangeSquared && !hitBox.intersects(contact.getHitBox())) {
//TODO - implement Underwater Detection Multiplier
float contactDetectability =
- (float) (contact.getHitBox().size() * contact.getType().getValue(CraftSettings.DetectionMultiplier.class).get());
+ (float) (contact.getHitBox().size() * contact.type().getValue(CraftSettings.DetectionMultiplier.class).get());
double detectableSizeAtDistanceSquared = hitBox.size() - ((distanceSquared / viewRangeSquared) * hitBox.size());
if (contactDetectability > detectableSizeAtDistanceSquared) {
// craft has been detected
// has the craft not been seen in the last minute, or is completely new?
if (contactTracking.get(contact) == null
- || Sponge.getServer().getRunningTimeTicks() - contactTracking.get(contact) > 1200) {
+ || Sponge.server().runningTimeTicks().ticks() - contactTracking.get(contact) > 1200) {
// TODO - should be entire crew
- Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).ifPresent(player -> {
- player.sendMessage(Text.of("New Contact: " + getContactChatMessage(contact)));
- world.playSound(SoundTypes.BLOCK_ANVIL_LAND, player.getLocation().getPosition(), 1.0f, 2.0f);
+ Sponge.server().player(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).ifPresent(player -> {
+ player.sendMessage(Component.text("New Contact: " + getContactChatMessage(contact)));
+ world.playSound(Sound.sound(SoundTypes.BLOCK_ANVIL_LAND, Sound.Source.BLOCK, 1.0f, 2.0f), player.location().position());
});
}
- int timestamp = Sponge.getServer().getRunningTimeTicks();
+ long timestamp = Sponge.server().runningTimeTicks().ticks();
contactTracking.put(contact, timestamp);
}
}
@@ -815,8 +814,8 @@ public void runContacts() {
}
}
- for (Map.Entry entry : contactTracking.entrySet()) {
- if (Sponge.getServer().getRunningTimeTicks() - entry.getValue() > 1200) {
+ for (Map.Entry entry : contactTracking.entrySet()) {
+ if (Sponge.server().runningTimeTicks().ticks() - entry.getValue() > 1200) {
contactTracking.remove(entry.getKey());
}
}
@@ -862,7 +861,7 @@ public int getWaterLine() {
int posZ;
posZ = hitBox.getMinZ() - 1;
for (posX = hitBox.getMinX() - 1; posX <= hitBox.getMaxX() + 1; posX++) {
- BlockType typeID = world.getBlock(posX, posY, posZ).getType();
+ BlockType typeID = world.block(posX, posY, posZ).type();
if (typeID == BlockTypes.WATER) {
numWater++;
}
@@ -872,7 +871,7 @@ public int getWaterLine() {
}
posZ = hitBox.getMaxZ() + 1;
for (posX = hitBox.getMinX() - 1; posX <= hitBox.getMaxX() + 1; posX++) {
- BlockType typeID = world.getBlock(posX, posY, posZ).getType();
+ BlockType typeID = world.block(posX, posY, posZ).type();
if (typeID == BlockTypes.WATER) {
numWater++;
}
@@ -882,7 +881,7 @@ public int getWaterLine() {
}
posX = hitBox.getMinX() - 1;
for (posZ = hitBox.getMinZ(); posZ <= hitBox.getMaxZ(); posZ++) {
- BlockType typeID = world.getBlock(posX, posY, posZ).getType();
+ BlockType typeID = world.block(posX, posY, posZ).type();
if (typeID == BlockTypes.WATER) {
numWater++;
}
@@ -892,7 +891,7 @@ public int getWaterLine() {
}
posX = hitBox.getMaxX() + 1;
for (posZ = hitBox.getMinZ(); posZ <= hitBox.getMaxZ(); posZ++) {
- BlockType typeID = world.getBlock(posX, posY, posZ).getType();
+ BlockType typeID = world.block(posX, posY, posZ).type();
if (typeID == BlockTypes.WATER) {
numWater++;
}
@@ -907,9 +906,9 @@ public int getWaterLine() {
return waterLine;
}
- public void release(Player player) {
+ public void release(ServerPlayer player) {
if (player == null) {
- player = Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).orElse(null);
+ player = Sponge.server().player(getCrew().get(CrewRoles.Commander.class).get().getPlayer()).orElse(null);
}
CraftManager.getInstance().removeCraft(this, player);
@@ -918,24 +917,24 @@ public void release(Player player) {
getCrew().clear();
}
- public Optional getNotificationPlayer() {
- Optional player = Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Pilot.class).get().getPlayer());
+ public Optional getNotificationPlayer() {
+ Optional player = Sponge.server().player(getCrew().get(CrewRoles.Pilot.class).get().getPlayer());
if (!player.isPresent()) {
- player = Sponge.getServer().getPlayer(getCrew().get(CrewRoles.Commander.class).get().getPlayer());
+ player = Sponge.server().player(getCrew().get(CrewRoles.Commander.class).get().getPlayer());
}
if (!player.isPresent()) {
- player = Sponge.getServer().getPlayer(commandeeredBy);
+ player = Sponge.server().player(commandeeredBy);
}
return player;
}
public boolean hasCooldownExpired() {
- double ticksElapsed = Sponge.getServer().getRunningTimeTicks() - lastMoveTick;
+ double ticksElapsed = Sponge.server().runningTimeTicks().ticks() - lastMoveTick;
//TODO: Replace world.getSeaLevel() with something better
- if (type.getValue(CraftSettings.UnderwaterSpeedMultiplier.class).get() > 0 && hitBox.getMinY() < world.getSeaLevel()) {
+ if (type.getValue(CraftSettings.UnderwaterSpeedMultiplier.class).get() > 0 && hitBox.getMinY() < world.seaLevel()) {
ticksElapsed = ticksElapsed * type.getValue(CraftSettings.UnderwaterSpeedMultiplier.class).get();
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/CraftManager.java b/src/main/java/io/github/pulverizer/movecraft/craft/CraftManager.java
index deaaaaf6b..3d0aab762 100644
--- a/src/main/java/io/github/pulverizer/movecraft/craft/CraftManager.java
+++ b/src/main/java/io/github/pulverizer/movecraft/craft/CraftManager.java
@@ -1,6 +1,12 @@
package io.github.pulverizer.movecraft.craft;
-import com.flowpowered.math.vector.Vector3i;
+import org.jetbrains.annotations.NotNull;
+import org.spongepowered.api.scheduler.ScheduledTask;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.util.Ticks;
+import org.spongepowered.api.world.server.ServerLocation;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.ConfigManager;
import io.github.pulverizer.movecraft.config.craft.CraftType;
@@ -9,10 +15,8 @@
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.scheduler.Task;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
import java.util.Collections;
import java.util.HashSet;
@@ -28,39 +32,55 @@ public class CraftManager implements Iterable {
private final Set craftList = ConcurrentHashMap.newKeySet();
private final HashSet transparent = new HashSet<>();
@Deprecated
- private final ConcurrentMap releaseEvents = new ConcurrentHashMap<>();
+ private final ConcurrentMap releaseEvents = new ConcurrentHashMap<>();
private HashSet craftTypes;
private CraftManager() {
- transparent.add(BlockTypes.AIR);
- transparent.add(BlockTypes.GLASS);
- transparent.add(BlockTypes.GLASS_PANE);
- transparent.add(BlockTypes.STAINED_GLASS);
- transparent.add(BlockTypes.STAINED_GLASS_PANE);
- transparent.add(BlockTypes.IRON_BARS);
- transparent.add(BlockTypes.REDSTONE_WIRE);
- transparent.add(BlockTypes.IRON_TRAPDOOR);
- transparent.add(BlockTypes.TRAPDOOR);
- transparent.add(BlockTypes.NETHER_BRICK_STAIRS);
- transparent.add(BlockTypes.LEVER);
- transparent.add(BlockTypes.STONE_BUTTON);
- transparent.add(BlockTypes.WOODEN_BUTTON);
- transparent.add(BlockTypes.ACACIA_STAIRS);
- transparent.add(BlockTypes.SANDSTONE_STAIRS);
- transparent.add(BlockTypes.BIRCH_STAIRS);
- transparent.add(BlockTypes.BRICK_STAIRS);
- transparent.add(BlockTypes.DARK_OAK_STAIRS);
- transparent.add(BlockTypes.JUNGLE_STAIRS);
- transparent.add(BlockTypes.OAK_STAIRS);
- transparent.add(BlockTypes.PURPUR_STAIRS);
- transparent.add(BlockTypes.QUARTZ_STAIRS);
- transparent.add(BlockTypes.RED_SANDSTONE_STAIRS);
- transparent.add(BlockTypes.SPRUCE_STAIRS);
- transparent.add(BlockTypes.STONE_BRICK_STAIRS);
- transparent.add(BlockTypes.STONE_STAIRS);
- transparent.add(BlockTypes.WALL_SIGN);
- transparent.add(BlockTypes.STANDING_SIGN);
-
+ transparent.add(BlockTypes.AIR.get());
+ transparent.add(BlockTypes.GLASS.get());
+ transparent.add(BlockTypes.GLASS_PANE.get());
+
+ transparent.add(BlockTypes.BLACK_STAINED_GLASS.get());
+ transparent.add(BlockTypes.BLUE_STAINED_GLASS.get());
+ transparent.add(BlockTypes.BROWN_STAINED_GLASS.get());
+ transparent.add(BlockTypes.CYAN_STAINED_GLASS.get());
+ transparent.add(BlockTypes.GRAY_STAINED_GLASS.get());
+ transparent.add(BlockTypes.GREEN_STAINED_GLASS.get());
+ transparent.add(BlockTypes.LIGHT_BLUE_STAINED_GLASS.get());
+ transparent.add(BlockTypes.LIGHT_GRAY_STAINED_GLASS.get());
+ transparent.add(BlockTypes.LIME_STAINED_GLASS.get());
+ transparent.add(BlockTypes.MAGENTA_STAINED_GLASS.get());
+ transparent.add(BlockTypes.ORANGE_STAINED_GLASS.get());
+ transparent.add(BlockTypes.PINK_STAINED_GLASS.get());
+ transparent.add(BlockTypes.PURPLE_STAINED_GLASS.get());
+ transparent.add(BlockTypes.RED_STAINED_GLASS.get());
+ transparent.add(BlockTypes.WHITE_STAINED_GLASS.get());
+ transparent.add(BlockTypes.YELLOW_STAINED_GLASS.get());
+
+ transparent.add(BlockTypes.BLACK_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.BLUE_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.BROWN_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.CYAN_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.GRAY_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.GREEN_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.LIGHT_BLUE_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.LIGHT_GRAY_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.LIME_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.MAGENTA_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.ORANGE_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.PINK_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.PURPLE_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.RED_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.WHITE_STAINED_GLASS_PANE.get());
+ transparent.add(BlockTypes.YELLOW_STAINED_GLASS_PANE.get());
+
+ transparent.add(BlockTypes.IRON_BARS.get());
+ transparent.add(BlockTypes.REDSTONE_WIRE.get());
+ transparent.addAll(BlockTypeTags.TRAPDOORS.get().values());
+ transparent.addAll(BlockTypeTags.STAIRS.get().values());
+ transparent.add(BlockTypes.LEVER.get());
+ transparent.addAll(BlockTypeTags.BUTTONS.get().values());
+ transparent.addAll(BlockTypeTags.SIGNS.get().values());
this.craftTypes = ConfigManager.loadCraftTypes();
}
@@ -93,7 +113,7 @@ public void addCraft(Craft craft) {
this.craftList.add(craft);
}
- public void removeCraft(Craft c, Player player) {
+ public void removeCraft(Craft c, ServerPlayer player) {
removeReleaseTask(c);
// if its sinking, just remove the craft without notifying or checking
@@ -101,12 +121,12 @@ public void removeCraft(Craft c, Player player) {
if (c.getHitBox() != null && !c.getHitBox().isEmpty()) {
if (player != null) {
Movecraft.getInstance().getLogger().info(String
- .format(player.getName() + " has released a craft of type %s with size %d at coordinates : %d x , %d z",
- c.getType().getValue(CraftSettings.Name.class).get(), c.getHitBox().size(), c.getHitBox().getMinX(),
+ .format(player.name() + " has released a craft of type %s with size %d at coordinates : %d x , %d z",
+ c.type().getValue(CraftSettings.Name.class).get(), c.getHitBox().size(), c.getHitBox().getMinX(),
c.getHitBox().getMinZ()));
} else {
Movecraft.getInstance().getLogger().info(String
- .format("NULL Player has released a craft of type %s with size %d at coordinates : %d x , %d z", c.getType().getValue(
+ .format("NULL ServerPlayer has released a craft of type %s with size %d at coordinates : %d x , %d z", c.type().getValue(
CraftSettings.Name.class).get(),
c.getHitBox().size(), c.getHitBox().getMinX(), c.getHitBox().getMinZ()));
}
@@ -119,7 +139,7 @@ public void forceRemoveCraft(Craft c) {
this.craftList.remove(c);
}
- public Set getCraftsInWorld(World world) {
+ public Set getCraftsInWorld(ServerWorld world) {
Set crafts = new HashSet<>();
for (Craft c : this.craftList) {
if (c.getWorld() == world) {
@@ -131,7 +151,7 @@ public Set getCraftsInWorld(World world) {
public Craft getCraftByPlayer(UUID player) {
- if (!Sponge.getServer().getPlayer(player).isPresent()) {
+ if (Sponge.server().player(player).isEmpty()) {
return null;
}
@@ -155,20 +175,20 @@ public Craft getCraftByUUID(UUID id) {
}
@Deprecated
- public final void addReleaseTask(final Craft c) {
- Task releaseTask = Task.builder().delayTicks(20 * 15).execute(player -> c.release(null)).submit(Movecraft.getInstance());
- releaseEvents.put(c, releaseTask);
+ public final void addReleaseTask(final Craft craft) {
+ Task releaseTask = Task.builder().delay(Ticks.of(20 * 15)).execute(player -> craft.release(null)).build();
+ releaseEvents.put(craft, Sponge.server().scheduler().submit(releaseTask));
}
@Deprecated
- public final void removeReleaseTask(final Craft c) {
- if (!c.getCrew().isEmpty()) {
- if (releaseEvents.containsKey(c)) {
- if (releaseEvents.get(c) != null) {
- releaseEvents.get(c).cancel();
+ public final void removeReleaseTask(final Craft craft) {
+ if (!craft.getCrew().isEmpty()) {
+ if (releaseEvents.containsKey(craft)) {
+ if (releaseEvents.get(craft) != null) {
+ releaseEvents.get(craft).cancel();
}
- releaseEvents.remove(c);
+ releaseEvents.remove(craft);
}
}
}
@@ -182,14 +202,14 @@ public CraftType getCraftTypeFromString(String string) {
return null;
}
- public Craft fastNearestCraftToLoc(Location loc) {
+ public Craft fastNearestCraftToLoc(ServerLocation loc) {
Craft returnedCraft = null;
long closestDistSquared = 1000000000L;
- Set craftsList = CraftManager.getInstance().getCraftsInWorld(loc.getExtent());
+ Set craftsList = CraftManager.getInstance().getCraftsInWorld(loc.world());
for (Craft craft : craftsList) {
Vector3i hitBoxMidPoint = craft.getHitBox().getMidPoint();
- int distSquared = hitBoxMidPoint.distanceSquared(loc.getBlockPosition());
+ int distSquared = hitBoxMidPoint.distanceSquared(loc.blockPosition());
if (distSquared < closestDistSquared) {
closestDistSquared = distSquared;
@@ -204,7 +224,7 @@ public boolean isEmpty() {
}
@Override
- public Iterator iterator() {
+ public @NotNull Iterator iterator() {
return Collections.unmodifiableSet(this.craftList).iterator();
}
@@ -212,11 +232,11 @@ public void removePlayer(UUID player) {
craftList.forEach(craft -> craft.getCrew().remove(player));
}
- public HashSet getCraftsFromLocation(Location location) {
+ public HashSet getCraftsFromLocation(ServerLocation location) {
HashSet results = new HashSet<>();
- for (Craft testCraft : getCraftsInWorld(location.getExtent())) {
- if (testCraft.getHitBox().contains(location.getBlockPosition())) {
+ for (Craft testCraft : getCraftsInWorld(location.world())) {
+ if (testCraft.getHitBox().contains(location.blockPosition())) {
results.add(testCraft);
}
}
@@ -224,9 +244,9 @@ public HashSet getCraftsFromLocation(Location location) {
return results;
}
- public Craft getCraftFromLocation(Location location) {
- for (Craft testCraft : getCraftsInWorld(location.getExtent())) {
- if (testCraft.getHitBox().contains(location.getBlockPosition())) {
+ public Craft getCraftFromLocation(ServerLocation location) {
+ for (Craft testCraft : getCraftsInWorld(location.world())) {
+ if (testCraft.getHitBox().contains(location.blockPosition())) {
return testCraft;
}
}
@@ -234,7 +254,7 @@ public Craft getCraftFromLocation(Location location) {
return null;
}
- public HashSet getCraftsIntersectingWith(HashHitBox hitBox, World world) {
+ public HashSet getCraftsIntersectingWith(HashHitBox hitBox, ServerWorld world) {
HashSet results = new HashSet<>();
for (Craft testCraft : getCraftsInWorld(world)) {
diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewInvite.java b/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewInvite.java
index f1b45837d..412d58a40 100644
--- a/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewInvite.java
+++ b/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewInvite.java
@@ -4,7 +4,7 @@
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.craft.CraftManager;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import java.util.UUID;
@@ -14,26 +14,26 @@ public class CrewInvite {
private UUID invitedBy;
private UUID craftUUID;
private String message;
- private int tickSent;
+ private long tickSent;
- public CrewInvite(UUID invitedPlayer, Player invitedBy, Craft craft) {
+ public CrewInvite(UUID invitedPlayer, ServerPlayer invitedBy, Craft craft) {
this.invitedPlayer = invitedPlayer;
- this.invitedBy = invitedBy.getUniqueId();
+ this.invitedBy = invitedBy.uniqueId();
craftUUID = craft.getId();
- tickSent = Sponge.getServer().getRunningTimeTicks();
- message = String.format("You have been invited by %s to serve under them aboard their %s.", invitedBy.getName(), craft.getType().getValue(
+ tickSent = Sponge.server().runningTimeTicks().ticks();
+ message = String.format("You have been invited by %s to serve under them aboard their %s.", invitedBy.name(), craft.type().getValue(
CraftSettings.Name.class).get());
}
- public CrewInvite(UUID invitedPlayer, Player invitedBy, Craft craft, String craftName) {
+ public CrewInvite(UUID invitedPlayer, ServerPlayer invitedBy, Craft craft, String craftName) {
this.invitedPlayer = invitedPlayer;
- this.invitedBy = invitedBy.getUniqueId();
+ this.invitedBy = invitedBy.uniqueId();
craftUUID = craft.getId();
- tickSent = Sponge.getServer().getRunningTimeTicks();
- message = String.format("You have been invited by %s to serve under them aboard their %s, the %s.", invitedBy.getName(),
- craft.getType().getValue(
+ tickSent = Sponge.server().runningTimeTicks().ticks();
+ message = String.format("You have been invited by %s to serve under them aboard their %s, the %s.", invitedBy.name(),
+ craft.type().getValue(
CraftSettings.Name.class).get(), craftName);
}
@@ -49,8 +49,8 @@ public Craft getCraft() {
return CraftManager.getInstance().getCraftByUUID(craftUUID);
}
- public int getTicksSinceSent() {
- return Sponge.getServer().getRunningTimeTicks() - tickSent;
+ public long getTicksSinceSent() {
+ return Sponge.server().runningTimeTicks().ticks() - tickSent;
}
public String getMessage() {
diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewManager.java b/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewManager.java
index 40bcc8349..196d1fb20 100644
--- a/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewManager.java
+++ b/src/main/java/io/github/pulverizer/movecraft/craft/crew/CrewManager.java
@@ -8,8 +8,8 @@
import io.github.pulverizer.movecraft.craft.Craft;
import io.github.pulverizer.movecraft.craft.CraftManager;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import net.kyori.adventure.text.Component;
import java.util.ArrayList;
import java.util.HashSet;
@@ -23,61 +23,61 @@ public static void cleanPendingInvites() {
pendingInvites.removeIf(invite -> invite.getTicksSinceSent() > Settings.CrewInviteTimeout);
}
- public static void createInvite(Player sender, Player invited) {
+ public static void createInvite(ServerPlayer sender, ServerPlayer invited) {
if (sender.equals(invited)) {
return;
}
- Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.uniqueId());
- if (!craft.getCrew().hasRole(sender.getUniqueId(), CrewRoles.Commander.class)) {
- sender.sendMessage(Text.of("You are not the commander of your craft."));
+ if (!craft.getCrew().hasRole(sender.uniqueId(), CrewRoles.Commander.class)) {
+ sender.sendMessage(Component.text("You are not the commander of your craft."));
return;
}
- if (!sender.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".crew.invite") && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !sender
+ if (!sender.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".crew.invite") && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !sender
.hasPermission("movecraft.crew.invite"))) {
- sender.sendMessage(Text.of("Insufficient Permissions"));
+ sender.sendMessage(Component.text("Insufficient Permissions"));
return;
}
- if (!invited.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".crew.join") && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !invited.hasPermission("movecraft.crew.join"))) {
- sender.sendMessage(Text.of("Insufficient Permissions - Target player does not have necessary permissions."));
+ if (!invited.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".crew.join") && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !invited.hasPermission("movecraft.crew.join"))) {
+ sender.sendMessage(Component.text("Insufficient Permissions - Target player does not have necessary permissions."));
return;
}
CrewInvite invite;
if (craft.getName() != null && !craft.getName().isEmpty()) {
- invite = new CrewInvite(invited.getUniqueId(), sender, craft, craft.getName());
+ invite = new CrewInvite(invited.uniqueId(), sender, craft, craft.getName());
} else {
- invite = new CrewInvite(invited.getUniqueId(), sender, craft);
+ invite = new CrewInvite(invited.uniqueId(), sender, craft);
}
- sender.sendMessage(Text.of(String.format("You have invited %s to your crew.", invited.getName())));
+ sender.sendMessage(Component.text(String.format("You have invited %s to your crew.", invited.name())));
- invited.sendMessage(Text.of(invite.getMessage()));
- invited.sendMessage(Text.of(String.format("Use \"/crew join %s\" to join.", sender.getName())));
+ invited.sendMessage(Component.text(invite.getMessage()));
+ invited.sendMessage(Component.text(String.format("Use \"/crew join %s\" to join.", sender.name())));
pendingInvites.add(invite);
}
- public static void acceptInvite(Player player, Player invitedBy) {
+ public static void acceptInvite(ServerPlayer player, ServerPlayer invitedBy) {
CrewInvite foundInvite = null;
for (CrewInvite invite : pendingInvites) {
- if (invite.getInvitedPlayerUUID().equals(player.getUniqueId()) && invite.getInvitedBy().equals(invitedBy.getUniqueId())) {
+ if (invite.getInvitedPlayerUUID().equals(player.uniqueId()) && invite.getInvitedBy().equals(invitedBy.uniqueId())) {
foundInvite = invite;
Craft craft = invite.getCraft();
if (craft != null) {
- craft.getCrew().add(player.getUniqueId());
- player.sendMessage(Text.of("Welcome to the crew!"));
- Sponge.getServer().getPlayer(craft.getCrew().get(CrewRoles.Commander.class).get().getPlayer())
- .ifPresent(commander -> commander.sendMessage(Text.of(player.getName() + " has joined your crew.")));
+ craft.getCrew().add(player.uniqueId());
+ player.sendMessage(Component.text("Welcome to the crew!"));
+ Sponge.server().player(craft.getCrew().get(CrewRoles.Commander.class).get().getPlayer())
+ .ifPresent(commander -> commander.sendMessage(Component.text(player.name() + " has joined your crew.")));
} else {
- player.sendMessage(Text.of("Invite Invalid - Craft no longer exists."));
+ player.sendMessage(Component.text("Invite Invalid - Craft no longer exists."));
}
break;
@@ -87,136 +87,136 @@ public static void acceptInvite(Player player, Player invitedBy) {
if (foundInvite != null) {
pendingInvites.remove(foundInvite);
} else {
- player.sendMessage(Text.of("Invite has expired!"));
+ player.sendMessage(Component.text("Invite has expired!"));
}
}
- public static void giveRole(final Player player, final Class roleClass, Craft craft) {
+ public static void giveRole(final ServerPlayer player, final Class roleClass, Craft craft) {
try {
CrewRole role = roleClass.newInstance();
if (craft == null) {
- //player.sendMessage(Text.of("You are not in a crew!"));
+ //player.sendMessage(Component.text("You are not in a crew!"));
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + "." + role.getPermissionNode()) && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player.hasPermission("movecraft." + role.getPermissionNode()))) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + "." + role.getPermissionNode()) && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player.hasPermission("movecraft." + role.getPermissionNode()))) {
+ player.sendMessage(Component.text("Insufficient Permissions"));
return;
}
- if (craft.getCrew().setRole(player.getUniqueId(), role.getClass())) {
- //player.sendMessage(Text.of("You are now the pilot of your craft."));
+ if (craft.getCrew().setRole(player.uniqueId(), role.getClass())) {
+ //player.sendMessage(Component.text("You are now the pilot of your craft."));
}
} catch (Exception e) {
- Movecraft.getInstance().getLogger().error("An error occurred while assigning the " + roleClass.getSimpleName() + " role to " + player.getName() + "!");
+ Movecraft.getInstance().getLogger().error("An error occurred while assigning the " + roleClass.getSimpleName() + " role to " + player.name() + "!");
e.printStackTrace();
}
}
- public static void kickCrewMember(Player sender, Player target) {
+ public static void kickCrewMember(ServerPlayer sender, ServerPlayer target) {
if (sender.equals(target)) {
return;
}
- Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.uniqueId());
- if (!craft.getCrew().hasRole(sender.getUniqueId(), CrewRoles.Commander.class)) {
- sender.sendMessage(Text.of("You are not the commander of your craft."));
+ if (!craft.getCrew().hasRole(sender.uniqueId(), CrewRoles.Commander.class)) {
+ sender.sendMessage(Component.text("You are not the commander of your craft."));
}
- if (!sender.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".crew.kick") && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !sender.hasPermission("movecraft.crew.kick"))) {
- sender.sendMessage(Text.of("Insufficient Permissions"));
+ if (!sender.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".crew.kick") && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !sender.hasPermission("movecraft.crew.kick"))) {
+ sender.sendMessage(Component.text("Insufficient Permissions"));
return;
}
- sender.sendMessage(Text.of(String.format("You have kicked %s from your crew.", target.getName())));
+ sender.sendMessage(Component.text(String.format("You have kicked %s from your crew.", target.name())));
- craft.getCrew().remove(target.getUniqueId());
- target.sendMessage(Text.of("You have been kicked from the crew."));
+ craft.getCrew().remove(target.uniqueId());
+ target.sendMessage(Component.text("You have been kicked from the crew."));
}
- public static void transferCommand(Player sender, Player player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ public static void transferCommand(ServerPlayer sender, ServerPlayer player) {
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft == null) {
- player.sendMessage(Text.of("You are not commanding a craft!"));
+ player.sendMessage(Component.text("You are not commanding a craft!"));
return;
}
- if (!craft.getCrew().hasRole(sender.getUniqueId(), CrewRoles.Commander.class)) {
- sender.sendMessage(Text.of("You are not the commander of your craft."));
+ if (!craft.getCrew().hasRole(sender.uniqueId(), CrewRoles.Commander.class)) {
+ sender.sendMessage(Component.text("You are not the commander of your craft."));
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".crew.command") && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".crew.command") && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player
.hasPermission("movecraft.crew.command"))) {
- sender.sendMessage(Text.of("Insufficient Permissions - Target player does not have necessary permissions."));
+ sender.sendMessage(Component.text("Insufficient Permissions - Target player does not have necessary permissions."));
return;
}
- if (craft.getCrew().setRole(player.getUniqueId(), CrewRoles.Commander.class)) {
- sender.sendMessage(Text.of(String.format("%s is now the Commander.", player.getName())));
- player.sendMessage(Text.of("You are now the Commander."));
+ if (craft.getCrew().setRole(player.uniqueId(), CrewRoles.Commander.class)) {
+ sender.sendMessage(Component.text(String.format("%s is now the Commander.", player.name())));
+ player.sendMessage(Component.text("You are now the Commander."));
}
}
- public static void setNextInCommand(Player sender, Player player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ public static void setNextInCommand(ServerPlayer sender, ServerPlayer player) {
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft == null) {
- player.sendMessage(Text.of("You are not commanding a craft!"));
+ player.sendMessage(Component.text("You are not commanding a craft!"));
return;
}
- if (!craft.getCrew().hasRole(sender.getUniqueId(), CrewRoles.Commander.class)) {
- sender.sendMessage(Text.of("You are not the commander of your craft."));
+ if (!craft.getCrew().hasRole(sender.uniqueId(), CrewRoles.Commander.class)) {
+ sender.sendMessage(Component.text("You are not the commander of your craft."));
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".crew.command") && (
- craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".crew.command") && (
+ craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player
.hasPermission("movecraft.crew.command"))) {
- sender.sendMessage(Text.of("Insufficient Permissions - Target player does not have necessary permissions."));
+ sender.sendMessage(Component.text("Insufficient Permissions - Target player does not have necessary permissions."));
return;
}
- if (craft.getCrew().setRole(player.getUniqueId(), CrewRoles.NextInCommand.class)) {
- sender.sendMessage(Text.of(String.format("%s is now your Second-In-Command.", player.getName())));
- player.sendMessage(Text.of(String.format("You are now Second-In-Command for %s.", sender.getName())));
+ if (craft.getCrew().setRole(player.uniqueId(), CrewRoles.NextInCommand.class)) {
+ sender.sendMessage(Component.text(String.format("%s is now your Second-In-Command.", player.name())));
+ player.sendMessage(Component.text(String.format("You are now Second-In-Command for %s.", sender.name())));
}
}
- public static void resetRole(Player player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ public static void resetRole(ServerPlayer player) {
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft == null) {
- player.sendMessage(Text.of("You are not in a crew!"));
+ player.sendMessage(Component.text("You are not in a crew!"));
return;
}
- craft.getCrew().resetRole(player.getUniqueId());
- player.sendMessage(Text.of("Your role aboard your craft has been reset."));
+ craft.getCrew().resetRole(player.uniqueId());
+ player.sendMessage(Component.text("Your role aboard your craft has been reset."));
}
- public static void leaveCrew(Player sender) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.getUniqueId());
+ public static void leaveCrew(ServerPlayer sender) {
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(sender.uniqueId());
if (craft == null) {
- sender.sendMessage(Text.of("You are not in a crew!"));
+ sender.sendMessage(Component.text("You are not in a crew!"));
return;
}
- craft.getCrew().remove(sender.getUniqueId());
- sender.sendMessage(Text.of("You have left the crew."));
+ craft.getCrew().remove(sender.uniqueId());
+ sender.sendMessage(Component.text("You have left the crew."));
}
- public static ArrayList getPrintedCrewList(Player player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ public static ArrayList getPrintedCrewList(ServerPlayer player) {
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
ArrayList lines = new ArrayList<>();
@@ -226,16 +226,16 @@ public static ArrayList getPrintedCrewList(Player player) {
}
lines.add("");
- Sponge.getServer().getPlayer(craft.getCrew().get(CrewRoles.Commander.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Commander: " + crewMember.getName()));
- Sponge.getServer().getPlayer(craft.getCrew().get(CrewRoles.NextInCommand.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Next-In-Command: " + crewMember.getName()));
- Sponge.getServer().getPlayer(craft.getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Pilot: " + crewMember.getName()));
+ Sponge.server().player(craft.getCrew().get(CrewRoles.Commander.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Commander: " + crewMember.name()));
+ Sponge.server().player(craft.getCrew().get(CrewRoles.NextInCommand.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Next-In-Command: " + crewMember.name()));
+ Sponge.server().player(craft.getCrew().get(CrewRoles.Pilot.class).get().getPlayer()).ifPresent(crewMember -> lines.add("Pilot: " + crewMember.name()));
lines.add("");
craft.getCrew().getRoles().forEach(role -> {
if (!role.isEmpty()) {
lines.add(role.getName() + ":");
- role.getPlayers().forEach(playerID -> Sponge.getServer().getPlayer((UUID) playerID)
- .ifPresent(crewMember -> lines.add(" " + crewMember.getName())));
+ role.getPlayers().forEach(playerID -> Sponge.server().player((UUID) playerID)
+ .ifPresent(crewMember -> lines.add(" " + crewMember.name())));
lines.add("");
}
});
diff --git a/src/main/java/io/github/pulverizer/movecraft/listener/BlockListener.java b/src/main/java/io/github/pulverizer/movecraft/listener/BlockListener.java
index 95108efed..8b0418c73 100644
--- a/src/main/java/io/github/pulverizer/movecraft/listener/BlockListener.java
+++ b/src/main/java/io/github/pulverizer/movecraft/listener/BlockListener.java
@@ -3,7 +3,11 @@
import static org.spongepowered.api.event.Order.FIRST;
import static org.spongepowered.api.event.Order.LAST;
-import com.flowpowered.math.vector.Vector3i;
+import org.spongepowered.api.block.transaction.BlockTransaction;
+import org.spongepowered.api.block.transaction.Operations;
+import org.spongepowered.api.data.type.MatterTypes;
+import org.spongepowered.api.event.EventContextKeys;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -15,20 +19,16 @@
import io.github.pulverizer.movecraft.utils.CollectionUtils;
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.data.Transaction;
-import org.spongepowered.api.data.key.Keys;
-import org.spongepowered.api.data.property.block.MatterProperty;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.block.ChangeBlockEvent;
-import org.spongepowered.api.event.cause.EventContextKeys;
import org.spongepowered.api.event.filter.cause.Root;
import org.spongepowered.api.event.world.ExplosionEvent;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
import org.spongepowered.api.util.Direction;
import org.spongepowered.api.world.BlockChangeFlags;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.HashSet;
@@ -37,30 +37,30 @@ public class BlockListener {
private long lastDamagesUpdate = 0;
@Listener(order = LAST)
- public void onBlockBreak(ChangeBlockEvent.Break event, @Root Player player) {
+ public void onBlockBreak(ChangeBlockEvent.All event, @Root ServerPlayer player) {
- for (Transaction transaction : event.getTransactions()) {
- BlockSnapshot blockSnapshot = transaction.getOriginal();
+ for (BlockTransaction transaction : event.transactions()) {
+ BlockSnapshot blockSnapshot = transaction.original();
if (Settings.ProtectPilotedCrafts) {
- for (Craft craft : CraftManager.getInstance().getCraftsInWorld(blockSnapshot.getLocation().get().getExtent())) {
+ for (Craft craft : CraftManager.getInstance().getCraftsInWorld(blockSnapshot.location().get().world())) {
if (craft == null || craft.isSinking()) {
continue;
}
- if (craft.getHitBox().contains(blockSnapshot.getLocation().get().getBlockPosition())) {
+ if (craft.getHitBox().contains(blockSnapshot.location().get().blockPosition())) {
transaction.setValid(false);
- player.sendMessage(Text.of("BLOCK IS PART OF A PILOTED CRAFT"));
+ player.sendMessage(Component.text("BLOCK IS PART OF A PILOTED CRAFT"));
break;
}
}
}
if (transaction.isValid()) {
- CommanderSign.onSignBreak(event, transaction);
- CrewSign.onSignBreak(event, transaction);
+ CommanderSign.onSignBreak(transaction);
+ CrewSign.onSignBreak(transaction);
}
}
}
@@ -73,86 +73,84 @@ public void explodeEvent(ExplosionEvent.Detonate event) {
// Remove any blocks from the list that were adjacent to water, to prevent spillage
if (!Settings.DisableSpillProtection) {
- HashSet> affectedLocations = new HashSet<>(event.getAffectedLocations());
+ HashSet affectedLocations = new HashSet<>(event.affectedLocations());
- for (Location affectedLocation : affectedLocations) {
+ for (ServerLocation affectedLocation : affectedLocations) {
- for (Craft craft : CraftManager.getInstance().getCraftsInWorld(affectedLocation.getExtent())) {
+ for (Craft craft : CraftManager.getInstance().getCraftsInWorld(affectedLocation.world())) {
- if (craft == null || !craft.getHitBox().contains(affectedLocation.getBlockPosition())) {
+ if (craft == null || !craft.getHitBox().contains(affectedLocation.blockPosition())) {
continue;
}
- HashSet> blockList = new HashSet<>();
+ HashSet blockList = new HashSet<>();
- Location relativeBlockPos = affectedLocation.getBlockRelative(Direction.NORTH);
+ ServerLocation relativeBlockPos = affectedLocation.relativeToBlock(Direction.NORTH);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.WEST);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.WEST);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.EAST);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.EAST);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.SOUTH);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.SOUTH);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.UP);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.UP);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.UP).getBlockRelative(Direction.NORTH);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.UP).relativeToBlock(Direction.NORTH);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.UP).getBlockRelative(Direction.WEST);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.UP).relativeToBlock(Direction.WEST);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.UP).getBlockRelative(Direction.EAST);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.UP).relativeToBlock(Direction.EAST);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
- relativeBlockPos = affectedLocation.getBlockRelative(Direction.UP).getBlockRelative(Direction.SOUTH);
+ relativeBlockPos = affectedLocation.relativeToBlock(Direction.UP).relativeToBlock(Direction.SOUTH);
- if (craft.getHitBox().contains(relativeBlockPos.getBlockPosition())) {
+ if (craft.getHitBox().contains(relativeBlockPos.blockPosition())) {
blockList.add(relativeBlockPos);
}
//TODO: Can't seem to get Fluid Level???
// Test anti-spill
- for (Location testLoc : blockList) {
+ for (ServerLocation testLoc : blockList) {
- if (testLoc.getProperty(MatterProperty.class).get().getValue() == MatterProperty.Matter.LIQUID && testLoc.getBlock()
- .get(Keys.FLUID_LEVEL).isPresent()) {// && testLoc.get(Keys.FLUID_LEVEL).get() == 1) {
- Movecraft.getInstance().getLogger().info("Fluid Level: " + testLoc.getBlock().get(Keys.FLUID_LEVEL).get());
- testLoc.restoreSnapshot(BlockTypes.AIR.getDefaultState().snapshotFor(testLoc), true, BlockChangeFlags.ALL);
+ if (MatterTypes.LIQUID.get().equals(testLoc.get(Keys.MATTER_TYPE).get()) && testLoc.block().get(Keys.FLUID_LEVEL).isPresent()) {// && testLoc.get(Keys.FLUID_LEVEL).get() == 1) {
+ Movecraft.getInstance().getLogger().info("Fluid Level: " + testLoc.block().get(Keys.FLUID_LEVEL).get());
+ testLoc.restoreSnapshot(BlockTypes.AIR.get().defaultState().snapshotFor(testLoc), true, BlockChangeFlags.ALL);
}
- if (testLoc.getProperty(MatterProperty.class).isPresent()
- && testLoc.getProperty(MatterProperty.class).get().getValue() == MatterProperty.Matter.LIQUID) {
- event.getAffectedLocations().remove(affectedLocation);
+ if (testLoc.get(Keys.MATTER_TYPE).isPresent() && MatterTypes.LIQUID.get().equals(testLoc.get(Keys.MATTER_TYPE).get())) {
+ event.affectedLocations().remove(affectedLocation);
}
}
}
@@ -162,18 +160,28 @@ public void explodeEvent(ExplosionEvent.Detonate event) {
//TODO - fire an event that addons can listen for
@Listener(order = LAST)
- public void onBlockPlace(ChangeBlockEvent.Place event, @Root Player player) {
+ public void onBlockPlace(ChangeBlockEvent.All event, @Root ServerPlayer player) {
+
if (Settings.ProtectPilotedCrafts) {
- for (Transaction transaction : event.getTransactions()) {
- Location location = transaction.getOriginal().getLocation().orElse(null);
+ for (BlockTransaction transaction : event.transactions()) {
+
+ if (!Operations.PLACE.get().equals(transaction.operation())) {
+ continue;
+ }
+
+ ServerLocation location = transaction.original().location().orElse(null);
+
+ if (location == null) {
+ continue;
+ }
boolean foundCrafts = false;
HashSet repairingCrafts = new HashSet<>();
- for (Vector3i blockPosition : CollectionUtils.neighbors(location.getBlockPosition())) {
+ for (Vector3i blockPosition : CollectionUtils.neighbors(location.blockPosition())) {
HashSet craftsAtLocation =
- CraftManager.getInstance().getCraftsFromLocation(new Location<>(location.getExtent(), blockPosition));
+ CraftManager.getInstance().getCraftsFromLocation(ServerLocation.of(location.world(), blockPosition));
if (!craftsAtLocation.isEmpty()) {
foundCrafts = true;
@@ -181,9 +189,9 @@ public void onBlockPlace(ChangeBlockEvent.Place event, @Root Player player) {
for (Craft craft : craftsAtLocation) {
//TODO - Correct role to Repairman
- if (craft.isSinking() || !craft.getCrew().hasRole(player.getUniqueId(), CrewRoles.NextInCommand.class)
- || !craft.getType().getValue(CraftSettings.AllowedBlocks.class).get().contains(transaction.getFinal().getState().getType())
- || craft.getSize() >= craft.getType().getValue(CraftSettings.MaxSize.class).get()) {
+ if (craft.isSinking() || !craft.getCrew().hasRole(player.uniqueId(), CrewRoles.NextInCommand.class)
+ || !craft.type().getValue(CraftSettings.AllowedBlocks.class).get().contains(transaction.finalReplacement().state().type())
+ || craft.getSize() >= craft.type().getValue(CraftSettings.MaxSize.class).get()) {
continue;
}
@@ -196,7 +204,7 @@ public void onBlockPlace(ChangeBlockEvent.Place event, @Root Player player) {
if (repairingCrafts.isEmpty() && foundCrafts) {
transaction.setValid(false);
- player.sendMessage(Text.of("You are not a repairman!"));
+ player.sendMessage(Component.text("You are not a repairman!"));
} else {
@@ -209,10 +217,10 @@ public void onBlockPlace(ChangeBlockEvent.Place event, @Root Player player) {
}
if (!isProcessing) {
- repairingCrafts.removeIf(craft -> !craft.getType().getValue(CraftSettings.AllowedBlocks.class).get().contains(transaction.getFinal().getState().getType()));
- repairingCrafts.forEach(craft -> craft.getHitBox().add(location.getBlockPosition()));
+ repairingCrafts.removeIf(craft -> !craft.type().getValue(CraftSettings.AllowedBlocks.class).get().contains(transaction.finalReplacement().state().type()));
+ repairingCrafts.forEach(craft -> craft.getHitBox().add(location.blockPosition()));
} else {
- player.sendMessage(Text.of("Craft is Busy"));
+ player.sendMessage(Component.text("Craft is Busy"));
}
}
}
@@ -222,21 +230,20 @@ public void onBlockPlace(ChangeBlockEvent.Place event, @Root Player player) {
// prevent water and lava from spreading off of moving crafts
//TODO: This doesn't actually seem to work.
@Listener(order = FIRST)
- public void onBlockFromTo(ChangeBlockEvent.Modify event) {
+ public void onBlockFromTo(ChangeBlockEvent.All event) {
- if (!event.getContext().containsKey(EventContextKeys.LIQUID_FLOW)) {
- return;
- }
+ for (BlockTransaction transaction : event.transactions()) {
- for (Transaction transaction : event.getTransactions()) {
+ if (!Operations.LIQUID_SPREAD.get().equals(transaction.operation())) {
+ continue;
+ }
- if (!transaction.getOriginal().getLocation().isPresent()
- || transaction.getOriginal().getProperty(MatterProperty.class).get().getValue() != MatterProperty.Matter.LIQUID) {
+ if (transaction.original().location().isEmpty() || transaction.original().get(Keys.MATTER_TYPE).get().equals(MatterTypes.LIQUID.get())) {
continue;
}
- for (Craft craft : CraftManager.getInstance().getCraftsInWorld(transaction.getOriginal().getLocation().get().getExtent())) {
- if (craft.isProcessing() && craft.getHitBox().contains(transaction.getOriginal().getLocation().get().getBlockPosition())) {
+ for (Craft craft : CraftManager.getInstance().getCraftsInWorld(transaction.original().location().get().world())) {
+ if (craft.isProcessing() && craft.getHitBox().contains(transaction.original().location().get().blockPosition())) {
transaction.setValid(false);
return;
}
@@ -250,9 +257,9 @@ public void onBlockFromTo(ChangeBlockEvent.Modify event) {
// else if - piston retracts - remove locations from hitbox
@Listener(order = FIRST)
public void onPistonEvent(ChangeBlockEvent.Pre event) {
- if (event.getContext().containsKey(EventContextKeys.PISTON_EXTEND) || event.getContext().containsKey(EventContextKeys.PISTON_RETRACT)) {
+ if (event.context().containsKey(EventContextKeys.PISTON_EXTEND) || event.context().containsKey(EventContextKeys.PISTON_RETRACT)) {
- for (Location worldLocation : event.getLocations()) {
+ for (ServerLocation worldLocation : event.locations()) {
HashSet crafts = CraftManager.getInstance().getCraftsFromLocation(worldLocation);
diff --git a/src/main/java/io/github/pulverizer/movecraft/listener/InteractListener.java b/src/main/java/io/github/pulverizer/movecraft/listener/InteractListener.java
index 6de0543dc..5899670d9 100644
--- a/src/main/java/io/github/pulverizer/movecraft/listener/InteractListener.java
+++ b/src/main/java/io/github/pulverizer/movecraft/listener/InteractListener.java
@@ -1,6 +1,8 @@
package io.github.pulverizer.movecraft.listener;
-import com.flowpowered.math.vector.Vector3i;
+import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.Craft;
@@ -9,69 +11,70 @@
import io.github.pulverizer.movecraft.enums.DirectControlMode;
import io.github.pulverizer.movecraft.utils.MathUtils;
import org.spongepowered.api.block.BlockSnapshot;
-import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.data.key.Keys;
+import org.spongepowered.api.data.Keys;
import org.spongepowered.api.data.type.HandTypes;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.block.InteractBlockEvent;
import org.spongepowered.api.event.filter.cause.Root;
import org.spongepowered.api.event.filter.type.Include;
import org.spongepowered.api.event.item.inventory.InteractItemEvent;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
import org.spongepowered.api.world.BlockChangeFlags;
public final class InteractListener {
@Listener
- public final void onPlayerInteractPrimary(InteractBlockEvent.Primary event, @Root Player player) {
+ public final void onPlayerInteractPrimary(InteractBlockEvent.Primary event, @Root ServerPlayer player) {
- BlockSnapshot block = event.getTargetBlock();
- if (!block.getState().getType().equals(BlockTypes.WOODEN_BUTTON) && !block.getState().getType().equals(BlockTypes.STONE_BUTTON)) {
+ BlockSnapshot block = event.block();
+ if (!BlockTypeTags.BUTTONS.get().contains(block.state().type())) {
return;
}
- // if they left click a button which is pressed, unpress it
- if (block.get(Keys.POWERED).orElse(false)) {
- block = block.with(Keys.POWERED, false).get();
- block.getLocation().get().restoreSnapshot(block, true, BlockChangeFlags.ALL);
+
+ // if they left-click a button which is pressed, unpress it
+ if (block.get(Keys.IS_POWERED).orElse(false)) {
+ block = block.with(Keys.IS_POWERED, false).get();
+ block.location().get().restoreSnapshot(block, true, BlockChangeFlags.ALL);
}
}
@Listener
- @Include({InteractItemEvent.Primary.class, InteractItemEvent.Secondary.MainHand.class})
- public void onPlayerInteractStick(InteractItemEvent event, @Root Player player) {
+ @Include({InteractItemEvent.Primary.class, InteractItemEvent.Secondary.class})
+ public void onPlayerInteractStick(InteractItemEvent event, @Root ServerPlayer player) {
+
+ ItemStack heldItemStack = player.itemInHand(HandTypes.MAIN_HAND);
- if (!player.getItemInHand(HandTypes.MAIN_HAND).isPresent() || !player.getItemInHand(HandTypes.MAIN_HAND).get().getType()
- .equals(Settings.PilotTool)) {
+ if (heldItemStack.isEmpty() || !heldItemStack.type().equals(Settings.PilotTool)) {
return;
}
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
// if not in command of craft, don't process pilot tool clicks
if (craft == null) {
return;
}
- if (!craft.getCrew().hasRole(player.getUniqueId(), CrewRoles.Pilot.class)) {
- player.sendMessage(Text.of("You are not the pilot of the craft."));
+ if (!craft.getCrew().hasRole(player.uniqueId(), CrewRoles.Pilot.class)) {
+ player.sendMessage(Component.text("You are not the pilot of the craft."));
return;
}
- if (event instanceof InteractItemEvent.Secondary) {
- event.setCancelled(true);
+ if (event instanceof InteractItemEvent.Secondary secondary) {
+ secondary.setCancelled(true);
if (!craft.hasCooldownExpired()) {
return;
}
- if (!MathUtils.locationNearHitBox(craft.getHitBox(), player.getPosition(), 2)) {
+ if (!MathUtils.locationNearHitBox(craft.getHitBox(), player.position(), 2)) {
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".movement.move")) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".movement.move")) {
+ player.sendMessage(Component.text("Insufficient Permissions"));
return;
}
@@ -86,8 +89,8 @@ public void onPlayerInteractStick(InteractItemEvent event, @Root Player player)
} else {
- // Player is onboard craft and right clicking
- float rotation = (float) Math.PI * (float) player.getRotation().getY() / 180f;
+ // ServerPlayer is onboard craft and right-clicking
+ float rotation = (float) Math.PI * (float) player.rotation().y() / 180f;
float nx = -(float) Math.sin(rotation);
float nz = (float) Math.cos(rotation);
@@ -96,11 +99,11 @@ public void onPlayerInteractStick(InteractItemEvent event, @Root Player player)
int dz = (Math.abs(nz) > 0.5 ? 1 : 0) * (int) Math.signum(nz);
int dy;
- float p = (float) player.getRotation().getX();
+ float p = (float) player.rotation().x();
dy = -(Math.abs(p) >= 25 ? 1 : 0) * (int) Math.signum(p);
- if (Math.abs(player.getRotation().getX()) >= 75) {
+ if (Math.abs(player.rotation().x()) >= 75) {
dx = 0;
dz = 0;
}
@@ -115,14 +118,15 @@ public void onPlayerInteractStick(InteractItemEvent event, @Root Player player)
if (craft.getDirectControlMode() == DirectControlMode.B) {
craft.setDirectControl(DirectControlMode.OFF);
- player.sendMessage(Text.of("Leaving Direct Control Mode"));
- event.setCancelled(true);
+ player.sendMessage(Component.text("Leaving Direct Control Mode"));
+ // TODO - Can't cancel event in API 8 - Why were we doing this?
+ //event.setCancelled(true);
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".movement.move") || !craft
- .getType().getValue(CraftSettings.CanDirectControl.class).get()) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".movement.move") || !craft
+ .type().getValue(CraftSettings.CanDirectControl.class).get()) {
+ player.sendMessage(Component.text("Insufficient Permissions"));
return;
}
@@ -134,8 +138,9 @@ public void onPlayerInteractStick(InteractItemEvent event, @Root Player player)
}
craft.setDirectControl(mode);
- player.sendMessage(Text.of("Entering Direct Control Mode " + mode));
- event.setCancelled(true);
+ player.sendMessage(Component.text("Entering Direct Control Mode " + mode));
+ // TODO - Can't cancel event in API 8 - Why were we doing this?
+ //event.setCancelled(true);
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/listener/PlayerListener.java b/src/main/java/io/github/pulverizer/movecraft/listener/PlayerListener.java
index 347338315..fd418f710 100644
--- a/src/main/java/io/github/pulverizer/movecraft/listener/PlayerListener.java
+++ b/src/main/java/io/github/pulverizer/movecraft/listener/PlayerListener.java
@@ -1,6 +1,10 @@
package io.github.pulverizer.movecraft.listener;
-import com.flowpowered.math.vector.Vector3d;
+import org.spongepowered.api.event.EventContextKeys;
+import org.spongepowered.api.event.cause.entity.MovementType;
+import org.spongepowered.api.event.cause.entity.MovementTypes;
+import org.spongepowered.api.event.network.ServerSideConnectionEvent;
+import org.spongepowered.math.vector.Vector3d;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.Craft;
@@ -8,17 +12,17 @@
import io.github.pulverizer.movecraft.config.CrewRoles;
import io.github.pulverizer.movecraft.enums.DirectControlMode;
import io.github.pulverizer.movecraft.utils.MathUtils;
-import org.spongepowered.api.data.key.Keys;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.entity.DestructEntityEvent;
import org.spongepowered.api.event.entity.MoveEntityEvent;
import org.spongepowered.api.event.filter.Getter;
import org.spongepowered.api.event.filter.cause.Root;
-import org.spongepowered.api.event.network.ClientConnectionEvent;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
import java.util.Map;
+import java.util.Optional;
import java.util.WeakHashMap;
public class PlayerListener {
@@ -26,12 +30,12 @@ public class PlayerListener {
private final Map timeToReleaseAfter = new WeakHashMap<>();
@Listener
- public void onPLayerLogout(ClientConnectionEvent.Disconnect event, @Getter("getTargetEntity") Player player) {
+ public void onPLayerLogout(ServerSideConnectionEvent.Disconnect event, @Getter("player") ServerPlayer player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft != null) {
- craft.getCrew().remove(player.getUniqueId());
+ craft.getCrew().remove(player.uniqueId());
if (craft.getCrew().isEmpty()) {
craft.release(player);
@@ -41,12 +45,12 @@ public void onPLayerLogout(ClientConnectionEvent.Disconnect event, @Getter("getT
@Listener
- public void onPlayerDeath(DestructEntityEvent.Death event, @Getter("getTargetEntity") Player player) {
+ public void onPlayerDeath(DestructEntityEvent.Death event, @Getter("entity") ServerPlayer player) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft != null) {
- craft.getCrew().remove(player.getUniqueId());
+ craft.getCrew().remove(player.uniqueId());
if (craft.getCrew().isEmpty()) {
craft.release(player);
@@ -56,59 +60,62 @@ public void onPlayerDeath(DestructEntityEvent.Death event, @Getter("getTargetEnt
//TODO - Needs major rework to be compatible with crews
@Listener
- public void onPlayerMove(MoveEntityEvent event, @Root Player player) {
- final Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ public void onPlayerMove(MoveEntityEvent event, @Root ServerPlayer player) {
+ final Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
if (craft == null) {
return;
}
- if (!(event instanceof MoveEntityEvent.Teleport)
- && craft.getDirectControlMode() == DirectControlMode.A
- && craft.getCrew().hasRole(player.getUniqueId(), CrewRoles.Pilot.class)) {
+ Optional contextOptional = event.context().get(EventContextKeys.MOVEMENT_TYPE);
- event.setCancelled(true);
+ if (contextOptional.isPresent() && contextOptional.get().equals(MovementTypes.NATURAL.get())) {
- if (!craft.hasCooldownExpired()) {
- return;
- }
+ if (craft.getDirectControlMode() == DirectControlMode.A && craft.getCrew().hasRole(player.uniqueId(), CrewRoles.Pilot.class)) {
- Vector3d playerDisplacement = event.getToTransform().getPosition().sub(event.getFromTransform().getPosition());
+ event.setCancelled(true);
- if (playerDisplacement.getY() > 0) {
- playerDisplacement = new Vector3d(playerDisplacement.getX(), 1, playerDisplacement.getZ());
- }
+ if (!craft.hasCooldownExpired()) {
+ return;
+ }
- if (player.get(Keys.IS_SNEAKING).get()) {
- playerDisplacement = new Vector3d(playerDisplacement.getX(), -1, playerDisplacement.getZ());
- }
+ Vector3d playerDisplacement = event.originalDestinationPosition().sub(event.originalPosition());
- playerDisplacement = playerDisplacement.normalize();
- playerDisplacement = playerDisplacement.mul(craft.getType().getValue(CraftSettings.CruiseSkipBlocks.class).get());
+ if (playerDisplacement.y() > 0) {
+ playerDisplacement = new Vector3d(playerDisplacement.x(), 1, playerDisplacement.z());
+ }
- craft.translate(playerDisplacement.toInt());
- return;
+ if (player.get(Keys.IS_SNEAKING).get()) {
+ playerDisplacement = new Vector3d(playerDisplacement.x(), -1, playerDisplacement.z());
+ }
+
+ playerDisplacement = playerDisplacement.normalize();
+ playerDisplacement = playerDisplacement.mul(craft.type().getValue(CraftSettings.CruiseSkipBlocks.class).get());
+
+ craft.translate(playerDisplacement.toInt());
+ return;
+ }
}
- if (MathUtils.locationNearHitBox(craft.getHitBox(), player.getPosition(), 2)) {
+ if (MathUtils.locationNearHitBox(craft.getHitBox(), player.position(), 2)) {
timeToReleaseAfter.remove(craft);
return;
}
if (timeToReleaseAfter.containsKey(craft) && timeToReleaseAfter.get(craft) < System.currentTimeMillis()) {
- craft.getCrew().remove(player.getUniqueId());
+ craft.getCrew().remove(player.uniqueId());
timeToReleaseAfter.remove(craft);
return;
}
- if (!craft.isProcessing() && craft.getType().getValue(CraftSettings.MoveEntities.class).get() && !timeToReleaseAfter.containsKey(craft)) {
+ if (!craft.isProcessing() && craft.type().getValue(CraftSettings.MoveEntities.class).get() && !timeToReleaseAfter.containsKey(craft)) {
if (Settings.ManOverboardTimeout != 0) {
- player.sendMessage(Text.of("You have left your craft.")); //TODO: Re-add /manoverboard
+ player.sendMessage(Component.text("You have left your craft.")); //TODO: Re-add /manoverboard
} else {
- player.sendMessage(Text.of("You have released your craft."));
+ player.sendMessage(Component.text("You have released your craft."));
}
if (craft.getHitBox().size() > 11000) {
- player.sendMessage(Text.of("Craft is too big to check its borders. Make sure this area is safe to release your craft in."));
+ player.sendMessage(Component.text("Craft is too big to check its borders. Make sure this area is safe to release your craft in."));
}
timeToReleaseAfter.put(craft, System.currentTimeMillis() + 30000); //30 seconds to release
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/listener/SignListener.java b/src/main/java/io/github/pulverizer/movecraft/listener/SignListener.java
index 789e6d38c..50d26ee05 100644
--- a/src/main/java/io/github/pulverizer/movecraft/listener/SignListener.java
+++ b/src/main/java/io/github/pulverizer/movecraft/listener/SignListener.java
@@ -22,25 +22,26 @@
import io.github.pulverizer.movecraft.sign.SubcraftRotateSign;
import io.github.pulverizer.movecraft.sign.TeleportSign;
import io.github.pulverizer.movecraft.utils.HashHitBox;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.spongepowered.api.block.BlockSnapshot;
-import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.block.tileentity.Sign;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.block.entity.Sign;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.block.InteractBlockEvent;
-import org.spongepowered.api.event.block.tileentity.ChangeSignEvent;
+import org.spongepowered.api.event.block.entity.ChangeSignEvent;
import org.spongepowered.api.event.filter.cause.Root;
import org.spongepowered.api.event.filter.type.Include;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.world.server.ServerWorld;
public class SignListener {
@Listener
- @Include({InteractBlockEvent.Primary.class, InteractBlockEvent.Secondary.MainHand.class})
- public final void onSignClick(InteractBlockEvent event, @Root Player player) {
+ @Include({InteractBlockEvent.Primary.class, InteractBlockEvent.Secondary.class})
+ public final void onSignClick(InteractBlockEvent event, @Root ServerPlayer player) {
- BlockSnapshot block = event.getTargetBlock();
- if (block.getState().getType() != BlockTypes.STANDING_SIGN && block.getState().getType() != BlockTypes.WALL_SIGN) {
+ BlockSnapshot block = event.block();
+ if (!BlockTypeTags.SIGNS.get().contains(block.state().type())) {
return;
}
@@ -49,9 +50,7 @@ public final void onSignClick(InteractBlockEvent event, @Root Player player) {
RemoteSign.onSignClick(event, player, block);
SubcraftRotateSign.onSignClick(event, player, block);
- if (event instanceof InteractBlockEvent.Secondary.MainHand) {
-
- InteractBlockEvent.Secondary.MainHand rightClickEvent = (InteractBlockEvent.Secondary.MainHand) event;
+ if (event instanceof InteractBlockEvent.Secondary rightClickEvent) {
AscendSign.onSignClick(rightClickEvent, player, block);
CraftSign.onSignClick(rightClickEvent, player, block);
@@ -68,7 +67,7 @@ public final void onSignClick(InteractBlockEvent event, @Root Player player) {
@Listener
public final void craftDetection(CraftDetectEvent event) {
- World world = event.getCraft().getWorld();
+ ServerWorld world = event.getCraft().getWorld();
HashHitBox hitBox = event.getCraft().getHitBox();
StatusSign.onCraftDetect(event, world, hitBox);
@@ -81,9 +80,9 @@ public final void craftDetection(CraftDetectEvent event) {
}
@Listener
- public final void onSignChange(ChangeSignEvent event, @Root Player player) {
+ public final void onSignChange(ChangeSignEvent event, @Root ServerPlayer player) {
- String header = event.getText().lines().get(0).toPlain().toLowerCase();
+ String header = PlainTextComponentSerializer.plainText().serialize(event.text().get(0)).toLowerCase();
switch (header) {
@@ -163,18 +162,18 @@ public final void onSignTranslate(SignTranslateEvent event) {
Craft craft = event.getCraft();
- if (!event.getWorld().getTileEntity(event.getBlockPosition()).isPresent()) {
+ if (event.getWorld().blockEntity(event.blockPosition()).isEmpty()) {
return;
}
- Sign sign = (Sign) event.getWorld().getTileEntity(event.getBlockPosition()).get();
+ Sign sign = (Sign) event.getWorld().blockEntity(event.blockPosition()).get();
- String header = sign.lines().get(0).toPlain().toLowerCase();
+ String header = PlainTextComponentSerializer.plainText().serialize(sign.lines().get(0)).toLowerCase();
switch (header) {
case "crew:":
- CrewSign.onSignTranslate(event.getWorld(), event.getBlockPosition(), sign);
+ CrewSign.onSignTranslate(event.getWorld(), event.blockPosition(), sign);
break;
case "status:":
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/MapUpdateManager.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/MapUpdateManager.java
index 964d6ccee..b23e148ce 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/MapUpdateManager.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/MapUpdateManager.java
@@ -3,7 +3,7 @@
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.map_updater.update.UpdateCommand;
import org.spongepowered.api.Sponge;
-import org.spongepowered.api.text.Text;
+import net.kyori.adventure.text.Component;
import java.util.Collection;
import java.util.Collections;
@@ -46,7 +46,7 @@ public void run() {
if (Settings.Debug) {
long endTime = System.currentTimeMillis();
- Sponge.getServer().getBroadcastChannel().send(Text.of("Map update took (ms): " + (endTime - startTime)));
+ Sponge.server().broadcastAudience().sendMessage(Component.text("Map update took (ms): " + (endTime - startTime)));
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/BlockCreateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/BlockCreateCommand.java
index 02fdf11ea..590c9cef5 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/BlockCreateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/BlockCreateCommand.java
@@ -1,11 +1,11 @@
package io.github.pulverizer.movecraft.map_updater.update;
-import com.flowpowered.math.vector.Vector3i;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.world.BlockChangeFlags;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.Objects;
@@ -14,18 +14,18 @@ public class BlockCreateCommand extends UpdateCommand {
final private Vector3i newBlockLocation;
final private BlockSnapshot block;
- final private World world;
+ final private ServerWorld world;
- public BlockCreateCommand(World world, Vector3i newBlockLocation, BlockSnapshot block) {
+ public BlockCreateCommand(ServerWorld world, Vector3i newBlockLocation, BlockSnapshot block) {
this.newBlockLocation = newBlockLocation;
- this.block = block.withLocation(new Location<>(world, newBlockLocation));
+ this.block = block.withLocation(ServerLocation.of(world, newBlockLocation));
this.world = world;
}
- public BlockCreateCommand(World world, Vector3i newBlockLocation, BlockType block) {
+ public BlockCreateCommand(ServerWorld world, Vector3i newBlockLocation, BlockType block) {
this.newBlockLocation = newBlockLocation;
- this.block = block.getDefaultState().snapshotFor(new Location<>(world, newBlockLocation));
+ this.block = block.defaultState().snapshotFor(ServerLocation.of(world, newBlockLocation));
this.world = world;
}
@@ -38,7 +38,7 @@ public void doUpdate() {
@Override
public int hashCode() {
- return Objects.hash(newBlockLocation, block, world.getUniqueId());
+ return Objects.hash(newBlockLocation, block, world.uniqueId());
}
@Override
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftRotateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftRotateCommand.java
index 8209b4a16..4c1b1b55c 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftRotateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftRotateCommand.java
@@ -1,6 +1,8 @@
package io.github.pulverizer.movecraft.map_updater.update;
-import com.flowpowered.math.vector.Vector3i;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -13,14 +15,13 @@
import io.github.pulverizer.movecraft.utils.MutableHitBox;
import io.github.pulverizer.movecraft.utils.SolidHitBox;
import io.github.pulverizer.movecraft.world.ChunkDataManager;
-import org.slf4j.Logger;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.util.Direction;
import org.spongepowered.api.world.BlockChangeFlags;
-import org.spongepowered.api.world.Location;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.HashSet;
import java.util.LinkedList;
@@ -54,15 +55,12 @@ public void doUpdate() {
return;
}
- final Set passthroughBlocks = new HashSet<>(craft.getType().getValue(CraftSettings.PassthroughBlocks.class).get());
+ final Set passthroughBlocks = new HashSet<>(craft.type().getValue(CraftSettings.PassthroughBlocks.class).get());
if (craft.isSinking()) {
- passthroughBlocks.add(BlockTypes.WATER);
- passthroughBlocks.add(BlockTypes.FLOWING_WATER);
- passthroughBlocks.add(BlockTypes.LEAVES);
- passthroughBlocks.add(BlockTypes.LEAVES2);
- passthroughBlocks.add(BlockTypes.GRASS);
- passthroughBlocks.add(BlockTypes.TALLGRASS);
- passthroughBlocks.add(BlockTypes.DOUBLE_PLANT);
+ passthroughBlocks.add(BlockTypes.WATER.get());
+ passthroughBlocks.addAll(BlockTypeTags.LEAVES.get().values());
+ passthroughBlocks.add(BlockTypes.GRASS.get());
+ passthroughBlocks.add(BlockTypes.TALL_GRASS.get());
}
if (!passthroughBlocks.isEmpty()) {
@@ -72,7 +70,7 @@ public void doUpdate() {
for (Vector3i location : to) {
BlockSnapshot material = craft.getWorld().createSnapshot(location);
- if (passthroughBlocks.contains(material.getState().getType())) {
+ if (passthroughBlocks.contains(material.state().type())) {
craft.getPhasedBlocks().add(material);
}
}
@@ -127,7 +125,7 @@ public void doUpdate() {
for (Vector3i location : CollectionUtils.filter(invertedHitBox, exterior)) {
BlockSnapshot block = craft.getWorld().createSnapshot(location);
- if (!passthroughBlocks.contains(block.getState().getType())) {
+ if (!passthroughBlocks.contains(block.state().type())) {
continue;
}
craft.getPhasedBlocks().add(block);
@@ -139,9 +137,9 @@ public void doUpdate() {
//trigger sign event
for (Vector3i location : craft.getHitBox()) {
- BlockType blockType = craft.getWorld().getBlockType(location);
- if (blockType == BlockTypes.WALL_SIGN || blockType == BlockTypes.STANDING_SIGN) {
- Sponge.getEventManager().post(new SignTranslateEvent(location, craft));
+ BlockType blockType = craft.getWorld().block(location).type();
+ if (BlockTypeTags.SIGNS.get().contains(blockType)) {
+ Sponge.eventManager().post(new SignTranslateEvent(location, craft));
}
}
@@ -149,8 +147,8 @@ public void doUpdate() {
final HashSet phasedBlocks = new HashSet<>(craft.getPhasedBlocks());
for (BlockSnapshot block : phasedBlocks) {
- if (exterior.contains(block.getPosition())
- || (originalLocations.contains(block.getPosition()) && !newHitBox.contains(block.getPosition()))) {
+ if (exterior.contains(block.position())
+ || (originalLocations.contains(block.position()) && !newHitBox.contains(block.position()))) {
craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
@@ -159,10 +157,10 @@ public void doUpdate() {
for (Vector3i location : interior) {
final BlockSnapshot material = craft.getWorld().createSnapshot(location);
- if (passthroughBlocks.contains(material.getState().getType())) {
+ if (passthroughBlocks.contains(material.state().type())) {
craft.getPhasedBlocks().add(material);
craft.getWorld()
- .restoreSnapshot(location, BlockTypes.AIR.getDefaultState().snapshotFor(new Location<>(craft.getWorld(), location)), true,
+ .restoreSnapshot(location, BlockTypes.AIR.get().defaultState().snapshotFor(ServerLocation.of(craft.getWorld(), location)), true,
BlockChangeFlags.NONE);
}
@@ -174,9 +172,9 @@ public void doUpdate() {
//trigger sign event
for (Vector3i location : craft.getHitBox()) {
- BlockType blockType = craft.getWorld().getBlockType(location);
- if (blockType == BlockTypes.WALL_SIGN || blockType == BlockTypes.STANDING_SIGN) {
- Sponge.getEventManager().post(new SignTranslateEvent(location, craft));
+ BlockType blockType = craft.getWorld().block(location).type();
+ if (BlockTypeTags.SIGNS.get().contains(blockType)) {
+ Sponge.eventManager().post(new SignTranslateEvent(location, craft));
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftTranslateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftTranslateCommand.java
index 57e246461..48c19ed78 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftTranslateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/CraftTranslateCommand.java
@@ -1,6 +1,9 @@
package io.github.pulverizer.movecraft.map_updater.update;
-import com.flowpowered.math.vector.Vector3i;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.Movecraft;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
@@ -12,14 +15,12 @@
import io.github.pulverizer.movecraft.utils.MutableHitBox;
import io.github.pulverizer.movecraft.utils.SolidHitBox;
import io.github.pulverizer.movecraft.world.ChunkDataManager;
-import org.slf4j.Logger;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.block.BlockSnapshot;
import org.spongepowered.api.block.BlockType;
import org.spongepowered.api.block.BlockTypes;
import org.spongepowered.api.world.BlockChangeFlags;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.HashSet;
import java.util.LinkedList;
@@ -32,7 +33,7 @@ public class CraftTranslateCommand extends UpdateCommand {
private final Craft craft;
private final Vector3i displacement;
private final HashHitBox newHitBox;
- private final World world;
+ private final ServerWorld world;
public CraftTranslateCommand(Craft craft, Vector3i displacement, HashHitBox newHitBox) {
@@ -55,15 +56,12 @@ public void doUpdate() {
return;
}
- final Set passthroughBlocks = new HashSet<>(craft.getType().getValue(CraftSettings.PassthroughBlocks.class).get());
+ final Set passthroughBlocks = new HashSet<>(craft.type().getValue(CraftSettings.PassthroughBlocks.class).get());
if (craft.isSinking()) {
- passthroughBlocks.add(BlockTypes.WATER);
- passthroughBlocks.add(BlockTypes.FLOWING_WATER);
- passthroughBlocks.add(BlockTypes.LEAVES);
- passthroughBlocks.add(BlockTypes.LEAVES2);
- passthroughBlocks.add(BlockTypes.GRASS);
- passthroughBlocks.add(BlockTypes.TALLGRASS);
- passthroughBlocks.add(BlockTypes.DOUBLE_PLANT);
+ passthroughBlocks.add(BlockTypes.WATER.get());
+ passthroughBlocks.addAll(BlockTypeTags.LEAVES.get().values());
+ passthroughBlocks.add(BlockTypes.GRASS.get());
+ passthroughBlocks.add(BlockTypes.TALL_GRASS.get());
}
if (!passthroughBlocks.isEmpty() && !newHitBox.isEmpty()) {
@@ -73,7 +71,7 @@ public void doUpdate() {
final HitBox to = CollectionUtils.filter(newHitBox, originalLocations);
for (Vector3i location : to) {
BlockSnapshot material = craft.getWorld().createSnapshot(location);
- if (passthroughBlocks.contains(material.getState().getType())) {
+ if (passthroughBlocks.contains(material.state().type())) {
craft.getPhasedBlocks().add(material);
}
}
@@ -134,7 +132,7 @@ public void doUpdate() {
for (Vector3i location : CollectionUtils.filter(invertedHitBox, exterior)) {
BlockSnapshot material = craft.getWorld().createSnapshot(location);
- if (passthroughBlocks.contains(material.getState().getType())) {
+ if (passthroughBlocks.contains(material.state().type())) {
craft.getPhasedBlocks().add(material);
}
}
@@ -149,8 +147,8 @@ public void doUpdate() {
//trigger sign event
for (Vector3i location : craft.getHitBox()) {
BlockSnapshot block = craft.getWorld().createSnapshot(location);
- if (block.getState().getType() == BlockTypes.WALL_SIGN || block.getState().getType() == BlockTypes.STANDING_SIGN) {
- Sponge.getEventManager().post(new SignTranslateEvent(block.getPosition(), craft));
+ if (BlockTypeTags.SIGNS.get().contains(block.state().type())) {
+ Sponge.eventManager().post(new SignTranslateEvent(block.position(), craft));
}
}
@@ -158,8 +156,8 @@ public void doUpdate() {
final HashSet phasedBlocks = new HashSet<>(craft.getPhasedBlocks());
for (BlockSnapshot block : phasedBlocks) {
- if (exterior.contains(block.getPosition())
- || (originalLocations.contains(block.getPosition()) && !newHitBox.contains(block.getPosition()))) {
+ if (exterior.contains(block.position())
+ || (originalLocations.contains(block.position()) && !newHitBox.contains(block.position()))) {
craft.getWorld().restoreSnapshot(block, true, BlockChangeFlags.NONE);
craft.getPhasedBlocks().remove(block);
@@ -168,10 +166,10 @@ public void doUpdate() {
for (Vector3i location : interior) {
final BlockSnapshot material = craft.getWorld().createSnapshot(location);
- if (passthroughBlocks.contains(material.getState().getType())) {
+ if (passthroughBlocks.contains(material.state().type())) {
craft.getPhasedBlocks().add(material);
craft.getWorld()
- .restoreSnapshot(location, BlockTypes.AIR.getDefaultState().snapshotFor(new Location<>(craft.getWorld(), location)), true,
+ .restoreSnapshot(location, BlockTypes.AIR.get().defaultState().snapshotFor(ServerLocation.of(craft.getWorld(), location)), true,
BlockChangeFlags.NONE);
}
@@ -187,8 +185,8 @@ public void doUpdate() {
//trigger sign event
for (Vector3i location : craft.getHitBox()) {
- if (world.getBlockType(location) == BlockTypes.WALL_SIGN || world.getBlockType(location) == BlockTypes.STANDING_SIGN) {
- Sponge.getEventManager().post(new SignTranslateEvent(location, craft));
+ if (BlockTypeTags.SIGNS.get().contains(world.block(location).type())) {
+ Sponge.eventManager().post(new SignTranslateEvent(location, craft));
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/EntityUpdateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/EntityUpdateCommand.java
index 2aed27306..b6d3adb18 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/EntityUpdateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/EntityUpdateCommand.java
@@ -1,6 +1,6 @@
package io.github.pulverizer.movecraft.map_updater.update;
-import com.flowpowered.math.vector.Vector3d;
+import org.spongepowered.math.vector.Vector3d;
import io.github.pulverizer.movecraft.utils.WorldUtils;
import org.spongepowered.api.entity.Entity;
@@ -33,15 +33,14 @@ public void doUpdate() {
@Override
public int hashCode() {
- return Objects.hash(entity.getUniqueId(), newLocation, yaw);
+ return Objects.hash(entity.uniqueId(), newLocation, yaw);
}
@Override
public boolean equals(Object obj) {
- if (!(obj instanceof EntityUpdateCommand)) {
+ if (!(obj instanceof EntityUpdateCommand other)) {
return false;
}
- EntityUpdateCommand other = (EntityUpdateCommand) obj;
return this.newLocation == other.newLocation &&
this.yaw == other.yaw &&
this.entity.equals(other.entity);
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ExplosionUpdateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ExplosionUpdateCommand.java
index 0e8a2b634..76be3be9e 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ExplosionUpdateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ExplosionUpdateCommand.java
@@ -1,26 +1,26 @@
package io.github.pulverizer.movecraft.map_updater.update;
-import com.flowpowered.math.vector.Vector3i;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
+import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.api.world.explosion.Explosion;
import java.util.Objects;
public class ExplosionUpdateCommand extends UpdateCommand {
- private final Location explosionLocation;
+ private final ServerLocation explosionLocation;
private final float explosionStrength;
- public ExplosionUpdateCommand(World world, Vector3i location, float explosionStrength) throws IllegalArgumentException {
+ public ExplosionUpdateCommand(ServerWorld world, Vector3i location, float explosionStrength) throws IllegalArgumentException {
if (explosionStrength < 0) {
throw new IllegalArgumentException("Explosion strength cannot be negative");
}
- this.explosionLocation = new Location<>(world, location);
+ this.explosionLocation = ServerLocation.of(world, location);
this.explosionStrength = explosionStrength;
}
- public Location getLocation() {
+ public ServerLocation getLocation() {
return explosionLocation;
}
@@ -30,10 +30,10 @@ public float getStrength() {
@Override
public void doUpdate() {
- explosionLocation.getExtent().triggerExplosion(this.createExplosion(explosionLocation.add(.5, .5, .5), explosionStrength));
+ explosionLocation.world().triggerExplosion(this.createExplosion(explosionLocation.add(.5, .5, .5), explosionStrength));
}
- private Explosion createExplosion(Location loc, float explosionPower) {
+ private Explosion createExplosion(ServerLocation loc, float explosionPower) {
// TODO - make defaults
return Explosion.builder()
@@ -56,10 +56,9 @@ public int hashCode() {
@Override
public boolean equals(Object obj) {
- if (!(obj instanceof ExplosionUpdateCommand)) {
+ if (!(obj instanceof ExplosionUpdateCommand other)) {
return false;
}
- ExplosionUpdateCommand other = (ExplosionUpdateCommand) obj;
return this.explosionLocation.equals(other.explosionLocation) &&
this.explosionStrength == other.explosionStrength;
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ItemDropUpdateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ItemDropUpdateCommand.java
index 79fbfba3e..1ab56c0a4 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ItemDropUpdateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ItemDropUpdateCommand.java
@@ -1,24 +1,28 @@
package io.github.pulverizer.movecraft.map_updater.update;
import io.github.pulverizer.movecraft.Movecraft;
-import org.spongepowered.api.data.key.Keys;
+import org.spongepowered.api.Sponge;
+import org.spongepowered.api.data.Keys;
import org.spongepowered.api.entity.Entity;
import org.spongepowered.api.entity.EntityTypes;
import org.spongepowered.api.item.inventory.ItemStack;
import org.spongepowered.api.scheduler.Task;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.util.Ticks;
+import org.spongepowered.api.world.server.ServerLocation;
+import org.spongepowered.api.world.server.ServerWorld;
import java.util.Objects;
-/** Class that stores the data about a item drops to the map in an unspecified world. The world is retrieved contextually from the submitting
- * craft. */
+/**
+ * Class that stores the data about a item drops to the map in an unspecified world. The world is retrieved contextually from the submitting
+ * craft.
+ */
public class ItemDropUpdateCommand extends UpdateCommand {
- private final Location location;
+ private final ServerLocation location;
private final ItemStack itemStack;
- public ItemDropUpdateCommand(Location location, ItemStack itemStack) {
+ public ItemDropUpdateCommand(ServerLocation location, ItemStack itemStack) {
this.location = location;
this.itemStack = itemStack;
}
@@ -27,23 +31,25 @@ public ItemStack getItemStack() {
return itemStack;
}
- public Location getLocation() {
+ public ServerLocation getLocation() {
return location;
}
@Override
public void doUpdate() {
if (itemStack != null) {
- final World world = location.getExtent();
+ final ServerWorld world = location.world();
// drop Item
- Task.builder()
- .delayTicks(20)
- .execute(() -> {
- Entity entity = world.createEntityNaturally(EntityTypes.ITEM, ItemDropUpdateCommand.this.location.getPosition());
- entity.offer(Keys.REPRESENTED_ITEM, itemStack.createSnapshot());
- world.spawnEntity(entity);
- })
- .submit(Movecraft.getInstance());
+ Sponge.server().scheduler().submit(
+ Task.builder()
+ .delay(Ticks.of(20))
+ .execute(() -> {
+ Entity entity = world.createEntityNaturally(EntityTypes.ITEM, ItemDropUpdateCommand.this.location.position());
+ entity.offer(Keys.ITEM_STACK_SNAPSHOT, itemStack.createSnapshot());
+ world.spawnEntity(entity);
+ })
+ .build()
+ );
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ParticleUpdateCommand.java b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ParticleUpdateCommand.java
index dc2f6eda5..fde71faa2 100644
--- a/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ParticleUpdateCommand.java
+++ b/src/main/java/io/github/pulverizer/movecraft/map_updater/update/ParticleUpdateCommand.java
@@ -5,20 +5,19 @@
import org.spongepowered.api.effect.particle.ParticleType;
import org.spongepowered.api.effect.particle.ParticleTypes;
import org.spongepowered.api.entity.Entity;
-import org.spongepowered.api.entity.living.player.Player;
-import org.spongepowered.api.world.Location;
-import org.spongepowered.api.world.World;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.world.server.ServerLocation;
import java.util.Random;
public class ParticleUpdateCommand extends UpdateCommand {
- private final Location location;
+ private final ServerLocation location;
private final ParticleType particleType;
private final int quantity;
private final Random rand = new Random();
- public ParticleUpdateCommand(Location location, ParticleType particleType, int quantity) {
+ public ParticleUpdateCommand(ServerLocation location, ParticleType particleType, int quantity) {
this.location = location;
this.particleType = particleType;
this.quantity = quantity;
@@ -27,7 +26,7 @@ public ParticleUpdateCommand(Location location, ParticleType particleType
@Override
public void doUpdate() {
// put in smoke
- location.getExtent().spawnParticles(ParticleEffect.builder().type(particleType).quantity(quantity).build(), location.getPosition());
+ location.world().spawnParticles(ParticleEffect.builder().type(particleType).quantity(quantity).build(), location.position());
//if (Settings.SilhouetteViewDistance > 0) {
// sendSilhouetteToPlayers();
@@ -40,15 +39,13 @@ private void sendSilhouetteToPlayers() {
ParticleEffect particle = ParticleEffect.builder().type(ParticleTypes.HAPPY_VILLAGER).build();
- for (Entity entity : location.getExtent().getEntities(
- entity -> entity instanceof Player)) { // this is necessary because signs do not get updated client side correctly without
- // refreshing the chunks, which causes a memory leak in the clients
+ for (ServerPlayer p : location.world().players()) {
+ // this is necessary because signs do not get updated client side correctly without refreshing the chunks, which causes a memory leak in the clients
- Player p = (Player) entity;
- double distSquared = location.getPosition().distanceSquared(p.getLocation().getPosition());
+ double distSquared = location.position().distanceSquared(p.position());
if ((distSquared < Settings.SilhouetteViewDistance * Settings.SilhouetteViewDistance) && (distSquared
- > (location.getExtent().getViewDistance() - 1) * (location.getExtent().getViewDistance() - 1))) {
- p.spawnParticles(particle, location.getPosition().toDouble(), 9);
+ > (location.world().properties().viewDistance() - 1) * (location.world().properties().viewDistance() - 1))) {
+ p.spawnParticles(particle, location.position().toDouble(), 9);
}
}
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/sign/AscendSign.java b/src/main/java/io/github/pulverizer/movecraft/sign/AscendSign.java
index a67ffe950..dfff4c602 100644
--- a/src/main/java/io/github/pulverizer/movecraft/sign/AscendSign.java
+++ b/src/main/java/io/github/pulverizer/movecraft/sign/AscendSign.java
@@ -1,6 +1,10 @@
package io.github.pulverizer.movecraft.sign;
-import com.flowpowered.math.vector.Vector3i;
+import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
+import org.spongepowered.api.tag.BlockTypeTags;
+import org.spongepowered.api.world.server.ServerWorld;
+import org.spongepowered.math.vector.Vector3i;
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.config.craft.CraftSettings;
import io.github.pulverizer.movecraft.craft.Craft;
@@ -8,16 +12,13 @@
import io.github.pulverizer.movecraft.api.event.CraftDetectEvent;
import io.github.pulverizer.movecraft.config.CrewRoles;
import io.github.pulverizer.movecraft.utils.HashHitBox;
+import net.kyori.adventure.text.Component;
import org.spongepowered.api.block.BlockSnapshot;
-import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.block.tileentity.Sign;
-import org.spongepowered.api.data.value.mutable.ListValue;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.block.entity.Sign;
+import org.spongepowered.api.data.value.ListValue;
import org.spongepowered.api.event.block.InteractBlockEvent;
-import org.spongepowered.api.event.block.tileentity.ChangeSignEvent;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.api.event.block.entity.ChangeSignEvent;
import org.spongepowered.api.util.Direction;
-import org.spongepowered.api.world.World;
/**
* Permissions checked
@@ -28,61 +29,57 @@
*/
public class AscendSign {
- public static void onSignChange(ChangeSignEvent event, Player player) {
+ public static void onSignChange(ChangeSignEvent event, ServerPlayer player) {
if (Settings.RequireCreateSignPerm && !player.hasPermission("movecraft.createsign.ascend")) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ player.sendMessage(Component.text("Insufficient Permissions"));
event.setCancelled(true);
}
}
- public static void onCraftDetect(CraftDetectEvent event, World world, HashHitBox hitBox) {
+ public static void onCraftDetect(CraftDetectEvent event, ServerWorld world, HashHitBox hitBox) {
for (Vector3i location : hitBox) {
- if (world.getBlockType(location) != BlockTypes.WALL_SIGN && world.getBlockType(location) != BlockTypes.STANDING_SIGN || !world
- .getTileEntity(location).isPresent()) {
+ if (!BlockTypeTags.SIGNS.get().contains(world.block(location).type()) || world.blockEntity(location).isEmpty()) {
continue;
}
- Sign sign = (Sign) world.getTileEntity(location).get();
- ListValue lines = sign.lines();
+ Sign sign = (Sign) world.blockEntity(location).get();
+ ListValue.Mutable lines = sign.lines();
- if (lines.get(0).toPlain().equalsIgnoreCase("Ascend: ON") || lines.get(0).toPlain().equalsIgnoreCase("Ascend:")) {
- lines.set(0, Text.of("Ascend: OFF"));
+ if (PlainTextComponentSerializer.plainText().serialize(lines.get(0)).equalsIgnoreCase("Ascend: ON") || PlainTextComponentSerializer.plainText().serialize(lines.get(0)).equalsIgnoreCase("Ascend:")) {
+ lines.set(0, Component.text("Ascend: OFF"));
sign.offer(lines);
}
}
}
- public static void onSignClick(InteractBlockEvent.Secondary.MainHand event, Player player, BlockSnapshot block) {
+ public static void onSignClick(InteractBlockEvent.Secondary event, ServerPlayer player, BlockSnapshot block) {
- Craft craft = CraftManager.getInstance().getCraftByPlayer(player.getUniqueId());
+ Craft craft = CraftManager.getInstance().getCraftByPlayer(player.uniqueId());
- if (!block.getLocation().isPresent() || !block.getLocation().get().getTileEntity().isPresent() || craft == null || !craft.getCrew().hasRole(player
- .getUniqueId(), CrewRoles.Pilot.class)) {
+ if (block.location().isEmpty() || block.location().get().blockEntity().isEmpty() || craft == null || !craft.getCrew().hasRole(player.uniqueId(), CrewRoles.Pilot.class)) {
return;
}
- Sign sign = (Sign) block.getLocation().get().getTileEntity().get();
- ListValue lines = sign.lines();
- if (lines.get(0).toPlain().equalsIgnoreCase("Ascend: OFF")) {
+ Sign sign = (Sign) block.location().get().blockEntity().get();
+ ListValue.Mutable lines = sign.lines();
+ if (PlainTextComponentSerializer.plainText().serialize(lines.get(0)).equalsIgnoreCase("Ascend: OFF")) {
- if (!craft.getType().getValue(CraftSettings.CanCruise.class).get()) {
- player.sendMessage(Text.of("This CraftType does not support this action"));
+ if (!craft.type().getValue(CraftSettings.CanCruise.class).get()) {
+ player.sendMessage(Component.text("This CraftType does not support this action"));
return;
}
- if (!player.hasPermission("movecraft." + craft.getType().getValue(CraftSettings.Name.class).get() + ".movement"
- + ".ascend") && (craft.getType().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player
- .hasPermission("movecraft.movement.ascend"))) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ if (!player.hasPermission("movecraft." + craft.type().getValue(CraftSettings.Name.class).get() + ".movement.ascend") && (craft.type().getValue(CraftSettings.RequiresSpecificPerms.class).get() || !player.hasPermission("movecraft.movement.ascend"))) {
+ player.sendMessage(Component.text("Insufficient Permissions"));
return;
}
event.setCancelled(true);
- lines.set(0, Text.of("Ascend: ON"));
+ lines.set(0, Component.text("Ascend: ON"));
sign.offer(lines);
craft.setCruising(Direction.UP, craft.getHorizontalCruiseDirection());
@@ -90,10 +87,10 @@ public static void onSignClick(InteractBlockEvent.Secondary.MainHand event, Play
return;
}
- if (lines.get(0).toPlain().equalsIgnoreCase("Ascend: ON")) {
+ if (PlainTextComponentSerializer.plainText().serialize(lines.get(0)).equalsIgnoreCase("Ascend: ON")) {
event.setCancelled(true);
- lines.set(0, Text.of("Ascend: OFF"));
+ lines.set(0, Component.text("Ascend: OFF"));
sign.offer(lines);
craft.setCruising(Direction.NONE, craft.getHorizontalCruiseDirection());
}
diff --git a/src/main/java/io/github/pulverizer/movecraft/sign/CommanderSign.java b/src/main/java/io/github/pulverizer/movecraft/sign/CommanderSign.java
index 6a33b88b2..334e21197 100644
--- a/src/main/java/io/github/pulverizer/movecraft/sign/CommanderSign.java
+++ b/src/main/java/io/github/pulverizer/movecraft/sign/CommanderSign.java
@@ -4,13 +4,14 @@
import io.github.pulverizer.movecraft.config.Settings;
import io.github.pulverizer.movecraft.utils.BlockSnapshotSignDataUtil;
import org.spongepowered.api.block.BlockSnapshot;
-import org.spongepowered.api.block.BlockTypes;
-import org.spongepowered.api.data.Transaction;
-import org.spongepowered.api.data.value.mutable.ListValue;
-import org.spongepowered.api.entity.living.player.Player;
+import org.spongepowered.api.block.transaction.BlockTransaction;
+import org.spongepowered.api.block.transaction.Operations;
+import org.spongepowered.api.data.value.ListValue;
+import org.spongepowered.api.entity.living.player.server.ServerPlayer;
import org.spongepowered.api.event.block.ChangeBlockEvent;
-import org.spongepowered.api.event.block.tileentity.ChangeSignEvent;
-import org.spongepowered.api.text.Text;
+import org.spongepowered.api.event.block.entity.ChangeSignEvent;
+import net.kyori.adventure.text.Component;
+import org.spongepowered.api.tag.BlockTypeTags;
import java.sql.Connection;
import java.sql.Date;
@@ -38,10 +39,10 @@ public final class CommanderSign {
private static final String MAIN_TABLE = "CommanderSigns_Main";
private static final String MEMBER_TABLE = "CommanderSigns_Members";
- public static void onSignChange(ChangeSignEvent event, Player player) {
+ public static void onSignChange(ChangeSignEvent event, ServerPlayer player) {
if (Settings.RequireCreateSignPerm && !player.hasPermission("movecraft.createsign.commander")) {
- player.sendMessage(Text.of("Insufficient Permissions"));
+ player.sendMessage(Component.text("Insufficient Permissions"));
event.setCancelled(true);
return;
}
@@ -56,7 +57,7 @@ public static void onSignChange(ChangeSignEvent event, Player player) {
try {
PreparedStatement statement = sqlConnection.prepareStatement("SELECT ID FROM " + MAIN_TABLE + " WHERE Username = ?");
- statement.setString(1, player.getName());
+ statement.setString(1, player.name());
ResultSet resultSet = statement.executeQuery();
@@ -102,7 +103,7 @@ public static void onSignChange(ChangeSignEvent event, Player player) {
statement = sqlConnection.prepareStatement("INSERT INTO " + MAIN_TABLE + " (Username, ID) VALUES (?, ?)");
- statement.setString(1, player.getName());
+ statement.setString(1, player.name());
statement.setInt(2, availableID);
statement.execute();
@@ -110,8 +111,8 @@ public static void onSignChange(ChangeSignEvent event, Player player) {
statement.close();
statement = sqlConnection.prepareStatement("INSERT INTO " + MEMBER_TABLE + " (UUID, Username, ID, isOwner) VALUES (?, ?, ?, ?)");
- statement.setString(1, player.getUniqueId().toString());
- statement.setString(2, player.getName());
+ statement.setString(1, player.uniqueId().toString());
+ statement.setString(2, player.name());
statement.setInt(3, availableID);
statement.setBoolean(4, true);
@@ -119,12 +120,10 @@ public static void onSignChange(ChangeSignEvent event, Player player) {
statement.close();
- ListValue lines = event.getText().lines();
+ ListValue.Mutable lines = event.text();
- lines.set(1, Text.of(player.getName()));
- lines.set(2, Text.of(availableID));
-
- event.getText().set(lines);
+ lines.set(1, Component.text(player.name()));
+ lines.set(2, Component.text(availableID));
sqlConnection.close();
@@ -134,14 +133,18 @@ public static void onSignChange(ChangeSignEvent event, Player player) {
e.printStackTrace();
}
- player.sendMessage(Text.of("There was an error. Please try placing the sign again. If this continues, please contact a Server Admin."));
+ player.sendMessage(Component.text("There was an error. Please try placing the sign again. If this continues, please contact a Server Admin."));
}
- public static void onSignBreak(ChangeBlockEvent.Break event, Transaction transaction) {
+ public static void onSignBreak(BlockTransaction transaction) {
- BlockSnapshot blockSnapshot = transaction.getOriginal();
+ if (!transaction.operation().equals(Operations.BREAK.get())) {
+ return;
+ }
- if (blockSnapshot.getState().getType() != BlockTypes.STANDING_SIGN && blockSnapshot.getState().getType() != BlockTypes.WALL_SIGN) {
+ BlockSnapshot blockSnapshot = transaction.original();
+
+ if (!BlockTypeTags.SIGNS.get().contains(blockSnapshot.state().type())) {
return;
}
@@ -268,16 +271,14 @@ public static HashMap getMembers(String username, int id) {
}
}
- private static void fail(ChangeSignEvent event, Player player) {
-
- player.sendMessage(Text.of("Please contact a Server Admin! There is something seriously wrong!"));
+ private static void fail(ChangeSignEvent event, ServerPlayer player) {
- ListValue