Removed problematic apis

README.md

@@ -64,7 +64,7 @@ dependencies {
 ## 联系方式
 > 如果您对这个项目感兴趣或有任何问题，请随时向我们提问。
 
-**QQ群: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ频道: [点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram: [点击加入](https://t.me/LuminolMC) | Discord: [点击加入](https://discord.gg/Qd7m3V6eDx)
+**QQ群: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=QML5kIVsniPi1PlZvnjHQT_02EHsZ5Jc&authKey=%2FTCJsZC7JFQ9sxAroPCKuYnlV57Z5fyqp36ewXZk3Sn4iJ9p4MB1JKdc%2FFcX3HOM&noverify=0&group_code=1015048616)** | QQ频道: [点击加入](https://pd.qq.com/s/eq9krf9j) | Telegram: [点击加入](https://t.me/LuminolMinecraft) | Discord: [点击加入](https://discord.gg/Qd7m3V6eDx)
 
 
 ## 关于 Issue

README_EN.md

@@ -65,7 +65,7 @@ For maven
 ## Contact
 > If you are interested in this project or have any issue, feel free to ask us.
 
-**QQ Group: [368632360](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=MfosKhcDd8Fdxn1MREuZ8Krbf9T6jiBC&authKey=3cm6qdHohON3gHnuD63FK4k07fIbrWnY4hdyq8OmELsfjMVP1kbFTJY9mRyM2Rkj&noverify=0&group_code=368632360)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMC) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)
+**QQ Group: [1015048616](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=hTPlI5j6XB8pgk4sdx6RkjhBPGG1r4IR&authKey=pnu6uCKQP7Sja2CJWC15Qi3BeI%2FAsh8tU4m5muufMBjbB3zz%2BwHBZCTRRdSNKhld&noverify=0&group_code=1015048616)** | QQ Channel: [Click To Join](https://pd.qq.com/s/eq9krf9j) | Telegram: [Click To Join](https://t.me/LuminolMinecraft) | Discord: [Click To Join](https://discord.gg/Qd7m3V6eDx)
 
 ## About Issue
 When you meet any problems, just ask us, we will do our best to solve it, but remember to state your problem clear and provide enough logs etc.</br>

gradle.properties

@@ -2,7 +2,7 @@ group = me.earthme.luminol
 version=1.21.4-R0.1-SNAPSHOT
 mcVersion=1.21.4
 
-foliaRef=5558184374432285853a2e8464251c4b774e9270
+foliaRef=3af04d9c6a98d24032bf8c99ad5446b0f381e320
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

luminol-api/paper-patches/features/0009-Add-missing-teleportation-apis-for-folia.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Add missing teleportation apis for folia
 
 diff --git a/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java b/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..4635a56c60c836675150faca51755dbe09543840
+index 0000000000000000000000000000000000000000..a31c803831dad3d31386924cbe27deff59855fc9
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/entity/EntityTeleportAsyncEvent.java
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,68 @@
 +package me.earthme.luminol.api.entity;
 +
 +import org.apache.commons.lang3.Validate;
@@ -27,14 +27,12 @@ index 0000000000000000000000000000000000000000..4635a56c60c836675150faca51755dbe
 + * @see org.bukkit.entity.Entity#teleportAsync(org.bukkit.Location)
 + * (Also fired when teleportAsync called from nms)
 + */
-+public class EntityTeleportAsyncEvent extends Event implements Cancellable {
++public class EntityTeleportAsyncEvent extends Event {
 +    private static final HandlerList HANDLERS = new HandlerList();
 +
-+    private boolean cancelled = false;
-+
 +    private final Entity entity;
 +    private final PlayerTeleportEvent.TeleportCause teleportCause;
-+    private Location destination;
++    private final Location destination;
 +
 +    public EntityTeleportAsyncEvent(Entity entity, PlayerTeleportEvent.TeleportCause teleportCause, Location destination) {
 +        Validate.notNull(entity, "entity cannot be a null value!");
@@ -70,31 +68,11 @@ index 0000000000000000000000000000000000000000..4635a56c60c836675150faca51755dbe
 +        return this.destination;
 +    }
 +
-+    /**
-+     * Set the destination of the teleport
-+     * @param destination the destination
-+     */
-+    public void setDestination(Location destination) {
-+        Validate.notNull(destination, "destination cannot be a null value!");
-+
-+        this.destination = destination;
-+    }
-+
 +    @Override
 +    public @NotNull HandlerList getHandlers() {
 +        return HANDLERS;
 +    }
 +
-+    @Override
-+    public boolean isCancelled() {
-+        return this.cancelled;
-+    }
-+
-+    @Override
-+    public void setCancelled(boolean cancel) {
-+        this.cancelled = cancel;
-+    }
-+
 +    @NotNull
 +    public static HandlerList getHandlerList() {
 +        return HANDLERS;
@@ -320,10 +298,10 @@ index 0000000000000000000000000000000000000000..cf87a7cce5d1ebec9709b76259560934
 +}
 diff --git a/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java b/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..c8ded49d74a06995c0388d47a5cbf3c070a03abb
+index 0000000000000000000000000000000000000000..e09ffb99aad6f6acca3d6a411877715b90413eb0
 --- /dev/null
 +++ b/src/main/java/me/earthme/luminol/api/portal/PortalLocateEvent.java
-@@ -0,0 +1,64 @@
+@@ -0,0 +1,53 @@
 +package me.earthme.luminol.api.portal;
 +
 +import org.apache.commons.lang3.Validate;
@@ -341,7 +319,7 @@ index 0000000000000000000000000000000000000000..c8ded49d74a06995c0388d47a5cbf3c0
 +    private static final HandlerList HANDLERS = new HandlerList();
 +
 +    private final Location original;
-+    private Location destination;
++    private final Location destination;
 +
 +    public PortalLocateEvent(Location original, Location destination) {
 +        Validate.notNull(original, "original couldn't be null!");
@@ -360,17 +338,6 @@ index 0000000000000000000000000000000000000000..c8ded49d74a06995c0388d47a5cbf3c0
 +    }
 +
 +    /**
-+     * Set the destination position of this teleportation
-+     * @param destination the destination position
-+     */
-+    public void setDestination(@NotNull Location destination) {
-+        Validate.notNull(destination, "Destination position couldn't be null!");
-+        Validate.isTrue(destination.getWorld().equals(this.destination.getWorld()), "Destination position couldn't be a different level!");
-+
-+        this.destination = destination;
-+    }
-+
-+    /**
 +     * Get the original portal position of this teleportation
 +     * @return the original portal position
 +     */

luminol-server/minecraft-patches/features/0040-Add-missing-teleportation-apis-for-folia.patch

@@ -19,10 +19,10 @@ index 9fd3fe181df2ce6dbe695f6463d3940ac4c01167..822d401150d3764004b2570da828b4f6
              );
          });
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2ed3226110 100644
+index a826320496a7a211cc07518adedfec9bdf8728b8..6f9cfd8c72853d9cb30c9731a96e7f1e8f0644c4 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -4166,6 +4166,35 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4166,6 +4166,31 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
  
          // TODO any events that can modify go HERE
@@ -48,25 +48,21 @@ index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2e
 +                cause,
 +                destinationLoc
 +        );
