From 36565b6a35455a5105c806d04108f9e9c36d5f5e Mon Sep 17 00:00:00 2001
From: emortaldev <me@emortal.dev>
Date: Sun, 21 Apr 2024 10:16:03 +0100
Subject: [PATCH] 1.20.4

---
 .idea/gradle.xml                              |  3 +-
 .idea/misc.xml                                |  5 ++-
 .idea/vcs.xml                                 |  6 ++++
 build.gradle.kts                              |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 src/main/java/dev/emortal/BlockRigidBody.java | 15 +++++----
 src/main/java/dev/emortal/Main.java           | 33 ++++++++++---------
 7 files changed, 40 insertions(+), 26 deletions(-)
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 14746e7..05eca02 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
+        <option name="gradleJvm" value="21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 87a20fc..f16dea7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 4639051..74a8c82 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
     implementation("com.badlogicgames.gdx:gdx-bullet:1.12.0")
     implementation("com.badlogicgames.gdx:gdx-bullet-platform:1.12.0:natives-desktop")
 
-    implementation("dev.hollowcube:minestom-ce:30699ec3fd")
+    implementation("net.minestom:minestom-snapshots:e8e22a2b15")
 }
 
 tasks {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d08296..596eab5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Oct 01 21:33:41 BST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/dev/emortal/BlockRigidBody.java b/src/main/java/dev/emortal/BlockRigidBody.java
index 96987d9..90ecfe8 100644
--- a/src/main/java/dev/emortal/BlockRigidBody.java
+++ b/src/main/java/dev/emortal/BlockRigidBody.java
@@ -65,7 +65,9 @@ private void spawnEntity(Instance instance, Block block) {
         // Uses an ITEM_DISPLAY instead of a BLOCK_DISPLAY as it is centered around the middle instead of the corner
         entity = new NoTickingEntity(EntityType.ITEM_DISPLAY);
         meta = (ItemDisplayMeta) entity.getEntityMeta();
-        entity.setInstance(instance, Pos.ZERO);
+
+        meta.setWidth(2);
+        meta.setHeight(2);
 
         meta.setNotifyAboutChanges(false);
         meta.setItemStack(ItemStack.of(block.registry().material()));
@@ -73,7 +75,7 @@ private void spawnEntity(Instance instance, Block block) {
 
         Vector3 translation = new Vector3();
         transform.getTranslation(translation);
-        meta.setTranslation(toVec(translation));
+        entity.setInstance(instance, toVec(translation));
 
         Vector3 scale = new Vector3();
         transform.getScale(scale);
@@ -88,16 +90,17 @@ private void spawnEntity(Instance instance, Block block) {
     public void updateEntity() {
         if (meta == null) return;
 
-        rigidBody.activate(); // Rigid bodies have to be constantly active in order to be pushed by the player
+//        rigidBody.activate(); // Rigid bodies have to be constantly active in order to be pushed by the player
 
         meta.setNotifyAboutChanges(false);
-        meta.setInterpolationDuration(1);
-        meta.setInterpolationStartDelta(0);
+        meta.setTransformationInterpolationDuration(1);
+        meta.setPosRotInterpolationDuration(1);
+        meta.setTransformationInterpolationStartDelta(0);
         Matrix4 transform = rigidBody.getWorldTransform();
 
         Vector3 translation = new Vector3();
         transform.getTranslation(translation);
-        meta.setTranslation(toVec(translation));
+        entity.teleport(Pos.fromPoint(toVec(translation)));
 
         // size not updated as it doesn't change
 
diff --git a/src/main/java/dev/emortal/Main.java b/src/main/java/dev/emortal/Main.java
index b4a0ebc..df27895 100644
--- a/src/main/java/dev/emortal/Main.java
+++ b/src/main/java/dev/emortal/Main.java
@@ -5,6 +5,7 @@
 import net.kyori.adventure.bossbar.BossBar;
 import net.kyori.adventure.text.Component;
 import net.minestom.server.MinecraftServer;
+import net.minestom.server.ServerFlag;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -13,12 +14,12 @@
 import net.minestom.server.entity.GameMode;
 import net.minestom.server.entity.metadata.other.PrimedTntMeta;
 import net.minestom.server.event.GlobalEventHandler;
+import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
 import net.minestom.server.event.player.PlayerBlockPlaceEvent;
-import net.minestom.server.event.player.PlayerLoginEvent;
+import net.minestom.server.event.player.PlayerSpawnEvent;
 import net.minestom.server.event.player.PlayerStartSneakingEvent;
 import net.minestom.server.event.server.ServerTickMonitorEvent;
-import net.minestom.server.instance.Instance;
-import net.minestom.server.instance.InstanceManager;
+import net.minestom.server.instance.InstanceContainer;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
 import net.minestom.server.instance.block.Block;
 import net.minestom.server.item.ItemStack;
@@ -27,8 +28,8 @@
 import net.minestom.server.timer.TaskSchedule;
 import net.minestom.server.utils.NamespaceID;
 import net.minestom.server.world.DimensionType;
-import net.minestom.server.world.DimensionTypeManager;
 
+import java.io.IOException;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
@@ -44,13 +45,10 @@ public static void main(String[] args) {
         Bullet.init();
         MinecraftServer server = MinecraftServer.init();
 
+        DimensionType fullbright = DimensionType.builder(NamespaceID.from("fullbright")).ambientLight(1f).build();
+        MinecraftServer.getDimensionTypeManager().addDimension(fullbright);
 
-        DimensionTypeManager dm = MinecraftServer.getDimensionTypeManager();
-        DimensionType dimension = DimensionType.builder(NamespaceID.from("fb")).ambientLight(1f).build();
-        dm.addDimension(dimension);
-
-        InstanceManager im = MinecraftServer.getInstanceManager();
-        Instance instance = im.createInstanceContainer(dimension);
+        InstanceContainer instance = MinecraftServer.getInstanceManager().createInstanceContainer(fullbright);
 
         for (int x = -20; x < 20; x++) {
             for (int z = -20; z < 20; z++) {
@@ -66,11 +64,9 @@ public static void main(String[] args) {
 
         GlobalEventHandler global = MinecraftServer.getGlobalEventHandler();
 
-        global.addListener(PlayerLoginEvent.class, e -> {
+        global.addListener(PlayerSpawnEvent.class, e -> {
             e.getPlayer().showBossBar(bossBar);
-            e.setSpawningInstance(instance);
             e.getPlayer().setGameMode(GameMode.CREATIVE);
-            e.getPlayer().setRespawnPoint(new Pos(0, 5, 0));
 
             e.getPlayer().sendMessage(Component.text("Welcome, crouch to spawn blocks"));
             e.getPlayer().sendMessage(Component.text("You can interact with the cubes by moving into them"));
@@ -92,8 +88,13 @@ public static void main(String[] args) {
             }).repeat(TaskSchedule.tick(1)).schedule();
         });
 
+        global.addListener(AsyncPlayerConfigurationEvent.class, e -> {
+            e.setSpawningInstance(instance);
+            e.getPlayer().setRespawnPoint(new Pos(0, 20, 0));
+        });
+
         instance.scheduler().buildTask(() -> {
-            physicsHandler.update(1f / (float)MinecraftServer.TICK_PER_SECOND);
+            physicsHandler.update(1f / (float) ServerFlag.SERVER_TICKS_PER_SECOND);
         }).repeat(TaskSchedule.tick(1)).schedule();
 
 
@@ -155,14 +156,14 @@ public static void main(String[] args) {
                         batch.setBlock(nearbyBlock.position(), Block.AIR);
                     }
                     batch.apply(instance, null);
-                }).delay(TaskSchedule.tick(3 * MinecraftServer.TICK_PER_SECOND)).schedule();
+                }).delay(TaskSchedule.tick(3 * ServerFlag.SERVER_TICKS_PER_SECOND)).schedule();
             }
         });
 
         global.addListener(PlayerStartSneakingEvent.class, e -> {
             for (int x = -5; x < 5; x++) {
                 for (int z = -5; z < 5; z++) {
-                    physicsHandler.addCube(new BlockRigidBody(instance, new Vector3(x, 15, z), new Vector3(0.5f, 0.5f, 0.5f), 1, true, Block.DIAMOND_BLOCK));
+                    physicsHandler.addCube(new BlockRigidBody(instance, new Vector3(x, 20, z), new Vector3(0.5f, 0.5f, 0.5f), 1, true, Block.DIAMOND_BLOCK));
                 }
             }
         });