Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add seed configs for all world gen features that use random

Browse Source
This commit is contained in:
William Blake Galbreath
2021-06-23 16:02:17 -05:00
parent c28b785a81
commit 0babd7cad8
14 changed files with 953 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0002-Purpur-config-files.patch
View File

@@ -142,7 +142,7 @@ index 4fd030ef9537d9b31c6167d73349f4c4a6b33a15..d708e210dc605ce4dca845292532dd17
public void sendMessage(Component message, UUID sender) {}
diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
index 9da5b7b54c91894b379d41fb8d2b24f7c1c9d96f..c664bd4ab5eb976fd9cdd241436c5c4c947fca08 100644
index 4bf799db871243b07eea57ec7744cf6dc2628645..aa9bf40aa937acbda8cfb821666d466b1945e8a0 100644
--- a/src/main/java/net/minecraft/world/level/Level.java
+++ b/src/main/java/net/minecraft/world/level/Level.java
@@ -166,6 +166,8 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -164,7 +164,7 @@ index 9da5b7b54c91894b379d41fb8d2b24f7c1c9d96f..c664bd4ab5eb976fd9cdd241436c5c4c
this.ticksPerAnimalSpawns = this.getCraftServer().getTicksPerAnimalSpawns(); // CraftBukkit
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..74fc4fc2216cf82e1546ef3d567f2750b1240df1
index 0000000000000000000000000000000000000000..7c5ecdbd5a05ae07a440cadf79d59a439e4db524
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -0,0 +1,130 @@
@@ -223,8 +223,8 @@ index 0000000000000000000000000000000000000000..74fc4fc2216cf82e1546ef3d567f2750
+ commands = new HashMap<>();
+ commands.put("purpur", new PurpurCommand("purpur"));
+
+ version = getInt("config-version", 13);
+ set("config-version", 13);
+ version = getInt("config-version", 14);
+ set("config-version", 14);
+
+ readConfig(PurpurConfig.class, null);
+ }

991
patches/server/0085-Configurable-feature-seed-settings.patch
View File

File diff suppressed because it is too large Load Diff

4
patches/server/0091-Add-option-to-disable-certain-block-updates.patch
View File

