Repo-Mirror/DivineMC
9
0
Fork 0
mirror of https://github.com/BX-Team/DivineMC.git synced 2025-12-31 04:36:34 +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@1db35b2 Updated Upstream (Paper)
PurpurMC/Purpur@f109b7d fix "sponge.absorbs-lava" option not working correctly
PurpurMC/Purpur@76146ec add option for sponges to absorb water from mud
PurpurMC/Purpur@5f858fb add configurable shovel flattenables
PurpurMC/Purpur@cf3dca9 add an option for piglins to ignore gold-trimmed armor
PurpurMC/Purpur@1846bae [ci-skip] clean up stray imports
PurpurMC/Purpur@aeecb71 Updated Upstream (Paper)
This commit is contained in:
NONPLAYT
2023-08-16 12:25:36 +03:00
parent 3c4809d32e
commit ea9d82288b
4 changed files with 26 additions and 26 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
version = 1.20.1-R0.1-SNAPSHOT
purpurRef = e5a5f228f324d3983d5a8596311faee98f792ad3
purpurRef = aeecb71060e0ef279209ac7e14620cab6189c452
org.gradle.caching = true
org.gradle.parallel = true

8
patches/server/0001-Divine-Branding.patch
View File

@@ -40,7 +40,7 @@ index 8cde30544e14f8fc2dac32966ae3c21f8cf3a551..ad62e0b7deb141d22be4f19ea30f6144
metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> {
String minecraftVersion = Bukkit.getVersion();
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..56c7c9e486ed17f18ebb1a4b59e9e8aa31d8b380 100644
index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..fb3d33117279df26ddd55005d16f80b6ce273ac3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -20,21 +20,21 @@ import java.util.stream.StreamSupport;
@@ -48,7 +48,7 @@ index 462a6eed350fd660ddaf25d567bb6e97b77d0b2b..56c7c9e486ed17f18ebb1a4b59e9e8aa
private static final java.util.regex.Pattern VER_PATTERN = java.util.regex.Pattern.compile("^([0-9\\.]*)\\-.*R"); // R is an anchor, will always give '-R' at end
// Purpur start
- private static final String DOWNLOAD_PAGE = "https://purpurmc.org/downloads";
+ private static final String DOWNLOAD_PAGE = "https://divinemc.bxteam.gq/#download"; // DivineMC
+ private static final String DOWNLOAD_PAGE = "https://github.com/DivineMC/DivineMC/releases/latest"; // DivineMC
private static int distance = -2; public int distance() { return distance; }
// Purpur end
private static @Nullable String mcVer;
@@ -138,7 +138,7 @@ index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 60fbac7b09ba7de1127d53ba296ea7b843105b2a..0d7f16c2a789fa63ebb8f02c8f653e68cf73d3cb 100644
index 0a4dfec98470050a0ec9c3693496751fa78fec81..f5e503702ba5d439efcc93c26740a7e629617590 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
@@ -164,7 +164,7 @@ index 99597258e8e88cd9e2c901c4ac3ff7faeeabee2b..627ceea9fa0fccd3e466eb34d59e760b
if (stream != null) {
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index b974b59d421cf97bc9547ea75fe4643d89639bc1..cb2cad9d695590a86470fdede78adf5ee0bcf0a7 100644
index 414f467825fece602fbe7446e349657264d135ed..47e0728bac16a3e0e2c31610c90c4d5a95a4222e 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -229,7 +229,7 @@ public class PurpurConfig {

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

@@ -43,10 +43,10 @@ index d7f541d94941a341a70dfac025a3d3601dd1aca8..b7347f89702d449bdcf84e96c75d917d
public boolean useDimensionTypeForCustomSpawners = false;
public boolean strictAdvancementDimensionCheck = false;
diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf16897bb66 100644
index d47c57afafc01e25b965f1844938b2516a7bd031..00513ee88032fbcf7b6b28d7979e906a66728f0b 100644
--- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
+++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java
@@ -115,9 +115,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -116,9 +116,9 @@ public class WorldConfiguration extends ConfigurationPart {
public ArmorStands armorStands;
@@ -59,7 +59,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
}
public Markers markers;
@@ -207,8 +207,8 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -208,8 +208,8 @@ public class WorldConfiguration extends ConfigurationPart {
public Behavior behavior;
public class Behavior extends ConfigurationPart {
@@ -70,7 +70,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
public int experienceMergeMaxValue = -1;
public boolean shouldRemoveDragon = false;
public boolean zombiesTargetTurtleEggs = true;
@@ -255,7 +255,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -256,7 +256,7 @@ public class WorldConfiguration extends ConfigurationPart {
public int playerInsomniaStartTicks = 72000;
public int phantomsSpawnAttemptMinSeconds = 60;
public int phantomsSpawnAttemptMaxSeconds = 119;
@@ -79,7 +79,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
public double zombieVillagerInfectionChance = -1.0;
public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot;
@@ -265,7 +265,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -266,7 +266,7 @@ public class WorldConfiguration extends ConfigurationPart {
}
public boolean disablePlayerCrits = false;
@@ -88,7 +88,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
public PillagerPatrols pillagerPatrols;
public class PillagerPatrols extends ConfigurationPart {
@@ -323,7 +323,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -325,7 +325,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Environment extends ConfigurationPart {
public boolean disableThunder = false;
public boolean disableIceAndSnow = false;
@@ -97,7 +97,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
public boolean disableExplosionKnockback = false;
public boolean generateFlatBedrock = false;
public FrostedIce frostedIce;
@@ -369,7 +369,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -371,7 +371,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Maps extends ConfigurationPart {
public int itemFrameCursorLimit = 128;
@@ -106,7 +106,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
}
public Fixes fixes;
@@ -395,7 +395,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -397,7 +397,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class Hopper extends ConfigurationPart {
public boolean cooldownWhenFull = true;
public boolean disableMoveEvent = false;
@@ -115,7 +115,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
}
public Collisions collisions;
@@ -403,9 +403,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -405,9 +405,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Collisions extends ConfigurationPart {
public boolean onlyPlayersCollide = false;
public boolean allowVehicleCollisions = true;
@@ -127,7 +127,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
public boolean allowPlayerCrammingDamage = false;
}
@@ -413,18 +413,31 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -415,18 +415,31 @@ public class WorldConfiguration extends ConfigurationPart {
public class Chunks extends ConfigurationPart {
public AutosavePeriod autoSaveInterval = AutosavePeriod.def();
@@ -169,7 +169,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
});
public boolean flushRegionsOnSave = false;
}
@@ -439,11 +452,22 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -441,11 +454,22 @@ public class WorldConfiguration extends ConfigurationPart {
public TickRates tickRates;
public class TickRates extends ConfigurationPart {
@@ -197,7 +197,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
}
@Setting(FeatureSeedsGeneration.FEATURE_SEEDS_KEY)
@@ -451,7 +475,7 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -453,7 +477,7 @@ public class WorldConfiguration extends ConfigurationPart {
public class FeatureSeeds extends ConfigurationPart.Post {
@Setting(FeatureSeedsGeneration.GENERATE_KEY)
@@ -206,7 +206,7 @@ index a33de97340f14219291c4175e9194914cdf441db..aab773b96b274e2c0dd83ec08f90baf1
@Setting(FeatureSeedsGeneration.FEATURES_KEY)
public Reference2LongMap<Holder<ConfiguredFeature<?, ?>>> features = new Reference2LongOpenHashMap<>();
@@ -465,9 +489,9 @@ public class WorldConfiguration extends ConfigurationPart {
@@ -467,9 +491,9 @@ public class WorldConfiguration extends ConfigurationPart {
public class Misc extends ConfigurationPart {
public int lightQueueSize = 20;

16
patches/server/0005-Add-missing-purpur-config-options.patch
View File

@@ -195,7 +195,7 @@ index e88c39d405fc7068db64ad34a03dec8d559e749e..35f0677a31be938a87314c534d63bc24
@Override
diff --git a/src/main/java/org/purpurmc/purpur/PurpurConfig.java b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
index cb2cad9d695590a86470fdede78adf5ee0bcf0a7..5de196e830cf99e7cc21c01b207216345e3bef71 100644
index 47e0728bac16a3e0e2c31610c90c4d5a95a4222e..1c473310b8d04c16ca44e464ea953e2a90d9cb28 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurConfig.java
@@ -326,6 +326,7 @@ public class PurpurConfig {
@@ -215,10 +215,10 @@ index cb2cad9d695590a86470fdede78adf5ee0bcf0a7..5de196e830cf99e7cc21c01b20721634
org.bukkit.event.inventory.InventoryType.ENDER_CHEST.setDefaultSize(enderChestSixRows ? 54 : 27);
enderChestPermissionRows = getBoolean("settings.blocks.ender_chest.use-permissions-for-rows", enderChestPermissionRows);
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed673e852c 100644
index ec6c29638935835d590823c5cc35141a7f4d32f2..7dab938ea4229d42de1a5c9ece2a16a0709831c7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -1090,7 +1090,17 @@ public class PurpurWorldConfig {
@@ -1115,7 +1115,17 @@ public class PurpurWorldConfig {
public boolean allayRidableInWater = true;
public boolean allayControllable = true;
public List<String> allayRespectNBT = new ArrayList<>();
@@ -236,7 +236,7 @@ index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed
allayRidable = getBoolean("mobs.allay.ridable", allayRidable);
allayRidableInWater = getBoolean("mobs.allay.ridable-in-water", allayRidableInWater);
allayControllable = getBoolean("mobs.allay.controllable", allayControllable);
@@ -1209,7 +1219,15 @@ public class PurpurWorldConfig {
@@ -1234,7 +1244,15 @@ public class PurpurWorldConfig {
public double camelMovementSpeedMin = 0.09D;
public double camelMovementSpeedMax = 0.09D;
public int camelBreedingTicks = 6000;
@@ -252,7 +252,7 @@ index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed
camelRidableInWater = getBoolean("mobs.camel.ridable-in-water", camelRidableInWater);
camelMaxHealthMin = getDouble("mobs.camel.attributes.max_health.min", camelMaxHealthMin);
camelMaxHealthMax = getDouble("mobs.camel.attributes.max_health.max", camelMaxHealthMax);
@@ -1637,7 +1655,17 @@ public class PurpurWorldConfig {
@@ -1662,7 +1680,17 @@ public class PurpurWorldConfig {
public boolean frogControllable = true;
public float frogRidableJumpHeight = 0.65F;
public int frogBreedingTicks = 6000;
@@ -270,7 +270,7 @@ index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed
frogRidable = getBoolean("mobs.frog.ridable", frogRidable);
frogRidableInWater = getBoolean("mobs.frog.ridable-in-water", frogRidableInWater);
frogControllable = getBoolean("mobs.frog.controllable", frogControllable);
@@ -2588,7 +2616,15 @@ public class PurpurWorldConfig {
@@ -2615,7 +2643,15 @@ public class PurpurWorldConfig {
public boolean snifferControllable = true;
public double snifferMaxHealth = 14.0D;
public int snifferBreedingTicks = 6000;
@@ -286,7 +286,7 @@ index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed
snifferRidable = getBoolean("mobs.sniffer.ridable", snifferRidable);
snifferRidableInWater = getBoolean("mobs.sniffer.ridable-in-water", snifferRidableInWater);
snifferControllable = getBoolean("mobs.sniffer.controllable", snifferControllable);
@@ -2687,7 +2723,17 @@ public class PurpurWorldConfig {
@@ -2714,7 +2750,17 @@ public class PurpurWorldConfig {
public boolean tadpoleRidable = false;
public boolean tadpoleRidableInWater = true;
public boolean tadpoleControllable = true;
@@ -304,7 +304,7 @@ index b70b9609671ae8bc9504cef48d7531b5ad5fe65f..384afb3d6bd56bd8638eae32e2fe16ed
tadpoleRidable = getBoolean("mobs.tadpole.ridable", tadpoleRidable);
tadpoleRidableInWater = getBoolean("mobs.tadpole.ridable-in-water", tadpoleRidableInWater);
tadpoleControllable = getBoolean("mobs.tadpole.controllable", tadpoleControllable);
@@ -2897,7 +2943,17 @@ public class PurpurWorldConfig {
@@ -2924,7 +2970,17 @@ public class PurpurWorldConfig {
public boolean wardenRidable = false;
public boolean wardenRidableInWater = true;
public boolean wardenControllable = true;