Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-19 14:59:25 +00:00
Code Issues Releases Activity

Updated Upstream (Purpur)

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

Purpur Changes:
PurpurMC/Purpur@4f12f5d Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-12-08 00:49:26 +03:00
parent 7a29435ca5
commit 456f0409b6
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = gq.bxteam.divinemc group = gq.bxteam.divinemc
version = 1.20.2-R0.1-SNAPSHOT version = 1.20.2-R0.1-SNAPSHOT
purpurRef = c46cb7ef66675e00a48e20c40febed7ff914f35d purpurRef = 4f12f5d3d0431cf17c2f6f80f3bdd3c834c9b8fa
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

27
patches/server/0004-Optimize-default-values-for-configs.patch
View File

@@ -36,7 +36,7 @@ index a6f58b3457b7477015c5c6d969e7d83017dd3fa1..e51f427eadc0c3b60754d0a67bea3892
public boolean strictAdvancementDimensionCheck = false; public boolean strictAdvancementDimensionCheck = false;
public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..90e30ad72b0947b66e65f85bb75112ee78f84bab 100644 index 071d3877e386a0c7c4d2f2e8ddd06e0765c49d0d..d4cb765e3093365346c7ce2ab524e102148941f9 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -151,9 +151,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -162,35 +162,28 @@ index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..90e30ad72b0947b66e65f85bb75112ee
}); });
public boolean flushRegionsOnSave = false; public boolean flushRegionsOnSave = false;
} }
@@ -496,11 +509,22 @@ public class WorldConfiguration extends ConfigurationPart { @@ -496,13 +509,15 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates; public TickRates tickRates;
public class TickRates extends ConfigurationPart { public class TickRates extends ConfigurationPart {
- public int grassSpread = 1; - public int grassSpread = 1;
- public int containerUpdate = 1; - public int containerUpdate = 1;
- public int mobSpawner = 1; - public int mobSpawner = 1;
- public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
- public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", -1));
+ // DivineMC start - optimize default values for configs + // DivineMC start - optimize default values for configs
+ public int grassSpread = 4; + public int grassSpread = 4;
+ public int containerUpdate = 3; + public int containerUpdate = 3;
+ public int mobSpawner = 2; + public int mobSpawner = 2;
+ public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> { public int wetFarmland = 1;
+ table.put(EntityType.VILLAGER, "secondarypoisensor", 80); public int dryFarmland = 1;
+ table.put(EntityType.VILLAGER, "nearestbedsensor", 80); - public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 40));
+ table.put(EntityType.VILLAGER, "villagerbabiessensor", 40); - public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", -1));
+ table.put(EntityType.VILLAGER, "playersensor", 40); + public Table<EntityType<?>, String, Integer> sensor = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "secondarypoisensor", 80));
+ table.put(EntityType.VILLAGER, "nearestlivingentitysensor", 40); + public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> table.put(EntityType.VILLAGER, "validatenearbypoi", 60));
+ });
+ public Table<EntityType<?>, String, Integer> behavior = Util.make(HashBasedTable.create(), table -> {
+ table.put(EntityType.VILLAGER, "validatenearbypoi", 60);
+ table.put(EntityType.VILLAGER, "acquirepoi", 120);
+ });
+ // DivineMC end + // DivineMC end
} }
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY) @Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -509,7 +533,7 @@ public class WorldConfiguration extends ConfigurationPart { @@ -511,7 +526,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart { public class FeatureSeeds extends ConfigurationPart {
@SuppressWarnings("unused") // Is used in FeatureSeedsGeneration @SuppressWarnings("unused") // Is used in FeatureSeedsGeneration
@Setting(FeatureSeedsGeneration.GENERATE_KEY) @Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -199,7 +192,7 @@ index 84e6fc5bac43ee0499b391827726bc02f6d3e46f..90e30ad72b0947b66e65f85bb75112ee
@Setting(FeatureSeedsGeneration.FEATURES_KEY) @Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>(); public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -523,9 +547,9 @@ public class WorldConfiguration extends ConfigurationPart { @@ -525,9 +540,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart { public class Misc extends ConfigurationPart {
public int lightQueueSize = 20; public int lightQueueSize = 20;