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

Updated Upstream (Paper & Tuinity)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
b33b63908e Support complex components in written book builder (#6337)
bfb3d42b44 Optimize entity tracker passenger checks (#6361)
399710ff79 Add reobf mappings patch for MinecraftServer#getLootTables (#6368)
25cd8aba9f Config option for Piglins guarding chests (#4829)
80650e8936 Added EntityItemDamageEvent (#4928)

Tuinity Changes:
8e7cc4dc96 Do not submit profile lookups to worldgen threads
This commit is contained in:
William Blake Galbreath
2021-08-10 10:53:51 -05:00
parent d55eae358d
commit c8befee46e
120 changed files with 86 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
patches/server/0224-Structure-seed-options.patch Normal file
View File

@@ -0,0 +1,52 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 1 Jul 2021 19:25:05 -0500
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 f71cc1f5e5d594e82a4e6132d438bae74b9370a7..77948e19dd99b6f30bf294c9d5308228a271929b 100644
--- a/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkGenerator.java
@@ -389,6 +389,17 @@ public abstract class ChunkGenerator {
case "village":
seed = conf.villageSeed;
break;
+ // Purpur start
+ case "stronghold":
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureStronghold;
+ break;
+ case "mineshaft":
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureMineshaft;
+ break;
+ case "buried_treasure":
+ seed = net.pl3x.purpur.PurpurConfig.seedStructureBuriedTreasure;
+ break;
+ // Purpur end
}
updated.put(entry.getKey(), new StructureFeatureConfiguration(feature.spacing(), feature.separation(), seed));
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 2def6767b2ee97d9c662b93796ed97bcfd3bbebc..97dba790a02fe54da4278c7e913dbbcf8a25d126 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -247,6 +247,9 @@ public class PurpurConfig {
public static int seedFeatureVegetationPatch = -1;
public static int seedFeatureWaterloggedVegetationPatch = -1;
public static int seedFeatureWeepingVines = -1;
+ public static int seedStructureBuriedTreasure = -1;
+ public static int seedStructureMineshaft = -1;
+ public static int seedStructureStronghold = -1;
private static void seedSettings() {
if (version < 14) {
int oldValue = getInt("settings.seed.dungeon", -1);
@@ -312,6 +315,9 @@ public class PurpurConfig {
seedFeatureVegetationPatch = getInt("settings.seed.feature.vegetation_patch", seedFeatureVegetationPatch);
seedFeatureWaterloggedVegetationPatch = getInt("settings.seed.feature.waterlogged_vegetation_patch", seedFeatureWaterloggedVegetationPatch);
seedFeatureWeepingVines = getInt("settings.seed.feature.weeping_vines", seedFeatureWeepingVines);
+ seedStructureBuriedTreasure = getInt("settings.seed.structure.buried_treasure", seedStructureBuriedTreasure);
+ seedStructureMineshaft = getInt("settings.seed.structure.mineshaft", seedStructureMineshaft);
+ seedStructureStronghold = getInt("settings.seed.structure.stronghold", seedStructureStronghold);
// hide these from timings report
if (!TimingsManager.hiddenConfigs.contains("settings.seed")) TimingsManager.hiddenConfigs.add("settings.seed");
}