From 140c19804a0562a69bfbd0ba01e62644d7198a1d Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 1 Jun 2024 14:21:29 -0500 Subject: [PATCH 1/5] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2a3b3a6..a6af3a0 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.countercraft Movecraft-ShipRules - 1.0.0-alpha.1-SNAPSHOT + 1.0.0-beta-1 Movecraft-ShipRules @@ -93,4 +93,4 @@ RELEASE - \ No newline at end of file + From ad33aacec30bcb27861a5641f675c43e437dd27c Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 22 Jun 2024 19:55:18 -0500 Subject: [PATCH 2/5] Update PilotListener.java --- .../java/net/countercraft/movecraft/rules/PilotListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/countercraft/movecraft/rules/PilotListener.java b/src/main/java/net/countercraft/movecraft/rules/PilotListener.java index d0e1bea..f2a3abe 100644 --- a/src/main/java/net/countercraft/movecraft/rules/PilotListener.java +++ b/src/main/java/net/countercraft/movecraft/rules/PilotListener.java @@ -7,10 +7,10 @@ import net.countercraft.movecraft.craft.SubCraft; import net.countercraft.movecraft.craft.type.CraftType; import net.countercraft.movecraft.events.CraftDetectEvent; -import net.countercraft.movecraft.libs.net.kyori.adventure.audience.Audience; -import net.countercraft.movecraft.libs.net.kyori.adventure.text.Component; import net.countercraft.movecraft.util.ChatUtils; import net.countercraft.movecraft.util.hitboxes.HitBox; +import net.kyori.adventure.audience.Audience; +import net.kyori.adventure.text.Component; import org.bukkit.ChatColor; import org.bukkit.Tag; From 0f5c2a1b623628498a41229f2426838edf8f8d2c Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sat, 22 Jun 2024 20:04:24 -0500 Subject: [PATCH 3/5] Temporary patches --- pom.xml | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index a6af3a0..2c0a51a 100644 --- a/pom.xml +++ b/pom.xml @@ -53,29 +53,18 @@ - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - github - GitHub APDevTeam/Movecraft Apache Maven Packages - https://maven.pkg.github.com/APDevTeam/Movecraft - - true - - - true - + papermc-repo + https://repo.papermc.io/repository/maven-public/ - + - org.spigotmc - spigot-api - 1.14.4-R0.1-SNAPSHOT - provided + io.papermc.paper + paper-api + 1.18.2-R0.1-SNAPSHOT + provided @@ -83,7 +72,8 @@ net.countercraft movecraft LATEST - provided + system + ${project.basedir}/../Movecraft/Movecraft/build/libs/Movecraft.jar From 9491d3f444e2d8ea168bfd8cb44679a37778190f Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sun, 23 Jun 2024 14:05:40 -0500 Subject: [PATCH 4/5] Update pom.xml --- pom.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2c0a51a..fc196cf 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,17 @@ papermc-repo https://repo.papermc.io/repository/maven-public/ + + github + GitHub APDevTeam/Movecraft Apache Maven Packages + https://maven.pkg.github.com/APDevTeam/Movecraft + + true + + + true + + @@ -72,8 +83,7 @@ net.countercraft movecraft LATEST - system - ${project.basedir}/../Movecraft/Movecraft/build/libs/Movecraft.jar + provided From 0d10a5a533546f966dbb3e20b3a57d8a20ed6c02 Mon Sep 17 00:00:00 2001 From: TylerS1066 Date: Sun, 23 Jun 2024 14:28:42 -0500 Subject: [PATCH 5/5] Update PilotListener.java --- .../net/countercraft/movecraft/rules/PilotListener.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/countercraft/movecraft/rules/PilotListener.java b/src/main/java/net/countercraft/movecraft/rules/PilotListener.java index f2a3abe..974f7fc 100644 --- a/src/main/java/net/countercraft/movecraft/rules/PilotListener.java +++ b/src/main/java/net/countercraft/movecraft/rules/PilotListener.java @@ -85,7 +85,8 @@ public void onCraftPilot(CraftDetectEvent event) { if (direction == CruiseDirection.NONE) { direction = currentDirection; } else if (direction != currentDirection && requireCruiseSignAlignment) { - craft.getAudience().sendMessage(Component.text(ChatUtils.MOVECRAFT_COMMAND_PREFIX + // TODO: Remove cast when maven cache is cleared + ((Audience) craft.getAudience()).sendMessage(Component.text(ChatUtils.MOVECRAFT_COMMAND_PREFIX + "Detection failed: All cruise signs must face the same way.")); event.setCancelled(true); } @@ -93,7 +94,8 @@ public void onCraftPilot(CraftDetectEvent event) { } if (direction != CruiseDirection.NONE) { - if (!checkDimensions(craft.getHitBox(), direction, type, craft.getAudience())) { + // TODO: Remove cast when maven cache is cleared + if (!checkDimensions(craft.getHitBox(), direction, type, (Audience) craft.getAudience())) { event.setCancelled(true); return; }