Update 1.11.1

gecolay · Nov 6, 2024 · ba5402d · ba5402d
1 parent c9848dd
commit ba5402d
Show file tree

Hide file tree

Showing 33 changed files with 98 additions and 33 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <build>

diff --git a/mcv1_17/pom.xml b/mcv1_17/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_17_1/pom.xml b/mcv1_17_1/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_18/pom.xml b/mcv1_18/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_18_2/pom.xml b/mcv1_18_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_19/pom.xml b/mcv1_19/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_19_1/pom.xml b/mcv1_19_1/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_19_3/pom.xml b/mcv1_19_3/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_19_4/pom.xml b/mcv1_19_4/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_20/pom.xml b/mcv1_20/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_20_2/pom.xml b/mcv1_20_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_20_3/pom.xml b/mcv1_20_3/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_20_5/pom.xml b/mcv1_20_5/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_21/pom.xml b/mcv1_21/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_21_2/pom.xml b/mcv1_21_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/mcv1_21_2/src/main/java/dev/geco/gsit/mcv/x/objects/PlayerSeatEntity.java b/mcv1_21_2/src/main/java/dev/geco/gsit/mcv/x/objects/PlayerSeatEntity.java
@@ -0,0 +1,65 @@
+package dev.geco.gsit.mcv.x.objects;
+
+import java.lang.reflect.*;
+import java.util.*;
+
+import com.google.common.collect.*;
+
+import org.bukkit.*;
+import org.bukkit.craftbukkit.v1_21_R2.*;
+
+import net.minecraft.advancements.*;
+import net.minecraft.server.level.*;
+import net.minecraft.world.entity.*;
+
+public class PlayerSeatEntity extends AreaEffectCloud {
+
+    private final Field vehicle;
+
+    public PlayerSeatEntity(Location Location) {
+
+        super(((CraftWorld) Location.getWorld()).getHandle(), Location.getX(), Location.getY(), Location.getZ());
+
+        persist = false;
+
+        setRadius(0);
+        setNoGravity(true);
+        setInvulnerable(true);
+        setDuration(Integer.MAX_VALUE);
+        setWaitTime(0);
+        addTag("GSit_PlayerSeatEntity");
+
+        List<Field> vehicleList = new ArrayList<>();
+        for(Field field : Entity.class.getDeclaredFields()) if(field.getType().equals(Entity.class)) vehicleList.add(field);
+        vehicle = vehicleList.getFirst();
+        vehicle.setAccessible(true);
+    }
+
+    public void tick() { }
+
+    protected void handlePortal() { }
+
+    public boolean dismountsUnderwater() { return false; }
+
+    public void setVehicle(Entity Vehicle) {
+
+        try {
+            vehicle.set(this, Vehicle);
+        } catch (Throwable ignored) { }
+
+        if(Vehicle.passengers.isEmpty()) {
+            Vehicle.passengers = ImmutableList.of(this);
+        } else {
+            List<Entity> list = Lists.newArrayList(Vehicle.passengers);
+            list.add(this);
+            Vehicle.passengers = ImmutableList.copyOf(list);
+        }
+
+        Vehicle.gameEvent(net.minecraft.world.level.gameevent.GameEvent.ENTITY_MOUNT, this);
+
+        Vehicle.passengers.stream().flatMap(Entity::getSelfAndPassengers).filter((e) -> e instanceof ServerPlayer).forEach((e) -> {
+            CriteriaTriggers.START_RIDING_TRIGGER.trigger((ServerPlayer) e);
+        });
+    }
+
+}
diff --git a/mcv1_21_2/src/main/java/dev/geco/gsit/mcv/x/util/EntityUtil.java b/mcv1_21_2/src/main/java/dev/geco/gsit/mcv/x/util/EntityUtil.java
@@ -90,9 +90,9 @@ public UUID createPlayerSeatEntity(Entity Holder, Entity Rider) {
 
         for(int entityCount = 1; entityCount <= maxEntities; entityCount++) {
 
-            net.minecraft.world.entity.Entity playerSeatEntity = new PlayerSeatEntity(Holder.getLocation());
+            PlayerSeatEntity playerSeatEntity = new PlayerSeatEntity(Holder.getLocation());
 
-            playerSeatEntity.startRiding(lastEntity, true);
+            playerSeatEntity.setVehicle(lastEntity);
 
             if(entityCount == maxEntities) ((CraftEntity) Rider).getHandle().startRiding(playerSeatEntity, true);
 

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>dev.geco.gsit</groupId>
     <artifactId>GSit</artifactId>
     <name>GSit</name>
-    <version>1.11.0</version>
+    <version>1.11.1</version>
     <description>Relax with other players on nice seats!</description>
     <url>https://www.spigotmc.org/resources/62325</url>
     <inceptionYear>2018</inceptionYear>

diff --git a/v1_17/pom.xml b/v1_17/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_17_1/pom.xml b/v1_17_1/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_18/pom.xml b/v1_18/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_18_2/pom.xml b/v1_18_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_19/pom.xml b/v1_19/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_19_1/pom.xml b/v1_19_1/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_19_3/pom.xml b/v1_19_3/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_19_4/pom.xml b/v1_19_4/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_20/pom.xml b/v1_20/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_20_2/pom.xml b/v1_20_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_20_3/pom.xml b/v1_20_3/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_20_5/pom.xml b/v1_20_5/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_21/pom.xml b/v1_21/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>

diff --git a/v1_21_2/pom.xml b/v1_21_2/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>dev.geco.gsit</groupId>
         <artifactId>GSit</artifactId>
-        <version>1.11.0</version>
+        <version>1.11.1</version>
     </parent>
 
     <properties>