-+        if (!wrapped.callEvent()) {
-+            return false;
-+        }
 +
-+        destination = ((org.bukkit.craftbukkit.CraftWorld) wrapped.getDestination().getWorld()).getHandle();
-+        pos = io.papermc.paper.util.MCUtil.toVec3(wrapped.getDestination());
++        wrapped.callEvent();
 +        // Luminol end
  
          // check for same region
          if (destination == this.level()) {
-@@ -4282,7 +4311,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4282,7 +4307,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              // we just select the spawn position
              case END: {
                  if (destination.getTypeKey() == net.minecraft.world.level.dimension.LevelStem.END) {
 -                    BlockPos targetPos = ServerLevel.END_SPAWN_POINT;
-+                    BlockPos targetPos1 = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
++                    BlockPos targetPos = ServerLevel.END_SPAWN_POINT; // Luminol - Rename
 +                    // Luminol start - Add missing teleportation apis
 +                    final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
++                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
 +
 +                    final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                            orginalPortalLocation,
@@ -74,21 +70,19 @@ index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2e
 +                    );
 +
 +                    portalLocateEvent.callEvent();
-+
-+                    final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
 +                    // Luminol end
                      // need to load chunks so we can create the platform
                      destination.moonrise$loadChunksAsync(
                          targetPos, 16, // load 16 blocks to be safe from block physics
-@@ -4307,7 +4349,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4307,7 +4343,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          }
                      );
                  } else {
 -                    BlockPos spawnPos = destination.getSharedSpawnPos();
-+                    BlockPos spawnPos1 = destination.getSharedSpawnPos(); // Luminol - Rename
++                    BlockPos spawnPos = destination.getSharedSpawnPos(); // Luminol - Rename
 +                    // Luminol start - Add missing teleportation apis
 +                    final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos1);
