Update to Minecraft 1.21

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2024-06-14 01:05:00 +10:00
parent 7c6204e1a9
commit eed041d629
255 changed files with 3585 additions and 3261 deletions

View File

@@ -18,7 +18,7 @@
public class WorldMap extends PersistentBase {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -66,6 +77,13 @@
@@ -67,6 +78,13 @@
private final Map<String, WorldMapFrame> frameMarkers = Maps.newHashMap();
private int trackedDecorationCount;
@@ -32,7 +32,7 @@
public static PersistentBase.a<WorldMap> factory() {
return new PersistentBase.a<>(() -> {
throw new IllegalStateException("Should never create an empty map saved data");
@@ -81,6 +99,10 @@
@@ -82,6 +100,10 @@
this.unlimitedTracking = flag1;
this.locked = flag2;
this.setDirty();
@@ -43,7 +43,7 @@
}
public static WorldMap createFresh(double d0, double d1, byte b0, boolean flag, boolean flag1, ResourceKey<World> resourcekey) {
@@ -98,12 +120,30 @@
@@ -99,12 +121,30 @@
}
public static WorldMap load(NBTTagCompound nbttagcompound, HolderLookup.a holderlookup_a) {
@@ -77,7 +77,7 @@
});
int i = nbttagcompound.getInt("xCenter");
int j = nbttagcompound.getInt("zCenter");
@@ -128,7 +168,8 @@
@@ -129,7 +169,8 @@
MapIconBanner mapiconbanner = (MapIconBanner) iterator.next();
worldmap.bannerMarkers.put(mapiconbanner.getId(), mapiconbanner);
@@ -87,7 +87,7 @@
}
NBTTagList nbttaglist = nbttagcompound.getList("frames", 10);
@@ -147,13 +188,32 @@
@@ -148,13 +189,32 @@
@Override
public NBTTagCompound save(NBTTagCompound nbttagcompound, HolderLookup.a holderlookup_a) {
@@ -121,7 +121,7 @@
nbttagcompound.putInt("xCenter", this.centerX);
nbttagcompound.putInt("zCenter", this.centerZ);
nbttagcompound.putByte("scale", this.scale);
@@ -408,7 +468,7 @@
@@ -409,7 +469,7 @@
if (!this.isTrackedCountOverLimit(256)) {
this.bannerMarkers.put(mapiconbanner.getId(), mapiconbanner);
@@ -130,7 +130,7 @@
return true;
}
}
@@ -514,7 +574,7 @@
@@ -519,7 +579,7 @@
this.player = entityhuman;
}
@@ -139,7 +139,7 @@
int i = this.minDirtyX;
int j = this.minDirtyY;
int k = this.maxDirtyX + 1 - this.minDirtyX;
@@ -523,7 +583,7 @@
@@ -528,7 +588,7 @@
for (int i1 = 0; i1 < k; ++i1) {
for (int j1 = 0; j1 < l; ++j1) {
@@ -148,7 +148,7 @@
}
}
@@ -533,19 +593,29 @@
@@ -538,19 +598,29 @@
@Nullable
Packet<?> nextUpdatePacket(MapId mapid) {
WorldMap.b worldmap_b;