From 4b4e478873d43b92e7e43a8356bca70e17e8a8a7 Mon Sep 17 00:00:00 2001 From: CubBossa Date: Wed, 29 May 2024 10:37:20 +0200 Subject: [PATCH] 1.20.6 progress --- pathfinder-bukkit/build.gradle.kts | 2 +- pathfinder-editmode/build.gradle.kts | 2 +- .../de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java | 2 ++ .../editmode/renderer/AbstractArmorstandRenderer.java | 2 +- .../pathfinder/editmode/renderer/AbstractEntityRenderer.java | 2 +- .../pathfinder/editmode/renderer/NodeGroupListRenderer.java | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pathfinder-bukkit/build.gradle.kts b/pathfinder-bukkit/build.gradle.kts index cbd440ed..c161bd9b 100644 --- a/pathfinder-bukkit/build.gradle.kts +++ b/pathfinder-bukkit/build.gradle.kts @@ -44,7 +44,7 @@ dependencies { testImplementation("com.mojang:brigadier:1.0.18") // Commands - api("dev.jorel:commandapi-bukkit-shade:9.4.1") + api("dev.jorel:commandapi-bukkit-shade:9.4.2") // Statistics implementation("org.bstats:bstats-bukkit:3.0.1") diff --git a/pathfinder-editmode/build.gradle.kts b/pathfinder-editmode/build.gradle.kts index 95f0938b..32c66392 100644 --- a/pathfinder-editmode/build.gradle.kts +++ b/pathfinder-editmode/build.gradle.kts @@ -50,7 +50,7 @@ dependencies { implementation("xyz.xenondevs:particle:1.8.4") // Client ArmorStands - implementation("de.cubbossa:ClientEntities:1.3.0") + implementation("de.cubbossa:ClientEntities:1.3.2") implementation("com.github.retrooper.packetevents:spigot:2.3.1-SNAPSHOT") } diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java index 365ed1c7..0f6c309a 100644 --- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java +++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/RoadMapEditorExtension.java @@ -25,6 +25,8 @@ public NamespacedKey getKey() { @Override public void onLoad(PathFinder pathPlugin) { if (pathPlugin instanceof BukkitPathFinder bukkitPathFinder) { + de.cubbossa.cliententities.lib.packetevents.api.PacketEvents.setAPI(de.cubbossa.cliententities.lib.packetevents.impl.factory.spigot.SpigotPacketEventsBuilder + .build(bukkitPathFinder.getJavaPlugin())); PacketEvents.setAPI(SpigotPacketEventsBuilder.build(bukkitPathFinder.getJavaPlugin())); PacketEvents.getAPI().getSettings() .checkForUpdates(true) diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractArmorstandRenderer.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractArmorstandRenderer.java index bd8ab496..6db71d66 100644 --- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractArmorstandRenderer.java +++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractArmorstandRenderer.java @@ -136,7 +136,7 @@ public void showElement(T element, Player player) { protected PlayerSpace ps(Player player) { return playerSpaces.computeIfAbsent(player.getUniqueId(), uuid -> { - PlayerSpace playerSpace = PlayerSpace.builder().withPlayer(uuid).build(); + PlayerSpace playerSpace = PlayerSpace.create().withPlayer(uuid).build(); playerSpace.registerListener(PlayerInteractEntityEvent.class, this::onClick); playerSpace.registerListener(EntityDamageByEntityEvent.class, this::onHit); return playerSpace; diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractEntityRenderer.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractEntityRenderer.java index 9a4eebfb..1ea6ff4a 100644 --- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractEntityRenderer.java +++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/AbstractEntityRenderer.java @@ -44,7 +44,7 @@ public abstract class AbstractEntityRenderer public AbstractEntityRenderer(JavaPlugin plugin, Class displayClass) { this.entityClass = displayClass; - this.playerSpace = PlayerSpace.builder().withEventSupport().build(); + this.playerSpace = PlayerSpace.create().withEventSupport().build(); entityNodeMap = Maps.synchronizedBiMap(HashBiMap.create()); interactionNodeMap = Maps.synchronizedBiMap(HashBiMap.create()); diff --git a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/NodeGroupListRenderer.java b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/NodeGroupListRenderer.java index 3909a14a..f3794807 100644 --- a/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/NodeGroupListRenderer.java +++ b/pathfinder-editmode/src/main/java/de/cubbossa/pathfinder/editmode/renderer/NodeGroupListRenderer.java @@ -43,7 +43,7 @@ private static final class Context { private final Map displayed; public Context(UUID player) { - playerSpace = PlayerSpace.builder().withPlayer(player).build(); + playerSpace = PlayerSpace.create().withPlayer(player).build(); rendered = new HashSet<>(); displayed = new ConcurrentHashMap<>(); }