Updated Upstream (Plazma)

PlazmaMC/PlazmaBukkit@e515882: Updated Upstream (Purpur) PlazmaMC/PlazmaBukkit@8922696: Add back Pufferfish related patches PlazmaMC/PlazmaBukkit@64df11d: nahh PlazmaMC/PlazmaBukkit@9dbff36: some patch cleanups PlazmaMC/PlazmaBukkit@d75427a: Add an option to apply the configuration to the vanilla default PlazmaMC/PlazmaBukkit@7ef7531: Add back cave lava see level configuration
PlazmaMC · May 26, 2024 · d05aaad · d05aaad
1 parent a2eda9a
commit d05aaad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/patches/server/0002-Configurable-Thunderbolt.patch b/patches/server/0002-Configurable-Thunderbolt.patch
@@ -127,18 +127,18 @@ index 00d58b6f8b94457b2a7418a74027181fdeda3db9..349fb7a53ac5752b60e5167c5e9dc459
          this.playerBreedingCooldowns = this.getNewBreedingCooldownCache(); // Purpur
          this.generator = gen;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6de746c3e0f30bcf3dc24b2a4d369c86db445738..86a34b3df5ad047248848dd07dcfd5828c3ce40c 100644
+index a9141a1f71c2dc31c6530b00ba0a69c0d1016797..65c2a14d07b559e4ce519758ccf8cf205dbffdce 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1053,6 +1053,7 @@ public final class CraftServer implements Server {
+@@ -1065,6 +1065,7 @@ public final class CraftServer implements Server {
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
          this.console.plazmaConfigurations.reloadConfigs(this.console); // Plazma - Configurable Plazma
 +        this.console.thunderboltConfigurations.reloadConfigs(this.console); // Thunderbolt - Configurable Thunderbolt
          org.purpurmc.purpur.PurpurConfig.init((File) console.options.valueOf("purpur-settings")); // Purpur
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
-@@ -3130,6 +3131,13 @@ public final class CraftServer implements Server {
+@@ -3142,6 +3143,13 @@ public final class CraftServer implements Server {
          }
          // Plazma end - Configurable Plazma
 

diff --git a/patches/server/0004-Implement-Noisium.patch b/patches/server/0004-Implement-Noisium.patch
@@ -68,7 +68,7 @@ index 81368bf186365878db2e1ed305bb7bf36c26f61f..c1d31b9f37472364d08b07958787410a
              for (int i = 0; i < storage.getSize(); i++) {
                  T object = palette.valueFor(storage.get(i));
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..3739f727d9566a4cb0bc363fe449ea043a59362e 100644
+index e3990d5f5a49aca501289e92f7462a5f2709db9b..03cf6ea4091d40cb65d5ecba139e2c0275074cc1 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -52,6 +52,7 @@ import org.apache.commons.lang3.mutable.MutableObject;
@@ -79,7 +79,7 @@ index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..3739f727d9566a4cb0bc363fe449ea04
      public static final MapCodec<NoiseBasedChunkGenerator> CODEC = RecordCodecBuilder.mapCodec((instance) -> {
          return instance.group(BiomeSource.CODEC.fieldOf("biome_source").forGetter((chunkgeneratorabstract) -> {
              return chunkgeneratorabstract.biomeSource;
-@@ -265,38 +266,45 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+@@ -274,38 +275,45 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
 
      @Override
      public CompletableFuture<ChunkAccess> fillFromNoise(Executor executor, Blender blender, RandomState noiseConfig, StructureManager structureAccessor, ChunkAccess chunk) {
@@ -153,7 +153,7 @@ index 8ce870a5341a61fbbaf42021ef7f7f615a6a3e09..3739f727d9566a4cb0bc363fe449ea04
      }
 
      private ChunkAccess doFill(Blender blender, StructureManager structureAccessor, RandomState noiseConfig, ChunkAccess chunk, int minimumCellY, int cellHeight) {
-@@ -362,6 +370,20 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
+@@ -371,6 +379,20 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {
 
                                  iblockdata = this.debugPreliminarySurfaceLevel(noisechunk, j4, j3, i5, iblockdata);
                                  if (iblockdata != NoiseBasedChunkGenerator.AIR && !SharedConstants.debugVoidTerrain(chunk.getPos())) {