mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 08:27:43 +01:00
Explorer Map API
This commit is contained in:
committed by
granny
parent
48b276623c
commit
e8d65f8764
@@ -1,23 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
||||||
Date: Wed, 5 Jul 2023 12:48:08 -0500
|
|
||||||
Subject: [PATCH] Explorer Map API
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/src/main/java/org/bukkit/map/MapRenderer.java b/src/main/java/org/bukkit/map/MapRenderer.java
|
|
||||||
index cb7040876a99a5a7e49b81684ef0f3b79584c376..22d8f31b1b8a5dbb5ab3275068642937c097abfe 100644
|
|
||||||
--- a/src/main/java/org/bukkit/map/MapRenderer.java
|
|
||||||
+++ b/src/main/java/org/bukkit/map/MapRenderer.java
|
|
||||||
@@ -54,4 +54,12 @@ public abstract class MapRenderer {
|
|
||||||
*/
|
|
||||||
public abstract void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player);
|
|
||||||
|
|
||||||
+ // Purpur - start
|
|
||||||
+ /**
|
|
||||||
+ * Check if this is an explorer (aka treasure) map.
|
|
||||||
+ *
|
|
||||||
+ * @return True if explorer map
|
|
||||||
+ */
|
|
||||||
+ public abstract boolean isExplorerMap();
|
|
||||||
+ // Purpur - end
|
|
||||||
}
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: William Blake Galbreath <blake.galbreath@gmail.com>
|
|
||||||
Date: Wed, 5 Jul 2023 12:48:15 -0500
|
|
||||||
Subject: [PATCH] Explorer Map API
|
|
||||||
|
|
||||||
|
|
||||||
diff --git a/net/minecraft/world/item/MapItem.java b/net/minecraft/world/item/MapItem.java
|
|
||||||
index 8ff50a4c7461bbd9f469d503f6b5ee482d2463d7..5c0a46c11003b6e154195a8ef299416cc73eae33 100644
|
|
||||||
--- a/net/minecraft/world/item/MapItem.java
|
|
||||||
+++ b/net/minecraft/world/item/MapItem.java
|
|
||||||
@@ -194,6 +194,7 @@ public class MapItem extends Item {
|
|
||||||
public static void renderBiomePreviewMap(ServerLevel world, ItemStack map) {
|
|
||||||
MapItemSavedData mapItemSavedData = getSavedData(map, world);
|
|
||||||
if (mapItemSavedData != null) {
|
|
||||||
+ mapItemSavedData.isExplorerMap = true; // Purpur
|
|
||||||
if (world.dimension() == mapItemSavedData.dimension) {
|
|
||||||
int i = 1 << mapItemSavedData.scale;
|
|
||||||
int j = mapItemSavedData.centerX;
|
|
||||||
diff --git a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
|
|
||||||
index ae321b3b8d98e42ef07fd1f0f738c1a2b428f6db..26da9e7c25ef6a89482838010d8ed6bcf8c87511 100644
|
|
||||||
--- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
|
|
||||||
+++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
|
|
||||||
@@ -81,6 +81,7 @@ public class MapItemSavedData extends SavedData {
|
|
||||||
private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
|
|
||||||
private int trackedDecorationCount;
|
|
||||||
private org.bukkit.craftbukkit.map.RenderData vanillaRender = new org.bukkit.craftbukkit.map.RenderData(); // Paper
|
|
||||||
+ public boolean isExplorerMap; // Purpur
|
|
||||||
|
|
||||||
// CraftBukkit start
|
|
||||||
public final CraftMapView mapView;
|
|
||||||
diff --git a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
|
|
||||||
index cf0920e5f84b35647882fb963e9972af4e8427e0..e30c851acf49a425cd4fd409a6d5bbb2ff836e0e 100644
|
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
|
|
||||||
+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
|
|
||||||
@@ -49,4 +49,10 @@ public class CraftMapRenderer extends MapRenderer {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+ // Purpur - start
|
|
||||||
+ @Override
|
|
||||||
+ public boolean isExplorerMap() {
|
|
||||||
+ return this.worldMap.isExplorerMap;
|
|
||||||
+ }
|
|
||||||
+ // Purpur - end
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
--- a/src/main/java/org/bukkit/map/MapRenderer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/map/MapRenderer.java
|
||||||
|
@@ -54,4 +_,12 @@
|
||||||
|
*/
|
||||||
|
public abstract void render(@NotNull MapView map, @NotNull MapCanvas canvas, @NotNull Player player);
|
||||||
|
|
||||||
|
+ // Purpur - start - Explorer Map API
|
||||||
|
+ /**
|
||||||
|
+ * Check if this is an explorer (aka treasure) map.
|
||||||
|
+ *
|
||||||
|
+ * @return True if explorer map
|
||||||
|
+ */
|
||||||
|
+ public abstract boolean isExplorerMap();
|
||||||
|
+ // Purpur - end - Explorer Map API
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/world/item/MapItem.java
|
||||||
|
+++ b/net/minecraft/world/item/MapItem.java
|
||||||
|
@@ -196,6 +_,7 @@
|
||||||
|
public static void renderBiomePreviewMap(ServerLevel serverLevel, ItemStack stack) {
|
||||||
|
MapItemSavedData savedData = getSavedData(stack, serverLevel);
|
||||||
|
if (savedData != null) {
|
||||||
|
+ savedData.isExplorerMap = true; // Purpur - Explorer Map API
|
||||||
|
if (serverLevel.dimension() == savedData.dimension) {
|
||||||
|
int i = 1 << savedData.scale;
|
||||||
|
int i1 = savedData.centerX;
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
|
||||||
|
+++ b/net/minecraft/world/level/saveddata/maps/MapItemSavedData.java
|
||||||
|
@@ -68,6 +_,7 @@
|
||||||
|
public final Map<String, MapDecoration> decorations = Maps.newLinkedHashMap();
|
||||||
|
private final Map<String, MapFrame> frameMarkers = Maps.newHashMap();
|
||||||
|
private int trackedDecorationCount;
|
||||||
|
+ public boolean isExplorerMap; // Purpur - Explorer Map API
|
||||||
|
|
||||||
|
// CraftBukkit start
|
||||||
|
public final org.bukkit.craftbukkit.map.CraftMapView mapView;
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
--- a/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
|
||||||
|
+++ b/src/main/java/org/bukkit/craftbukkit/map/CraftMapRenderer.java
|
||||||
|
@@ -49,4 +_,10 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Purpur start - Explorer Map API
|
||||||
|
+ @Override
|
||||||
|
+ public boolean isExplorerMap() {
|
||||||
|
+ return this.worldMap.isExplorerMap;
|
||||||
|
+ }
|
||||||
|
+ // Purpur end - Explorer Map API
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user