Port FixMySpawnR (#37)

* Port FixMySpawnR

* Update

* Use DO_OPTIMIZE instead Boolean.getBoolean()

---------

Co-authored-by: AlphaKR93 <dev@alpha93.kr>

.github/workflows/build.yml

@@ -43,9 +43,7 @@ jobs:
           cache: 'gradle'
 
       - name: Configure Git
-        run: |
+        run: git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" && git config --global user.name "github-actions[bot]"
-          echo "release_num=$(git ls-remote --tags origin | grep "release" | wc -l)" >> $GITHUB_ENV
 
       - name: Apply Patches
         run: ./gradlew applyPatches --stacktrace
@@ -66,7 +64,7 @@ jobs:
           (cd Plazma-API/build/docs/javadoc && tar c .) | (cd javadoc && tar xf -)
           cd javadoc
           git add . && git commit -m "Update Javadocs"
-          git push -f
+          git push https://${{ secrets.GH_PAT }}@github.com/PlazmaMC/Plazma.git -f
 
       - name: Publish Packages
         if: github.ref_name == env.MAIN_BRANCH
@@ -83,13 +81,16 @@ jobs:
           path: |
             build/libs
             Plazma-API/build/docs/javadoc
+      
+      - name: Get Release Number
+        run: echo "RELEASE=$(git ls-remote --tags origin | grep "release" | wc -l)" >> $GITHUB_ENV
 
       - name: Release Artifacts
         if: startsWith(github.ref_name, 'ver/')
         uses: marvinpinto/action-automatic-releases@latest
         with:
-          title: "Release #${{ env.release_num }}"
+          title: "Release #${{ env.RELEASE }}"
-          automatic_release_tag: release-${{ env.release_num }}
+          automatic_release_tag: release-${{ env.RELEASE }}
           repo_token: "${{ secrets.GH_PAT }}"
           files: build/libs/*.jar
           prerelease: false
@@ -98,7 +99,7 @@ jobs:
         if: startsWith(github.ref_name, 'ver/')
         uses: marvinpinto/action-automatic-releases@latest
         with:
-          title: "Release #${{ env.release_num }}"
+          title: "Release #${{ env.RELEASE }}"
           automatic_release_tag: latest-${{ env.MC_VERSION }}
           repo_token: "${{ secrets.GH_PAT }}"
           files: build/libs/*.jar

patches/server/0009-ChunkSending-Configuration.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: IPECTER <ipectert@gmail.com>
 Date: Thu, 23 Mar 2023 14:25:09 +0900
-Subject: [PATCH] Implement ChunkSending - Configuration
+Subject: [PATCH] ChunkSending Configuration
 
 
 diff --git a/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java b/src/main/java/org/plazmamc/plazma/configurations/LevelConfigurations.java

patches/server/0028-FixMySpawnR-Configuration.patch

@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: IPECTER <ipectert@gmail.com>
+Date: Sun, 26 Mar 2023 16:20:13 +0900
+Subject: [PATCH] FixMySpawnR Configuration
+
+
+diff --git a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+index 7a585540c72c1c18ddcb45ec1caa350f1f9ce544..088670ec016514b4a7fae402d7119a6aaa491c5d 100644
+--- a/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
++++ b/src/main/java/org/plazmamc/plazma/configurations/GlobalConfiguration.java
+@@ -62,4 +62,12 @@ public class GlobalConfiguration extends ConfigurationPart {
+         }
+ 
+     }
++
++    public FixMySpawnR fixMySpawnR;
++    public class FixMySpawnR extends ConfigurationPart {
++
++        public boolean enabled = DO_OPTIMIZE;
++        public int timerTimeOut = 0;
++
++    }
+ }

patches/server/0029-Implement-FixMySpawnR.patch

@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: IPECTER <ipectert@gmail.com>
+Date: Sun, 26 Mar 2023 13:17:24 +0900
+Subject: [PATCH] Implement FixMySpawnR
+
+Original: AbsolemJackdaw/FixMySpawnR
+Copyright (C) 2023 AbsolemJackdaw
+
+diff --git a/src/main/java/net/minecraft/world/level/BaseSpawner.java b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+index feb65fc9ee04141fe6f77400660442ed207547a1..9c759e71ef1d119d7807886f9e56b7230a334475 100644
+--- a/src/main/java/net/minecraft/world/level/BaseSpawner.java
++++ b/src/main/java/net/minecraft/world/level/BaseSpawner.java
+@@ -46,6 +46,8 @@ public abstract class BaseSpawner {
+     public int requiredPlayerRange = 16;
+     public int spawnRange = 4;
+     private int tickDelay = 0; // Paper
++    private int blockExistsTick = 0; // Plazma
++    private boolean blockLockedByTime = false; // Plazma
+ 
+     public BaseSpawner() {}
+ 
+@@ -81,6 +83,18 @@ public abstract class BaseSpawner {
+     }
+ 
+     public void serverTick(ServerLevel world, BlockPos pos) {
++        // Plazma start - FixMySpawnR
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled) {
++            if (!blockLockedByTime) {
++                if (blockExistsTick > org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.timerTimeOut) {
++                    blockLockedByTime = true;
++                } else {
++                    blockExistsTick++;
++                }
++            }
++        }
++        if (blockLockedByTime && world.getBestNeighborSignal(pos) > 0) return;
++        // Plazma end
+         if (spawnCount <= 0 || maxNearbyEntities <= 0) return; // Paper - Ignore impossible spawn tick
+         // Paper start - Configurable mob spawner tick rate
+         if (spawnDelay > 0 && --tickDelay > 0) return;
+@@ -292,6 +306,13 @@ public abstract class BaseSpawner {
+             this.spawnRange = nbt.getShort("SpawnRange");
+         }
+ 
++        // Plazma start - FixMySpawnR
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled && nbt.contains("SpawnRange", 99)) {
++            this.blockExistsTick = nbt.getInt("fixmyspawnrTicks");
++            this.blockLockedByTime = nbt.getBoolean("fixMySpawnerLocked");
++        }
++        // Plazma end
++
+         this.displayEntity = null;
+     }
+ 
+@@ -321,6 +342,12 @@ public abstract class BaseSpawner {
+         }
+ 
+         nbt.put("SpawnPotentials", (Tag) SpawnData.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.spawnPotentials).result().orElseThrow());
++        // Plazma start - FixMySpawnR
++        if (org.plazmamc.plazma.configurations.GlobalConfiguration.get().fixMySpawnR.enabled) {
++            nbt.putInt("fixmyspawnrTicks", blockExistsTick);
++            nbt.putBoolean("fixMySpawnerLocked", blockLockedByTime);
++        }
++        // Plazma end
+         return nbt;
+     }
+