Civ mc main

.github/workflows/comment_on_pr.yaml

@@ -50,13 +50,6 @@ jobs:
           echo "Head SHA: $HEAD_SHA"
           echo "HEAD_SHA=$HEAD_SHA" >> "$GITHUB_ENV"
 
-      - name: Delete old comments
-        uses: izhangzhihao/delete-comment@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          delete_user_name: github-actions[bot]
-          issue_number: ${{ env.PR_NUMBER }}
-
       - name: Update Comment
         env:
           JOB_PATH: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ env.PREVIOUS_JOB_ID }}"

README.md

@@ -34,6 +34,7 @@ Current services and exposed ports are:
 | proxy    | 25565 | TCP, Minecraft      |            |
 | paper    |       |                     |            |
 | pvp      |       |                     |            |
+| gamma    |       |                     |            |
 | mariadb  | 3306  | TCP, Database       |            |
 | postgres | 5432  | TCP, Database       |            |
 | rabbitmq | 5672  | TCP, AMQP           |            |

ansible/build.gradle.kts

@@ -1,4 +1,5 @@
 val paperPlugin by configurations.creating
+val gammaPlugin by configurations.creating
 val pvpPlugin by configurations.creating
 val proxyPlugin by configurations.creating
 
@@ -29,6 +30,31 @@ dependencies {
     paperPlugin(project(path = ":plugins:simpleadminhacks-paper"))
     paperPlugin(project(path = ":plugins:heliodor-paper"))
 
+    gammaPlugin(project(path = ":plugins:banstick-paper", configuration = "shadow"))
+    gammaPlugin(project(path = ":plugins:bastion-paper"))
+    gammaPlugin(project(path = ":plugins:castlegates-paper"))
+    gammaPlugin(project(path = ":plugins:citadel-paper"))
+    gammaPlugin(project(path = ":plugins:civchat2-paper"))
+    gammaPlugin(project(path = ":plugins:civduties-paper"))
+    gammaPlugin(project(path = ":plugins:civmodcore-paper", configuration = "shadow"))
+    gammaPlugin(project(path = ":plugins:finale-paper"))
+    gammaPlugin(project(path = ":plugins:combattagplus-paper"))
+    gammaPlugin(project(path = ":plugins:donum-paper"))
+    gammaPlugin(project(path = ":plugins:essenceglue-paper"))
+    gammaPlugin(project(path = ":plugins:exilepearl-paper"))
+    gammaPlugin(project(path = ":plugins:factorymod-paper"))
+    gammaPlugin(project(path = ":plugins:hiddenore-paper"))
+    gammaPlugin(project(path = ":plugins:itemexchange-paper"))
+    gammaPlugin(project(path = ":plugins:jukealert-paper", configuration = "shadow"))
+    gammaPlugin(project(path = ":plugins:namecolors-paper"))
+    gammaPlugin(project(path = ":plugins:namelayer-paper"))
+    gammaPlugin(project(path = ":plugins:railswitch-paper"))
+    gammaPlugin(project(path = ":plugins:randomspawn-paper"))
+    gammaPlugin(project(path = ":plugins:realisticbiomes2-paper"))
+    gammaPlugin(project(path = ":plugins:simpleadminhacks-paper"))
+    gammaPlugin(project(path = ":plugins:heliodor-paper"))
+    gammaPlugin(project(path = ":plugins:kirabukkitgateway-paper", configuration = "shadow"))
+
     pvpPlugin(project(path = ":plugins:banstick-paper", configuration = "shadow"))
     pvpPlugin(project(path = ":plugins:civduties-paper"))
     pvpPlugin(project(path = ":plugins:civmodcore-paper", configuration = "shadow"))
@@ -40,6 +66,10 @@ dependencies {
     pvpPlugin(project(path = ":plugins:namelayer-paper"))
     pvpPlugin(project(path = ":plugins:civchat2-paper"))
     pvpPlugin(project(path = ":plugins:namecolors-paper"))
+
+    proxyPlugin(project(path = ":plugins:civproxy-velocity", configuration = "shadow"))
+    proxyPlugin(project(path = ":plugins:announcements-velocity", configuration = "shadow"))
+    proxyPlugin(project(path = ":plugins:kiragateway-velocity", configuration = "shadow"))
 }
 
 val copyPaperPlugins = tasks.register<Copy>("copyPaperPlugins") {
@@ -66,6 +96,18 @@ val copyPvpPlugins = tasks.register<Copy>("copyPvpPlugins") {
     into("$projectDir/build/pvp-plugins")
 }
 
+val copyGammaPlugins = tasks.register<Copy>("copyGammaPlugins") {
+    dependsOn(gammaPlugin)
+
+    doFirst {
+        project.delete(files("$projectDir/build/gamma-plugins"))
+    }
+
+    from("$projectDir/src/gamma-plugins")
+    from(gammaPlugin.resolvedConfiguration.resolvedArtifacts.map { it.file })
+    into("$projectDir/build/gamma-plugins")
+}
+
 val copyProxyPlugins = tasks.register<Copy>("copyProxyPlugins") {
     dependsOn(proxyPlugin)
 
@@ -81,6 +123,7 @@ val copyProxyPlugins = tasks.register<Copy>("copyProxyPlugins") {
 // TODO: Is build the right name?
 tasks.register("build") {
     dependsOn(copyPaperPlugins)
+    dependsOn(copyGammaPlugins)
     dependsOn(copyPvpPlugins)
     dependsOn(copyProxyPlugins)
 }

ansible/deactivated_plugins/realisticbiomes-paper/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
-    id("io.papermc.paperweight.userdev")
-    id("xyz.jpenilla.run-paper")
+    alias(libs.plugins.paper.userdev)
+    alias(libs.plugins.runpaper)
 }
 
 version = "3.2.3"

ansible/deactivated_plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/commands/Menu.java

@@ -7,6 +7,8 @@
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.annotation.Syntax;
 import com.untamedears.realisticbiomes.utils.RealisticBiomesGUI;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
 import org.bukkit.ChatColor;
 import org.bukkit.block.Biome;
 import org.bukkit.entity.Player;
@@ -31,8 +33,8 @@ public void onCommand(Player p, @Optional String biome) {
                 return;
             }
             String concat = String.join(" ", biome);
-            for (Biome b : Biome.values()) {
-                if (b.toString().equals(concat)) {
+            for (Biome b : RegistryAccess.registryAccess().getRegistry(RegistryKey.BIOME)) {
+                if (b.getKey().value().equals(concat)) {
                     RealisticBiomesGUI gui = new RealisticBiomesGUI(p);
                     gui.showRBOverview(b);
                     return;

ansible/deactivated_plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/commands/RBCommandManager.java

@@ -3,6 +3,9 @@
 import co.aikar.commands.BukkitCommandCompletionContext;
 import co.aikar.commands.CommandCompletions;
 import java.util.Arrays;
+import io.papermc.paper.registry.RegistryAccess;
+import io.papermc.paper.registry.RegistryKey;
+import org.bukkit.NamespacedKey;
 import org.bukkit.block.Biome;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
@@ -23,6 +26,6 @@ public void registerCommands() {
     @Override
     public void registerCompletions(@NotNull CommandCompletions<BukkitCommandCompletionContext> completions) {
         super.registerCompletions(completions);
-        completions.registerCompletion("RB_Biomes", (context) -> Arrays.stream(Biome.values()).map(Biome::name).toList());
+        completions.registerCompletion("RB_Biomes", (context) -> RegistryAccess.registryAccess().getRegistry(RegistryKey.BIOME).stream().map(Biome::getKey).map(NamespacedKey::value).toList());
     }
 }

ansible/deactivated_plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/growth/FruitGrower.java

@@ -13,7 +13,7 @@
 
 public class FruitGrower extends IArtificialGrower {
 
-    private List<Material> validSoil = Arrays.asList(Material.DIRT, Material.GRASS_BLOCK, Material.FARMLAND);
+    private List<Material> validSoil = Arrays.asList(Material.DIRT, Material.GRASS_BLOCK, Material.FARMLAND, Material.MOSS_BLOCK, Material.COARSE_DIRT, Material.PODZOL, Material.PALE_MOSS_BLOCK);
     private Material attachedStem;
     private Material nonAttachedStem;
     private Material fruitMaterial;

ansible/deactivated_plugins/realisticbiomes-paper/src/main/java/com/untamedears/realisticbiomes/utils/RealisticBiomesGUI.java

@@ -10,7 +10,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.block.Biome;

ansible/files/paper-config/bukkit.yml

@@ -1,5 +1,5 @@
 settings:
-  allow-end: true
+  allow-end: false
   warn-on-overload: true
   permissions-file: permissions.yml
   update-folder: update
@@ -11,11 +11,11 @@ settings:
   minimum-api: none
 spawn-limits:
   axolotls: 1
-  monsters: 16
-  animals: 8
-  water-animals: 6
-  water-ambient: 4
-  water-underground-creature: 4
+  monsters: 12
+  animals: 7
+  water-animals: 5
+  water-ambient: 3
+  water-underground-creature: 3
   ambient: 0
 chunk-gc:
   period-in-ticks: 400

ansible/files/paper-config/config/gale-global.yml

@@ -0,0 +1,46 @@
+# This is the global configuration file for Gale.
+# As you can see, there's a lot to configure. Some options may impact gameplay, so use
+# with caution, and make sure you know what each option does before configuring.
+# 
+# If you need help with the configuration or have any questions related to Gale,
+# join us in our Discord, or check the GitHub Wiki pages.
+# 
+# The world configuration options are inside
+# their respective world folder. The files are named gale-world.yml
+# 
+# Wiki: https://github.com/GaleMC/Gale/wiki
+# Discord: https://discord.gg/gwezNT8c24
+
+_version: 1
+gameplay-mechanics:
+  enable-book-writing: true
+log-to-console:
+  chat:
+    empty-message-warning: false
+    expired-message-warning: false
+    not-secure-marker: true
+  ignored-advancements: true
+  invalid-legacy-text-component: true
+  invalid-statistics: true
+  legacy-material-initialization: false
+  null-id-disconnections: true
+  player-login-locations: true
+  plugin-library-loader:
+    downloads: true
+    library-loaded: true
+    start-load-libraries-for-plugin: true
+  set-block-in-far-chunk: true
+  unrecognized-recipes: false
+misc:
+  ignore-null-legacy-structure-data: false
+  keepalive:
+    send-multiple: false
+  last-tick-time-in-tps-command:
+    add-oversleep: false
+    enabled: false
+  premium-account-slow-login-timeout: -1
+  verify-chat-order: true
+small-optimizations:
+  reduced-intervals:
+    increase-time-statistics: 20
+    update-entity-line-of-sight: 4

ansible/files/paper-config/config/gale-world-defaults.yml

@@ -0,0 +1,53 @@
+# This is the world defaults configuration file for Gale.
+# As you can see, there's a lot to configure. Some options may impact gameplay, so use
+# with caution, and make sure you know what each option does before configuring.
+# 
+# If you need help with the configuration or have any questions related to Gale,
+# join us in our Discord, or check the GitHub Wiki pages.
+# 
+# Configuration options here apply to all worlds, unless you specify overrides inside
+# the world-specific config file inside each world folder.
+# 
+# Wiki: https://github.com/GaleMC/Gale/wiki
+# Discord: https://discord.gg/gwezNT8c24
+
+_version: 1
+gameplay-mechanics:
+  arrow-movement-resets-despawn-counter: false
+  entities-can-random-stroll-into-non-ticking-chunks: true
+  entity-wake-up-duration-ratio-standard-deviation: 0.2
+  fixes:
+    broadcast-crit-animations-as-the-entity-being-critted: false
+    mc-121706: false
+    mc-238526: false
+  hide-flames-on-entities-with-fire-resistance: false
+  try-respawn-ender-dragon-after-end-crystal-place: true
+small-optimizations:
+  load-chunks:
+    to-activate-climbing-entities: false
+    to-spawn-phantoms: false
+  max-projectile-chunk-loads:
+    per-projectile:
+      max: 10
+      remove-from-world-after-reach-limit: false
+      reset-movement-after-reach-limit: false
+    per-tick: 10
+  reduced-intervals:
+    acquire-poi-for-stuck-entity: 60
+    check-nearby-item:
+      hopper:
+        interval: 1
+        minecart:
+          interval: 1
+          temporary-immunity:
+            check-for-minecart-near-item-interval: 20
+            check-for-minecart-near-item-while-active: false
+            check-for-minecart-near-item-while-inactive: true
+            duration: 100
+            max-item-horizontal-distance: 24.0
+            max-item-vertical-distance: 4.0
+            nearby-item-max-age: 1200
+    check-stuck-in-wall: 10
+    villager-item-repickup: 100
+  save-fireworks: true
+  use-optimized-sheep-offspring-color: true