From 97cd7810a3bb4701b09fb8f868412fdba44d0767 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Wed, 7 Apr 2021 15:03:29 +1000 Subject: [PATCH] Add mc-dev imports By: md_5 --- .../nbt/NBTCompressedStreamTools.patch | 7 ++ .../net/minecraft/nbt/NBTTagByteArray.patch | 7 ++ .../net/minecraft/nbt/NBTTagIntArray.patch | 7 ++ .../game/PacketPlayInBlockPlace.patch | 7 ++ .../protocol/game/PacketPlayInChat.patch | 7 ++ .../protocol/game/PacketPlayInUseItem.patch | 7 ++ .../protocol/game/PacketPlayOutChat.patch | 7 ++ .../PacketHandshakingInSetProtocol.patch | 7 ++ .../server/AdvancementDataWorld.patch | 7 ++ .../server/players/GameProfileBanEntry.patch | 7 ++ .../minecraft/server/players/UserCache.patch | 16 ++++ .../stats/ServerStatisticManager.patch | 26 ++++++ .../ai/attributes/GenericAttributes.patch | 15 ++++ .../world/entity/animal/EntitySquid.patch | 7 ++ .../minecraft/world/item/ItemDebugStick.patch | 16 ++++ .../world/level/StructureManager.patch | 7 ++ .../level/block/entity/TileEntitySkull.patch | 7 ++ .../world/level/block/state/BlockBase.patch | 7 ++ .../world/level/chunk/NibbleArray.patch | 7 ++ .../level/chunk/storage/RegionFile.patch | 81 +++++++++++++++++++ .../level/levelgen/StructureSettings.patch | 49 +++++++++++ 21 files changed, 308 insertions(+) create mode 100644 paper-server/nms-patches/net/minecraft/nbt/NBTCompressedStreamTools.patch create mode 100644 paper-server/nms-patches/net/minecraft/nbt/NBTTagByteArray.patch create mode 100644 paper-server/nms-patches/net/minecraft/nbt/NBTTagIntArray.patch create mode 100644 paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch create mode 100644 paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch create mode 100644 paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch create mode 100644 paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch create mode 100644 paper-server/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch create mode 100644 paper-server/nms-patches/net/minecraft/server/AdvancementDataWorld.patch create mode 100644 paper-server/nms-patches/net/minecraft/server/players/GameProfileBanEntry.patch create mode 100644 paper-server/nms-patches/net/minecraft/server/players/UserCache.patch create mode 100644 paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/GenericAttributes.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySquid.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/item/ItemDebugStick.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/StructureManager.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/block/state/BlockBase.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/chunk/NibbleArray.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFile.patch create mode 100644 paper-server/nms-patches/net/minecraft/world/level/levelgen/StructureSettings.patch diff --git a/paper-server/nms-patches/net/minecraft/nbt/NBTCompressedStreamTools.patch b/paper-server/nms-patches/net/minecraft/nbt/NBTCompressedStreamTools.patch new file mode 100644 index 0000000000..b6bc218ccd --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/nbt/NBTCompressedStreamTools.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/nbt/NBTCompressedStreamTools.java ++++ b/net/minecraft/nbt/NBTCompressedStreamTools.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.nbt; + + import java.io.BufferedInputStream; diff --git a/paper-server/nms-patches/net/minecraft/nbt/NBTTagByteArray.patch b/paper-server/nms-patches/net/minecraft/nbt/NBTTagByteArray.patch new file mode 100644 index 0000000000..1bd3e4dac0 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/nbt/NBTTagByteArray.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/nbt/NBTTagByteArray.java ++++ b/net/minecraft/nbt/NBTTagByteArray.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.nbt; + + import java.io.DataInput; diff --git a/paper-server/nms-patches/net/minecraft/nbt/NBTTagIntArray.patch b/paper-server/nms-patches/net/minecraft/nbt/NBTTagIntArray.patch new file mode 100644 index 0000000000..d62cce3d11 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/nbt/NBTTagIntArray.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/nbt/NBTTagIntArray.java ++++ b/net/minecraft/nbt/NBTTagIntArray.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.nbt; + + import java.io.DataInput; diff --git a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch new file mode 100644 index 0000000000..167ba7ae84 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java ++++ b/net/minecraft/network/protocol/game/PacketPlayInBlockPlace.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import java.io.IOException; diff --git a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch new file mode 100644 index 0000000000..b232aca43c --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInChat.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayInChat.java ++++ b/net/minecraft/network/protocol/game/PacketPlayInChat.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import java.io.IOException; diff --git a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch new file mode 100644 index 0000000000..89b95bdab7 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayInUseItem.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayInUseItem.java ++++ b/net/minecraft/network/protocol/game/PacketPlayInUseItem.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import java.io.IOException; diff --git a/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch new file mode 100644 index 0000000000..912f8c201a --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/network/protocol/game/PacketPlayOutChat.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/game/PacketPlayOutChat.java ++++ b/net/minecraft/network/protocol/game/PacketPlayOutChat.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.game; + + import java.io.IOException; diff --git a/paper-server/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch b/paper-server/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch new file mode 100644 index 0000000000..2b804a2096 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java ++++ b/net/minecraft/network/protocol/handshake/PacketHandshakingInSetProtocol.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.network.protocol.handshake; + + import java.io.IOException; diff --git a/paper-server/nms-patches/net/minecraft/server/AdvancementDataWorld.patch b/paper-server/nms-patches/net/minecraft/server/AdvancementDataWorld.patch new file mode 100644 index 0000000000..7ec05282d9 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/server/AdvancementDataWorld.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/server/AdvancementDataWorld.java ++++ b/net/minecraft/server/AdvancementDataWorld.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.server; + + import com.google.common.collect.Maps; diff --git a/paper-server/nms-patches/net/minecraft/server/players/GameProfileBanEntry.patch b/paper-server/nms-patches/net/minecraft/server/players/GameProfileBanEntry.patch new file mode 100644 index 0000000000..ccd98b70e1 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/server/players/GameProfileBanEntry.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/server/players/GameProfileBanEntry.java ++++ b/net/minecraft/server/players/GameProfileBanEntry.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.server.players; + + import com.google.gson.JsonObject; diff --git a/paper-server/nms-patches/net/minecraft/server/players/UserCache.patch b/paper-server/nms-patches/net/minecraft/server/players/UserCache.patch new file mode 100644 index 0000000000..a21ba9b681 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/server/players/UserCache.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/server/players/UserCache.java ++++ b/net/minecraft/server/players/UserCache.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.server.players; + + import com.google.common.collect.ImmutableList; +@@ -83,7 +84,7 @@ + } + + public void onProfileLookupFailed(GameProfile gameprofile, Exception exception) { +- atomicreference.set((Object) null); ++ atomicreference.set(null); // CraftBukkit - decompile error + } + }; + diff --git a/paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch b/paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch new file mode 100644 index 0000000000..3b7f07a520 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/stats/ServerStatisticManager.patch @@ -0,0 +1,26 @@ +--- a/net/minecraft/stats/ServerStatisticManager.java ++++ b/net/minecraft/stats/ServerStatisticManager.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.stats; + + import com.google.common.collect.Maps; +@@ -158,13 +159,12 @@ + } + + private Optional> a(StatisticWrapper statisticwrapper, String s) { +- Optional optional = Optional.ofNullable(MinecraftKey.a(s)); +- IRegistry iregistry = statisticwrapper.getRegistry(); ++ // CraftBukkit - decompile error start ++ Optional optional = Optional.ofNullable(MinecraftKey.a(s)); ++ IRegistry iregistry = statisticwrapper.getRegistry(); + +- iregistry.getClass(); +- optional = optional.flatMap(iregistry::getOptional); +- statisticwrapper.getClass(); +- return optional.map(statisticwrapper::b); ++ return optional.flatMap(iregistry::getOptional).map(statisticwrapper::b); ++ // CraftBukkit - decompile error end + } + + private static NBTTagCompound a(JsonObject jsonobject) { diff --git a/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/GenericAttributes.patch b/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/GenericAttributes.patch new file mode 100644 index 0000000000..8c95a657a8 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/entity/ai/attributes/GenericAttributes.patch @@ -0,0 +1,15 @@ +--- a/net/minecraft/world/entity/ai/attributes/GenericAttributes.java ++++ b/net/minecraft/world/entity/ai/attributes/GenericAttributes.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.entity.ai.attributes; + + import net.minecraft.core.IRegistry; +@@ -19,6 +20,6 @@ + public static final AttributeBase JUMP_STRENGTH = a("horse.jump_strength", (new AttributeRanged("attribute.name.horse.jump_strength", 0.7D, 0.0D, 2.0D)).a(true)); + + private static AttributeBase a(String s, AttributeBase attributebase) { +- return (AttributeBase) IRegistry.a(IRegistry.ATTRIBUTE, s, (Object) attributebase); ++ return (AttributeBase) IRegistry.a(IRegistry.ATTRIBUTE, s, attributebase); // CraftBukkit - decompile error + } + } diff --git a/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySquid.patch b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySquid.patch new file mode 100644 index 0000000000..1f845971a0 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/entity/animal/EntitySquid.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/world/entity/animal/EntitySquid.java ++++ b/net/minecraft/world/entity/animal/EntitySquid.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.entity.animal; + + import java.util.Random; diff --git a/paper-server/nms-patches/net/minecraft/world/item/ItemDebugStick.patch b/paper-server/nms-patches/net/minecraft/world/item/ItemDebugStick.patch new file mode 100644 index 0000000000..b0dca5cd60 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/item/ItemDebugStick.patch @@ -0,0 +1,16 @@ +--- a/net/minecraft/world/item/ItemDebugStick.java ++++ b/net/minecraft/world/item/ItemDebugStick.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.item; + + import java.util.Collection; +@@ -91,7 +92,7 @@ + } + + private static > IBlockData a(IBlockData iblockdata, IBlockState iblockstate, boolean flag) { +- return (IBlockData) iblockdata.set(iblockstate, (Comparable) a((Iterable) iblockstate.getValues(), (Object) iblockdata.get(iblockstate), flag)); ++ return (IBlockData) iblockdata.set(iblockstate, a(iblockstate.getValues(), iblockdata.get(iblockstate), flag)); // CraftBukkit - decompile error + } + + private static T a(Iterable iterable, @Nullable T t0, boolean flag) { diff --git a/paper-server/nms-patches/net/minecraft/world/level/StructureManager.patch b/paper-server/nms-patches/net/minecraft/world/level/StructureManager.patch new file mode 100644 index 0000000000..632914fc05 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/StructureManager.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/world/level/StructureManager.java ++++ b/net/minecraft/world/level/StructureManager.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level; + + import com.mojang.datafixers.DataFixUtils; diff --git a/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch new file mode 100644 index 0000000000..8b1853c7b5 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/block/entity/TileEntitySkull.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/world/level/block/entity/TileEntitySkull.java ++++ b/net/minecraft/world/level/block/entity/TileEntitySkull.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level.block.entity; + + import com.google.common.collect.Iterables; diff --git a/paper-server/nms-patches/net/minecraft/world/level/block/state/BlockBase.patch b/paper-server/nms-patches/net/minecraft/world/level/block/state/BlockBase.patch new file mode 100644 index 0000000000..71b68f50bb --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/block/state/BlockBase.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/world/level/block/state/BlockBase.java ++++ b/net/minecraft/world/level/block/state/BlockBase.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level.block.state; + + import com.google.common.collect.ImmutableMap; diff --git a/paper-server/nms-patches/net/minecraft/world/level/chunk/NibbleArray.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/NibbleArray.patch new file mode 100644 index 0000000000..f72b7918a8 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/chunk/NibbleArray.patch @@ -0,0 +1,7 @@ +--- a/net/minecraft/world/level/chunk/NibbleArray.java ++++ b/net/minecraft/world/level/chunk/NibbleArray.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level.chunk; + + import javax.annotation.Nullable; diff --git a/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFile.patch b/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFile.patch new file mode 100644 index 0000000000..025901b8e0 --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/chunk/storage/RegionFile.patch @@ -0,0 +1,81 @@ +--- a/net/minecraft/world/level/chunk/storage/RegionFile.java ++++ b/net/minecraft/world/level/chunk/storage/RegionFile.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level.chunk.storage; + + import com.google.common.annotations.VisibleForTesting; +@@ -51,8 +52,8 @@ + } else { + this.e = path1; + this.h = this.g.asIntBuffer(); +- this.h.limit(1024); +- this.g.position(4096); ++ ((java.nio.Buffer) this.h).limit(1024); // CraftBukkit - decompile error ++ ((java.nio.Buffer) this.g).position(4096); // CraftBukkit - decompile error + this.i = this.g.asIntBuffer(); + if (flag) { + this.dataFile = FileChannel.open(path, StandardOpenOption.CREATE, StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.DSYNC); +@@ -61,7 +62,7 @@ + } + + this.freeSectors.a(0, 2); +- this.g.position(0); ++ ((java.nio.Buffer) this.g).position(0); // CraftBukkit - decompile error + int i = this.dataFile.read(this.g, 0L); + + if (i != -1) { +@@ -116,7 +117,7 @@ + ByteBuffer bytebuffer = ByteBuffer.allocate(l); + + this.dataFile.read(bytebuffer, (long) (j * 4096)); +- bytebuffer.flip(); ++ ((java.nio.Buffer) bytebuffer).flip(); // CraftBukkit - decompile error + if (bytebuffer.remaining() < 5) { + RegionFile.LOGGER.error("Chunk {} header is truncated: expected {} but read {}", chunkcoordintpair, l, bytebuffer.remaining()); + return null; +@@ -214,7 +215,7 @@ + + try { + this.dataFile.read(bytebuffer, (long) (j * 4096)); +- bytebuffer.flip(); ++ ((java.nio.Buffer) bytebuffer).flip(); // CraftBukkit - decompile error + if (bytebuffer.remaining() != 5) { + return false; + } else { +@@ -306,7 +307,7 @@ + + bytebuffer.putInt(1); + bytebuffer.put((byte) (this.f.a() | 128)); +- bytebuffer.flip(); ++ ((java.nio.Buffer) bytebuffer).flip(); // CraftBukkit - decompile error + return bytebuffer; + } + +@@ -316,7 +317,7 @@ + Throwable throwable = null; + + try { +- bytebuffer.position(5); ++ ((java.nio.Buffer) bytebuffer).position(5); // CraftBukkit - decompile error + filechannel.write(bytebuffer); + } catch (Throwable throwable1) { + throwable = throwable1; +@@ -342,7 +343,7 @@ + } + + private void c() throws IOException { +- this.g.position(0); ++ ((java.nio.Buffer) this.g).position(0); // CraftBukkit - decompile error + this.dataFile.write(this.g, 0L); + } + +@@ -378,7 +379,7 @@ + if (i != j) { + ByteBuffer bytebuffer = RegionFile.c.duplicate(); + +- bytebuffer.position(0); ++ ((java.nio.Buffer) bytebuffer).position(0); // CraftBukkit - decompile error + this.dataFile.write(bytebuffer, (long) (j - 1)); + } + diff --git a/paper-server/nms-patches/net/minecraft/world/level/levelgen/StructureSettings.patch b/paper-server/nms-patches/net/minecraft/world/level/levelgen/StructureSettings.patch new file mode 100644 index 0000000000..faf4e3642e --- /dev/null +++ b/paper-server/nms-patches/net/minecraft/world/level/levelgen/StructureSettings.patch @@ -0,0 +1,49 @@ +--- a/net/minecraft/world/level/levelgen/StructureSettings.java ++++ b/net/minecraft/world/level/levelgen/StructureSettings.java +@@ -1,3 +1,4 @@ ++// mc-dev import + package net.minecraft.world.level.levelgen; + + import com.google.common.collect.ImmutableMap; +@@ -22,14 +23,15 @@ + return structuresettings.d; + })).apply(instance, StructureSettings::new); + }); +- public static final ImmutableMap, StructureSettingsFeature> b = ImmutableMap.builder().put(StructureGenerator.VILLAGE, new StructureSettingsFeature(32, 8, 10387312)).put(StructureGenerator.DESERT_PYRAMID, new StructureSettingsFeature(32, 8, 14357617)).put(StructureGenerator.IGLOO, new StructureSettingsFeature(32, 8, 14357618)).put(StructureGenerator.JUNGLE_PYRAMID, new StructureSettingsFeature(32, 8, 14357619)).put(StructureGenerator.SWAMP_HUT, new StructureSettingsFeature(32, 8, 14357620)).put(StructureGenerator.PILLAGER_OUTPOST, new StructureSettingsFeature(32, 8, 165745296)).put(StructureGenerator.STRONGHOLD, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.MONUMENT, new StructureSettingsFeature(32, 5, 10387313)).put(StructureGenerator.ENDCITY, new StructureSettingsFeature(20, 11, 10387313)).put(StructureGenerator.MANSION, new StructureSettingsFeature(80, 20, 10387319)).put(StructureGenerator.BURIED_TREASURE, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.MINESHAFT, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.RUINED_PORTAL, new StructureSettingsFeature(40, 15, 34222645)).put(StructureGenerator.SHIPWRECK, new StructureSettingsFeature(24, 4, 165745295)).put(StructureGenerator.OCEAN_RUIN, new StructureSettingsFeature(20, 8, 14357621)).put(StructureGenerator.BASTION_REMNANT, new StructureSettingsFeature(27, 4, 30084232)).put(StructureGenerator.FORTRESS, new StructureSettingsFeature(27, 4, 30084232)).put(StructureGenerator.NETHER_FOSSIL, new StructureSettingsFeature(2, 1, 14357921)).build(); ++ // CraftBukkit - decompile error ++ public static final ImmutableMap, StructureSettingsFeature> b = ImmutableMap., StructureSettingsFeature>builder().put(StructureGenerator.VILLAGE, new StructureSettingsFeature(32, 8, 10387312)).put(StructureGenerator.DESERT_PYRAMID, new StructureSettingsFeature(32, 8, 14357617)).put(StructureGenerator.IGLOO, new StructureSettingsFeature(32, 8, 14357618)).put(StructureGenerator.JUNGLE_PYRAMID, new StructureSettingsFeature(32, 8, 14357619)).put(StructureGenerator.SWAMP_HUT, new StructureSettingsFeature(32, 8, 14357620)).put(StructureGenerator.PILLAGER_OUTPOST, new StructureSettingsFeature(32, 8, 165745296)).put(StructureGenerator.STRONGHOLD, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.MONUMENT, new StructureSettingsFeature(32, 5, 10387313)).put(StructureGenerator.ENDCITY, new StructureSettingsFeature(20, 11, 10387313)).put(StructureGenerator.MANSION, new StructureSettingsFeature(80, 20, 10387319)).put(StructureGenerator.BURIED_TREASURE, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.MINESHAFT, new StructureSettingsFeature(1, 0, 0)).put(StructureGenerator.RUINED_PORTAL, new StructureSettingsFeature(40, 15, 34222645)).put(StructureGenerator.SHIPWRECK, new StructureSettingsFeature(24, 4, 165745295)).put(StructureGenerator.OCEAN_RUIN, new StructureSettingsFeature(20, 8, 14357621)).put(StructureGenerator.BASTION_REMNANT, new StructureSettingsFeature(27, 4, 30084232)).put(StructureGenerator.FORTRESS, new StructureSettingsFeature(27, 4, 30084232)).put(StructureGenerator.NETHER_FOSSIL, new StructureSettingsFeature(2, 1, 14357921)).build(); + public static final StructureSettingsStronghold c; + private final Map, StructureSettingsFeature> d; + @Nullable + private final StructureSettingsStronghold e; + + public StructureSettings(Optional optional, Map, StructureSettingsFeature> map) { +- this.e = (StructureSettingsStronghold) optional.orElse((Object) null); ++ this.e = (StructureSettingsStronghold) optional.orElse(null); // CraftBukkit - decompile error + this.d = map; + } + +@@ -53,6 +55,15 @@ + } + + static { ++ // CraftBukkit - decompile error start ++ c = new StructureSettingsStronghold(32, 3, 128); ++ ++ for (StructureGenerator structuregenerator : IRegistry.STRUCTURE_FEATURE) { ++ if (!StructureSettings.b.containsKey(structuregenerator)) { ++ throw new IllegalStateException("Structure feature without default settings: " + IRegistry.STRUCTURE_FEATURE.getKey(structuregenerator)); ++ } ++ } ++ /* + Iterator iterator = IRegistry.STRUCTURE_FEATURE.iterator(); + + StructureGenerator structuregenerator; +@@ -67,5 +78,7 @@ + } while (StructureSettings.b.containsKey(structuregenerator)); + + throw new IllegalStateException("Structure feature without default settings: " + IRegistry.STRUCTURE_FEATURE.getKey(structuregenerator)); ++ */ ++ // CraftBukkit - decompile error end + } + }