Repo-Mirror/SparklyPaperMC
9
0
Fork 0
mirror of https://github.com/SparklyPower/SparklyPaper.git synced 2025-12-20 15:39:32 +00:00
Code Issues Releases Activity

Make the new map data skip optimization configurable per world

Browse Source
This commit is contained in:
MrPowerGamerBR
2023-11-17 18:30:03 -03:00
parent eed11e38b2
commit d0b69c2306
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
patches/server/0002-SparklyPaper-config-files.patch
View File

@@ -225,10 +225,10 @@ index 0000000000000000000000000000000000000000..6398c7b40ba82ffc8588eca458ce92c2
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt diff --git a/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..fbbb11c1a62a28a251c35261fb29e6267a08c1a3 index 0000000000000000000000000000000000000000..4c736abcf64855e8fdfdeb2ba646288283ae278a
--- /dev/null --- /dev/null
+++ b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt +++ b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperConfigUtils.kt
@@ -0,0 +1,49 @@ @@ -0,0 +1,50 @@
+package net.sparklypower.sparklypaper.configs +package net.sparklypower.sparklypaper.configs
+ +
+import com.charleskorn.kaml.Yaml +import com.charleskorn.kaml.Yaml
@@ -255,6 +255,7 @@ index 0000000000000000000000000000000000000000..fbbb11c1a62a28a251c35261fb29e626
+ ), + ),
+ mapOf( + mapOf(
+ "default" to SparklyPaperWorldConfig( + "default" to SparklyPaperWorldConfig(
+ skipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer = true,
+ SparklyPaperWorldConfig.TickRates( + SparklyPaperWorldConfig.TickRates(
+ farmWhenMoisturised = 1 + farmWhenMoisturised = 1
+ ) + )
@@ -281,10 +282,10 @@ index 0000000000000000000000000000000000000000..fbbb11c1a62a28a251c35261fb29e626
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt diff --git a/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..190954d4533e53247f9a4af878a08ce96eee2ebd index 0000000000000000000000000000000000000000..1b0851f6c66910773f99e9a6c6a99abc90164f51
--- /dev/null --- /dev/null
+++ b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt +++ b/src/main/kotlin/net/sparklypower/sparklypaper/configs/SparklyPaperWorldConfig.kt
@@ -0,0 +1,16 @@ @@ -0,0 +1,18 @@
+package net.sparklypower.sparklypaper.configs +package net.sparklypower.sparklypaper.configs
+ +
+import kotlinx.serialization.SerialName +import kotlinx.serialization.SerialName
@@ -292,6 +293,8 @@ index 0000000000000000000000000000000000000000..190954d4533e53247f9a4af878a08ce9
+ +
+@Serializable +@Serializable
+class SparklyPaperWorldConfig( +class SparklyPaperWorldConfig(
+ @SerialName("skip-map-item-data-updates-if-map-does-not-have-craftmaprenderer")
+ val skipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer: Boolean,
+ @SerialName("tick-rates") + @SerialName("tick-rates")
+ val tickRates: TickRates + val tickRates: TickRates
+) { +) {

4
patches/server/0006-Skip-MapItem-update-if-the-map-does-not-have-the-Cra.patch
View File

@@ -9,7 +9,7 @@ Optimizes "image in map" maps, without requiring the map to be locked, which som
This has the disadvantage that the vanilla map data will never be updated while the CraftMapRenderer is not present, but that's not a huuuge problem for us This has the disadvantage that the vanilla map data will never be updated while the CraftMapRenderer is not present, but that's not a huuuge problem for us
diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java diff --git a/src/main/java/net/minecraft/world/item/MapItem.java b/src/main/java/net/minecraft/world/item/MapItem.java
index c368b437597edf7e165326727ae778a69c3fcc83..3d812694c6ca2f211ff4f2bdd4d0c1336652b421 100644 index c368b437597edf7e165326727ae778a69c3fcc83..c54498c662fef50ffb16441e1480f4e048ff99d6 100644
--- a/src/main/java/net/minecraft/world/item/MapItem.java --- a/src/main/java/net/minecraft/world/item/MapItem.java
+++ b/src/main/java/net/minecraft/world/item/MapItem.java +++ b/src/main/java/net/minecraft/world/item/MapItem.java
@@ -333,7 +333,14 @@ public class MapItem extends ComplexItem { @@ -333,7 +333,14 @@ public class MapItem extends ComplexItem {
@@ -18,7 +18,7 @@ index c368b437597edf7e165326727ae778a69c3fcc83..3d812694c6ca2f211ff4f2bdd4d0c133
if (!worldmap.locked && (selected || entity instanceof Player && ((Player) entity).getOffhandItem() == stack)) { if (!worldmap.locked && (selected || entity instanceof Player && ((Player) entity).getOffhandItem() == stack)) {
- this.update(world, entity, worldmap); - this.update(world, entity, worldmap);
+ // SparklyPaper - don't update maps if they don't have the CraftMapRenderer in the render list + // SparklyPaper - don't update maps if they don't have the CraftMapRenderer in the render list
+ if (worldmap.mapView.getRenderers().stream().anyMatch(mapRenderer -> mapRenderer.getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class)) { + if (!world.sparklyPaperConfig.getSkipMapItemDataUpdatesIfMapDoesNotHaveCraftMapRenderer() || worldmap.mapView.getRenderers().stream().anyMatch(mapRenderer -> mapRenderer.getClass() == org.bukkit.craftbukkit.map.CraftMapRenderer.class)) {
+ this.update(world, entity, worldmap); + this.update(world, entity, worldmap);
+ } else { + } else {
+ if (entity instanceof Player) + if (entity instanceof Player)