Cleaning

README.md

@@ -24,25 +24,27 @@
 
 ```yaml
 verbose: false
-gameplay:
-  server-mod-name: Kaiiju
+region-format:
+  debug: false
 network:
   send-null-entity-packets: true
   alternate-keepalive: false
-region-format:
-  debug: false
+gameplay:
+  server-mod-name: Kaiiju
+  shared-random-for-players: true
 world-settings:
   default:
-    gameplay:
-      shulker-box-drop-contents-when-destroyed: true
-      fix-void-trading: true
-      optimize-hoppers: true
-      tick-when-empty: true
     region-format:
       format: ANVIL
       linear:
         compression-level: 1
         crash-on-broken-symlink: true
+    gameplay:
+      shulker-box-drop-contents-when-destroyed: true
+      fix-void-trading: true
+      optimize-hoppers: true
+      tick-when-empty: true
+      break-redstone-on-top-of-trap-doors-early: true
 config-version: 1
 ```
 Documentation: [Kaiiju Wiki](https://github.com/KaiijuMC/Kaiiju/wiki/Configuration)

gradle.properties

@@ -2,7 +2,7 @@ group = dev.kaiijumc.kaiiju
 version = 1.19.4-R0.1-SNAPSHOT
 mcVersion = 1.19.4
 
-foliaRef = 47105ea28e71d337c2683c7b7ae8228e61901cbb
+foliaRef = f15f1ceab565ce6af84cba2d41de32669e6c3bad
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/server/0017-Fix-off-thread-spider-addEffect.patch

@@ -5,14 +5,16 @@ Subject: [PATCH] Fix off thread spider addEffect
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 0c36bb47bd7040f1544817810e1c87157cdaff96..29935d7cab5a61f48ed540c60152ad06f5e90d08 100644
+index 0c36bb47bd7040f1544817810e1c87157cdaff96..089c7bc00b8b4354d795cd864dc2c310bcf6de86 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-@@ -180,6 +180,7 @@ public class Spider extends Monster {
+@@ -180,7 +180,9 @@ public class Spider extends Monster {
              MobEffect mobeffectlist = entityspider_groupdataspider.effect;
  
              if (mobeffectlist != null) {
-+                if (io.papermc.paper.util.TickThread.isTickThreadFor(this)) // Kaiiju - Prevent give effect to spider off thread
++                this.getBukkitEntity().taskScheduler.schedule(task -> { // Kaiiju - Fix off thread spider add effect
                  this.addEffect(new MobEffectInstance(mobeffectlist, -1), org.bukkit.event.entity.EntityPotionEffectEvent.Cause.SPIDER_SPAWN); // CraftBukkit
++                }, null, 1); // Kaiiju - Fix off thread spider add effect
              }
          }
+ 

patches/server/0018-Add-SIMD-utilities.patch

@@ -24,26 +24,6 @@ index 4686019a152114e63e997ee103fc8424b24b4581..0851203a4bed670242afc5ac86562075
  tasks.jar {
      archiveClassifier.set("dev")
  
-diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 9fb33b35b4d6842ca8597f77a4116e3983ebfbcb..f1fe094c4b4c5932ba656165bb1671020c1277a5 100644
---- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-+++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-@@ -3,6 +3,7 @@ package dev.kaiijumc.kaiiju;
- import com.google.common.base.Throwables;
- import com.google.common.collect.ImmutableMap;
- import dev.kaiijumc.kaiiju.command.KaiijuCommand;
-+import gg.pufferfish.pufferfish.simd.SIMDDetection;
- import net.minecraft.server.MinecraftServer;
- import org.bukkit.Bukkit;
- import org.bukkit.command.Command;
-@@ -15,7 +16,6 @@ import java.io.IOException;
- import java.lang.reflect.InvocationTargetException;
- import java.lang.reflect.Method;
- import java.lang.reflect.Modifier;
--import java.util.Arrays;
- import java.util.HashMap;
- import java.util.List;
- import java.util.Map;
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..586b4cd007b3b106966524e2697edddf88e3ac9d

patches/server/0019-Toggle-shared-random-for-players.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Toggle shared random for players
 
 
 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
-index 9fb33b35b4d6842ca8597f77a4116e3983ebfbcb..51a49fc98147eef7bb50e7a2c71e0e8ed75e3dd6 100644
+index f1fe094c4b4c5932ba656165bb1671020c1277a5..d3f6e5c873255d00160cf792898204a82a0ec5e8 100644
 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java
 @@ -208,8 +208,10 @@ public class KaiijuConfig {
@@ -20,7 +20,7 @@ index 9fb33b35b4d6842ca8597f77a4116e3983ebfbcb..51a49fc98147eef7bb50e7a2c71e0e8e
      }
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 08e61a8940c142c68ed93359084ea46c7fd52310..5f61a405914bf9538144a62cfa5bec8ededc9a5e 100644
+index 08e61a8940c142c68ed93359084ea46c7fd52310..f22b4ad629845462656834abb3e28d2c2588ace6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -560,6 +560,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -28,7 +28,7 @@ index 08e61a8940c142c68ed93359084ea46c7fd52310..5f61a405914bf9538144a62cfa5bec8e
          this.stuckSpeedMultiplier = Vec3.ZERO;
          this.nextStep = 1.0F;
 +        // Kaiiju start - Toggle shared random for players
-+        if (dev.kaiijumc.kaiiju.KaiijuConfig.sharedRandomForPlayers && this instanceof Player)
++        if (!dev.kaiijumc.kaiiju.KaiijuConfig.sharedRandomForPlayers && this instanceof Player)
 +            this.random = RandomSource.create();
 +        else
 +        // Kaiiju end

patches/server/0020-Kick-player-instead-of-crashing.patch

@@ -0,0 +1,42 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com>
+Date: Sun, 14 May 2023 18:50:57 +0300
+Subject: [PATCH] Kick player instead of crashing
+
+
+diff --git a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
+index d52a522fe6d5c4375862691fa32450bc458ca38b..648aff395887d2f13846b1bbe59f4115206ad7cf 100644
+--- a/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
++++ b/src/main/java/io/papermc/paper/chunk/system/RegionizedPlayerChunkLoader.java
+@@ -486,7 +486,12 @@ public class RegionizedPlayerChunkLoader {
+                     new ChunkPos(chunkX, chunkZ), new MutableObject<>(), false, true); // unloaded, loaded
+                 return;
+             }
+-            throw new IllegalStateException();
++            // Kaiiju - Kick player instead of crashing
++            String errorMsg = "Already sent chunk [" + chunkX + ", " + chunkZ + "] in world " + this.world;
++            this.player.getBukkitEntity().kickPlayer(errorMsg);
++            org.bukkit.Bukkit.getLogger().severe(errorMsg);
++            // throw new IllegalStateException();
++            // Kaiiju end
+         }
+ 
+         private void sendUnloadChunk(final int chunkX, final int chunkZ) {
+diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
+index 5ccfc95f51a899b1cd3f34af5e5bb05d902016b8..9c20bd199454b6032a6a90676d12526168b8dd0b 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
++++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
+@@ -133,7 +133,12 @@ public class ChunkHolder {
+ 
+     public void addPlayer(ServerPlayer player) {
+         if (!this.playersSentChunkTo.add(player)) {
+-            throw new IllegalStateException("Already sent chunk " + this.pos + " in world '" + this.chunkMap.level.getWorld().getName() + "' to player " + player);
++            // Kaiiju start - Kick player instead of crashing
++            String errorMsg = "Already sent chunk " + this.pos + " in world " + this.chunkMap.level.getWorld().getName();
++            player.getBukkitEntity().kickPlayer(errorMsg);
++            org.bukkit.Bukkit.getLogger().severe(errorMsg);
++            //throw new IllegalStateException("Already sent chunk " + this.pos + " in world '" + this.chunkMap.level.getWorld().getName() + "' to player " + player);
++            // Kaiiju end
+         }
+     }
+