++                    final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, spawnPos);
 +
 +                    final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                            orginalPortalLocation,
@@ -96,35 +90,31 @@ index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2e
 +                    );
 +
 +                    portalLocateEvent.callEvent();
-+
-+                    final BlockPos spawnPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
 +                    // Luminol end
                      // need to load chunk for heightmap
                      destination.moonrise$loadChunksAsync(
                          spawnPos, 0,
-@@ -4357,8 +4412,20 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4357,8 +4404,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
                  WorldBorder destinationBorder = destination.getWorldBorder();
                  double dimensionScale = net.minecraft.world.level.dimension.DimensionType.getTeleportationScale(origin.dimensionType(), destination.dimensionType());
 -                BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale);
-+                BlockPos targetPos1 = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
++                BlockPos targetPos = destination.getWorldBorder().clampToBounds(this.getX() * dimensionScale, this.getY(), this.getZ() * dimensionScale); // Luminol - Rename
 +                // Luminol start - Add missing teleportation apis
 +                final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(origin, originPortal);
-+                final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos1);
++                final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(destination, targetPos);
 +
 +                final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                        orginalPortalLocation,
 +                        targetPortalLocation
 +                );
-+
-+                portalLocateEvent.callEvent();
  
-+                final BlockPos targetPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
++                portalLocateEvent.callEvent();
 +                // Luminol end
                  ca.spottedleaf.concurrentutil.completable.CallbackCompletable<BlockUtil.FoundRectangle> portalFound
                      = new ca.spottedleaf.concurrentutil.completable.CallbackCompletable<>();
  
-@@ -4495,9 +4562,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4495,9 +4552,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (!this.canPortalAsync(destination, takePassengers)) {
              return false;
          }
@@ -144,7 +134,7 @@ index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2e
          // Kaiiju end
  
          Vec3 initialPosition = this.position();
-@@ -4571,6 +4647,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4571,6 +4637,9 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                          tpComplete.accept(teleported);
                      }
                      // Kaiiju end
@@ -155,25 +145,16 @@ index a826320496a7a211cc07518adedfec9bdf8728b8..89e99679d91b960dc7c46782c127ab2e
              );
          });
 diff --git a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-index 61887e6b052bca715c90dff5d9cd657e0b3f6a78..d56cfb7357a88844428c1f84efdb72d0b2e63b3f 100644
+index 61887e6b052bca715c90dff5d9cd657e0b3f6a78..4f18340a99b141e15f74595282155bbd9632fb86 100644
 --- a/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java
-@@ -186,13 +186,27 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
-         }
- 
-         // First, find the position we are trying to teleport to
--        BlockPos teleportPos = portalTile.exitPortal;
-+        BlockPos teleportPos2 = portalTile.exitPortal;
-         boolean isExactTeleport = portalTile.exactTeleport;
- 
--        if (teleportPos == null) {
-+        if (teleportPos2 == null) {
+@@ -193,6 +193,18 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity {
              portalTile.trySearchForExit(portalWorld, portalPos);
              return false;
          }
 +        // Luminol start - Add missing teleportation apis
 +        final org.bukkit.Location orginalPortalLocation = io.papermc.paper.util.MCUtil.toLocation(toTeleport.level(), portalPos);
-+        final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(portalWorld, teleportPos2);
++        final org.bukkit.Location targetPortalLocation = io.papermc.paper.util.MCUtil.toLocation(portalWorld, teleportPos);
 +
 +        final me.earthme.luminol.api.portal.PortalLocateEvent portalLocateEvent = new me.earthme.luminol.api.portal.PortalLocateEvent(
 +                orginalPortalLocation,
@@ -181,8 +162,6 @@ index 61887e6b052bca715c90dff5d9cd657e0b3f6a78..d56cfb7357a88844428c1f84efdb72d0
 +        );
 +
 +        portalLocateEvent.callEvent();
-+
-+        final BlockPos teleportPos = io.papermc.paper.util.MCUtil.toBlockPosition(portalLocateEvent.getDestination()); // Swap value
 +        // Luminol end
 +