fix repackage

This commit is contained in:
Ben Kerllenevich
2021-11-29 16:37:07 -05:00
parent 825bf1ef2f
commit 4eac4ddb15
77 changed files with 1267 additions and 1267 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Structure seed options
diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76efe1b851f8 100644
index e4591c0b3c8547cc6f4e2a0891fc378ee4334d9e..fe0f14b363f4e6b583cd079f2cf627605731f764 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -580,6 +580,23 @@ public abstract class ChunkGenerator implements BiomeManager.NoiseBiomeSource {
@@ -14,18 +14,18 @@ index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76ef
break;
+ // Purpur start
+ case "stronghold":
+ if (net.pl3x.purpur.PurpurConfig.seedStructureStronghold != -1) {
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold;
+ if (org.purpurmc.purpur.PurpurConfig.seedStructureStronghold != -1) {
+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureStronghold;
+ }
+ break;
+ case "mineshaft":
+ if (net.pl3x.purpur.PurpurConfig.seedStructureMineshaft != -1) {
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft;
+ if (org.purpurmc.purpur.PurpurConfig.seedStructureMineshaft != -1) {
+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureMineshaft;
+ }
+ break;
+ case "buried_treasure":
+ if (net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure != -1) {
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure;
+ if (org.purpurmc.purpur.PurpurConfig.seedStructureBuriedTreasure != -1) {
+ seed = org.purpurmc.purpur.PurpurConfig.seedStructureBuriedTreasure;
+ }
+ break;
+ // Purpur end
@@ -33,7 +33,7 @@ index f8a2aa31e38f64f88a82d5a388b58f1962d5fda0..9d22417b254dca722ea287a7d64b76ef
updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed));
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index c419af801e31bec057b04131ca5634aad19b343e..51283ec0bd1903c0eb3c04c7ed90785795c39311 100644
index 4081c96a44aba871c51ab9ae246bbb2b55ae7b09..34096550efcdf11d3bba577d6c693d8c349ca43b 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -194,6 +194,17 @@ public class PurpurConfig {