@@ -117,10 +117,10 @@ index f8e58d9f71703139a736d93e7f1996e027a29444..d3c8fd8399629efb8bcbaf7d9a0c4334
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4102856324b9f5bd683175c0662309366fe9e3c8..4020c996730fb39ed8c1e40a9c235c2aaade7a27 100644
index 66e91f78b49825615ef3761827903402ad7b1475..8aba62b764bbf9973dfdc4ca3ab0ce2d632c04a7 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -211,6 +211,15 @@ public class PurpurConfig {
@@ -320,6 +320,15 @@ public class PurpurConfig {
allowWaterPlacementInTheEnd = getBoolean("settings.allow-water-placement-in-the-end", allowWaterPlacementInTheEnd);
}

4
patches/server/0096-Short-enderman-height.patch
View File

@@ -31,7 +31,7 @@ index 6e0b5fbf5b0d216b6b7c647d45ef37cd6b591717..5ebedd6a156b06e98aded57c817f6342
if (this.tryEscape(com.destroystokyo.paper.event.entity.EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start
for (int i = 0; i < 64; ++i) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4020c996730fb39ed8c1e40a9c235c2aaade7a27..4c5a52d848ebc37f5543988485f0330812a8ea93 100644
index 8aba62b764bbf9973dfdc4ca3ab0ce2d632c04a7..a290d43d466929030a55674a811dd229b6a03196 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -3,6 +3,8 @@ package net.pl3x.purpur;
@@ -43,7 +43,7 @@ index 4020c996730fb39ed8c1e40a9c235c2aaade7a27..4c5a52d848ebc37f5543988485f03308
import net.pl3x.purpur.command.PurpurCommand;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
@@ -201,6 +203,12 @@ public class PurpurConfig {
@@ -310,6 +312,12 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
}

6
patches/server/0099-Crying-obsidian-valid-for-portal-frames.patch
View File

@@ -18,10 +18,10 @@ index c07b5d1f1ef8b5e6026c7555d476880c8802d6c5..068f1b184a3694603f564d49fa45d5ce
private final LevelAccessor level;
private final Direction.Axis axis;
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 4c5a52d848ebc37f5543988485f0330812a8ea93..0f75e5e0f31433391559930b017fb0913bd46bbd 100644
index a290d43d466929030a55674a811dd229b6a03196..56e03e71b544eaf2f427cac2764f5c76b4b3acc5 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -187,6 +187,7 @@ public class PurpurConfig {
@@ -296,6 +296,7 @@ public class PurpurConfig {
public static boolean barrelSixRows = false;
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
@@ -29,7 +29,7 @@ index 4c5a52d848ebc37f5543988485f0330812a8ea93..0f75e5e0f31433391559930b017fb091
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -201,6 +202,7 @@ public class PurpurConfig {
@@ -310,6 +311,7 @@ public class PurpurConfig {
enderChestSixRows = getBoolean("settings.blocks.ender_chest.six-rows", enderChestSixRows);
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);

4
patches/server/0113-Allow-infinite-and-mending-enchantments-together.patch
View File

@@ -17,10 +17,10 @@ index 3aece8245060dd1ba269c08d226c84247a6f0a83..6763d0b96c83d1b462999f525bf1f31c
}
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0f75e5e0f31433391559930b017fb0913bd46bbd..e93911c4041f8b4457f76e471f5a8e102cded339 100644
index 56e03e71b544eaf2f427cac2764f5c76b4b3acc5..9044bde82f5f40563ffa61600348bb6ee40417a1 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -205,6 +205,16 @@ public class PurpurConfig {
@@ -314,6 +314,16 @@ public class PurpurConfig {
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
}

4
patches/server/0132-EMC-Configurable-disable-give-dropping.patch
View File

@@ -20,10 +20,10 @@ index a0dc380e90415de9068ea408d62a1605c82631df..60fd566f7e1499ecf2ad91216a667f12
itemStack.setCount(1);
ItemEntity itemEntity2 = serverPlayer.drop(itemStack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index e93911c4041f8b4457f76e471f5a8e102cded339..b3c7ad62159184e324eb397f538926dcb4ce0746 100644
index 9044bde82f5f40563ffa61600348bb6ee40417a1..639e408b7f1db13524be6a9dc10474bbecac6d2d 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -184,6 +184,11 @@ public class PurpurConfig {
@@ -293,6 +293,11 @@ public class PurpurConfig {
useAlternateKeepAlive = getBoolean("settings.use-alternate-keepalive", useAlternateKeepAlive);
}

6
patches/server/0173-Allow-infinity-on-crossbows.patch
View File

@@ -59,10 +59,10 @@ index 6f6106ca4d74d50a7b74b086adc96c58c7906cb6..d6417c1e77ac8823e18a179dc9f61757
public abstract boolean canEnchant(Item item);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index b3c7ad62159184e324eb397f538926dcb4ce0746..c926650327c014d7d63b0f7ccbcdbeacd052edcc 100644
index 639e408b7f1db13524be6a9dc10474bbecac6d2d..709cae4bc41fe18dd8e4f270729cc71191614d03 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -211,6 +211,7 @@ public class PurpurConfig {
@@ -320,6 +320,7 @@ public class PurpurConfig {
}
public static boolean allowInfinityMending = false;
@@ -70,7 +70,7 @@ index b3c7ad62159184e324eb397f538926dcb4ce0746..c926650327c014d7d63b0f7ccbcdbeac
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -218,6 +219,7 @@ public class PurpurConfig {
@@ -327,6 +328,7 @@ public class PurpurConfig {
set("settings.enchantment.allow-infinite-and-mending-together", null);
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);

6
patches/server/0179-Config-to-allow-for-unsafe-enchants.patch
View File

@@ -44,10 +44,10 @@ index 5bd25f8b8a554b965665b3f5686c14189b51f28e..4be9924556e0f447dbe6a53c2d4cb7fb
this.getOrCreateTag().put(key, tag);
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index c926650327c014d7d63b0f7ccbcdbeacd052edcc..0960670278f907817a83455e242eb13935a99fc8 100644
index 709cae4bc41fe18dd8e4f270729cc71191614d03..62d3b002da6946af256144de3c1cf29d3f8ef515 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -212,6 +212,7 @@ public class PurpurConfig {
@@ -321,6 +321,7 @@ public class PurpurConfig {
public static boolean allowInfinityMending = false;
public static boolean allowCrossbowInfinity = false;
@@ -55,7 +55,7 @@ index c926650327c014d7d63b0f7ccbcdbeacd052edcc..0960670278f907817a83455e242eb139
private static void enchantmentSettings() {
if (version < 5) {
boolean oldValue = getBoolean("settings.enchantment.allow-infinite-and-mending-together", false);
@@ -220,6 +221,7 @@ public class PurpurConfig {
@@ -329,6 +330,7 @@ public class PurpurConfig {
}
allowInfinityMending = getBoolean("settings.enchantment.allow-infinity-and-mending-together", allowInfinityMending);
allowCrossbowInfinity = getBoolean("settings.enchantment.allow-infinity-on-crossbow", allowCrossbowInfinity);

6
patches/server/0184-Config-to-change-max-number-of-bees.patch
View File

@@ -18,10 +18,10 @@ index 8484e80a70129fb0358d56efab6fd54798b54e6e..ffacc4b8cc3ab8285c4131aec58e48ff
public BeehiveBlockEntity(BlockPos pos, BlockState state) {
super(BlockEntityType.BEEHIVE, pos, state);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 0960670278f907817a83455e242eb13935a99fc8..92c463d374e42f53e8bd78b04ae7a298a740d351 100644
index 62d3b002da6946af256144de3c1cf29d3f8ef515..aebb1879ec9609b6c25be680a5781b409f50a500 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -193,6 +193,7 @@ public class PurpurConfig {
@@ -302,6 +302,7 @@ public class PurpurConfig {
public static boolean enderChestSixRows = false;
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
@@ -29,7 +29,7 @@ index 0960670278f907817a83455e242eb13935a99fc8..92c463d374e42f53e8bd78b04ae7a298
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -208,6 +209,7 @@ public class PurpurConfig {
@@ -317,6 +318,7 @@ public class PurpurConfig {
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);

4
patches/server/0187-Gamemode-extra-permissions.patch
View File

@@ -54,10 +54,10 @@ index 79f6089b934124c3309c6bee2e48b36b937252e0..dff8ef0a1a2e52792070d93685c29002
for(ServerPlayer serverPlayer : targets) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 92c463d374e42f53e8bd78b04ae7a298a740d351..d162f001593e284cf94e3f5f5c2800a91b185a72 100644
index aebb1879ec9609b6c25be680a5781b409f50a500..324346d34ea7decb94700189b5e0231ca92f3d61 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -189,6 +189,11 @@ public class PurpurConfig {
@@ -298,6 +298,11 @@ public class PurpurConfig {
disableGiveCommandDrops = getBoolean("settings.disable-give-dropping", disableGiveCommandDrops);
}

8
patches/server/0190-Configurable-broadcast-settings.patch
View File

@@ -29,7 +29,7 @@ index 177c61a306b9e07eb7aabbac664616cc23bfef5b..4775d9feb52dc899a30d34cdc0ab8414
if (scoreboardteambase.getDeathMessageVisibility() == Team.Visibility.HIDE_FOR_OTHER_TEAMS) {
this.server.getPlayerList().broadcastToTeam((Player) this, ichatbasecomponent);
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index d162f001593e284cf94e3f5f5c2800a91b185a72..6da70ade62affe4c3b4c6d34b61af487bc3e2c6a 100644
index 324346d34ea7decb94700189b5e0231ca92f3d61..045856a67bde9eba5a1cce960b9e93e1bb5b76bb 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -150,6 +150,18 @@ public class PurpurConfig {
@@ -48,6 +48,6 @@ index d162f001593e284cf94e3f5f5c2800a91b185a72..6da70ade62affe4c3b4c6d34b61af487
+ deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer);
+ }
+
public static int dungeonSeed = -1;
public static int endSpikeSeed = -1;
public static int geodeSeed = -1;
public static int seedFeatureBamboo = -1;
public static int seedFeatureBasaltColumns = -1;
public static int seedFeatureBasaltPillar = -1;

4
patches/server/0193-Hide-hidden-players-from-entity-selector.patch
View File

@@ -59,10 +59,10 @@ index 0fb8f32427843f4bfd90ab88ecb3ab3e4a4fda31..f99f1ba7f912a2fd503e12c446b342a8
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 6da70ade62affe4c3b4c6d34b61af487bc3e2c6a..2e869dab6955691a1b0bada5251544d7f345845f 100644
index 045856a67bde9eba5a1cce960b9e93e1bb5b76bb..2dc870397edf29c111fb5cc8a14f858f1c83672c 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -202,8 +202,10 @@ public class PurpurConfig {
@@ -311,8 +311,10 @@ public class PurpurConfig {
}
public static boolean commandGamemodeRequiresPermission = false;

6
patches/server/0201-Make-anvil-cumulative-cost-configurable.patch
View File

@@ -18,10 +18,10 @@ index 2dbc71a3d76cc87e2683b8f351bd8db04481855e..44ecc27fd9bd5a02656321cf8c69bbae
public void setItemName(String newItemName) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index feba60bd2e4d8bb2a23d956ca53b60ff8c493e39..fb4a745404c7b0c28f4eba8ebfdc87977a132884 100644
index 05c219bc29db631ded5b5f48ac4d6ac0641616fb..8b5f2de46838e8c7c9e3ca6dfbd72bdbc6d82036 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -215,6 +215,7 @@ public class PurpurConfig {
@@ -324,6 +324,7 @@ public class PurpurConfig {
public static boolean enderChestPermissionRows = false;
public static boolean cryingObsidianValidForPortalFrame = false;
public static int beeInsideBeeHive = 3;
@@ -29,7 +29,7 @@ index feba60bd2e4d8bb2a23d956ca53b60ff8c493e39..fb4a745404c7b0c28f4eba8ebfdc8797
private static void blockSettings() {
if (version < 3) {
boolean oldValue = getBoolean("settings.barrel.packed-barrels", true);
@@ -231,6 +232,7 @@ public class PurpurConfig {
@@ -340,6 +341,7 @@ public class PurpurConfig {
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
cryingObsidianValidForPortalFrame = getBoolean("settings.blocks.crying_obsidian.valid-for-portal-frame", cryingObsidianValidForPortalFrame);
beeInsideBeeHive = getInt("settings.blocks.beehive.max-bees-inside", beeInsideBeeHive);