--- a/net/minecraft/server/DispenserRegistry.java +++ b/net/minecraft/server/DispenserRegistry.java @@ -30,7 +30,14 @@ import net.minecraft.world.level.block.state.BlockBase; import org.slf4j.Logger; -@SuppressForbidden(a = "System.out setup") +// CraftBukkit start +import java.util.Map; +import net.minecraft.util.datafix.fixes.DataConverterFlattenData; +import net.minecraft.util.datafix.fixes.DataConverterMaterialId; +import net.minecraft.util.datafix.fixes.DataConverterSpawnEgg; + +@SuppressForbidden(reason = "System.out setup") +// CraftBukkit end public class DispenserRegistry { public static final PrintStream STDOUT = System.out; @@ -42,6 +49,23 @@ public static void bootStrap() { if (!DispenserRegistry.isBootstrapped) { + // CraftBukkit start + String name = DispenserRegistry.class.getSimpleName(); + switch (name) { + case "DispenserRegistry": + break; + case "Bootstrap": + System.err.println("***************************************************************************"); + System.err.println("*** WARNING: This server jar may only be used for development purposes. ***"); + System.err.println("***************************************************************************"); + break; + default: + System.err.println("**********************************************************************"); + System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***"); + System.err.println("**********************************************************************"); + break; + } + // CraftBukkit end DispenserRegistry.isBootstrapped = true; Instant instant = Instant.now(); @@ -61,6 +85,69 @@ wrapStreams(); DispenserRegistry.bootstrapDuration.set(Duration.between(instant, Instant.now()).toMillis()); } + // CraftBukkit start - easier than fixing the decompile + DataConverterFlattenData.register(1008, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "0")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "0"))); + DataConverterFlattenData.register(1009, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "1")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "1"))); + DataConverterFlattenData.register(1010, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "2")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "2"))); + DataConverterFlattenData.register(1011, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "3")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "3"))); + DataConverterFlattenData.register(1012, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "4")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "4"))); + DataConverterFlattenData.register(1013, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "5")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "5"))); + DataConverterFlattenData.register(1014, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "6")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "6"))); + DataConverterFlattenData.register(1015, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "7")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "7"))); + DataConverterFlattenData.register(1016, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "8")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "8"))); + DataConverterFlattenData.register(1017, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "9")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "9"))); + DataConverterFlattenData.register(1018, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "10")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "10"))); + DataConverterFlattenData.register(1019, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "11")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "11"))); + DataConverterFlattenData.register(1020, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "12")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "12"))); + DataConverterFlattenData.register(1021, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "13")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "13"))); + DataConverterFlattenData.register(1022, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "14")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "14"))); + DataConverterFlattenData.register(1023, DataConverterFlattenData.create("minecraft:oak_sign", Map.of("rotation", "15")), DataConverterFlattenData.create("minecraft:standing_sign", Map.of("rotation", "15"))); + DataConverterMaterialId.ITEM_NAMES.put(323, "minecraft:oak_sign"); + + DataConverterFlattenData.register(1440, DataConverterFlattenData.create("minecraft:portal", Map.of("axis", "x")), DataConverterFlattenData.create("minecraft:portal", Map.of("axis", "x"))); + + DataConverterMaterialId.ITEM_NAMES.put(409, "minecraft:prismarine_shard"); + DataConverterMaterialId.ITEM_NAMES.put(410, "minecraft:prismarine_crystals"); + DataConverterMaterialId.ITEM_NAMES.put(411, "minecraft:rabbit"); + DataConverterMaterialId.ITEM_NAMES.put(412, "minecraft:cooked_rabbit"); + DataConverterMaterialId.ITEM_NAMES.put(413, "minecraft:rabbit_stew"); + DataConverterMaterialId.ITEM_NAMES.put(414, "minecraft:rabbit_foot"); + DataConverterMaterialId.ITEM_NAMES.put(415, "minecraft:rabbit_hide"); + DataConverterMaterialId.ITEM_NAMES.put(416, "minecraft:armor_stand"); + + DataConverterMaterialId.ITEM_NAMES.put(423, "minecraft:mutton"); + DataConverterMaterialId.ITEM_NAMES.put(424, "minecraft:cooked_mutton"); + DataConverterMaterialId.ITEM_NAMES.put(425, "minecraft:banner"); + DataConverterMaterialId.ITEM_NAMES.put(426, "minecraft:end_crystal"); + DataConverterMaterialId.ITEM_NAMES.put(427, "minecraft:spruce_door"); + DataConverterMaterialId.ITEM_NAMES.put(428, "minecraft:birch_door"); + DataConverterMaterialId.ITEM_NAMES.put(429, "minecraft:jungle_door"); + DataConverterMaterialId.ITEM_NAMES.put(430, "minecraft:acacia_door"); + DataConverterMaterialId.ITEM_NAMES.put(431, "minecraft:dark_oak_door"); + DataConverterMaterialId.ITEM_NAMES.put(432, "minecraft:chorus_fruit"); + DataConverterMaterialId.ITEM_NAMES.put(433, "minecraft:chorus_fruit_popped"); + DataConverterMaterialId.ITEM_NAMES.put(434, "minecraft:beetroot"); + DataConverterMaterialId.ITEM_NAMES.put(435, "minecraft:beetroot_seeds"); + DataConverterMaterialId.ITEM_NAMES.put(436, "minecraft:beetroot_soup"); + DataConverterMaterialId.ITEM_NAMES.put(437, "minecraft:dragon_breath"); + DataConverterMaterialId.ITEM_NAMES.put(438, "minecraft:splash_potion"); + DataConverterMaterialId.ITEM_NAMES.put(439, "minecraft:spectral_arrow"); + DataConverterMaterialId.ITEM_NAMES.put(440, "minecraft:tipped_arrow"); + DataConverterMaterialId.ITEM_NAMES.put(441, "minecraft:lingering_potion"); + DataConverterMaterialId.ITEM_NAMES.put(442, "minecraft:shield"); + DataConverterMaterialId.ITEM_NAMES.put(443, "minecraft:elytra"); + DataConverterMaterialId.ITEM_NAMES.put(444, "minecraft:spruce_boat"); + DataConverterMaterialId.ITEM_NAMES.put(445, "minecraft:birch_boat"); + DataConverterMaterialId.ITEM_NAMES.put(446, "minecraft:jungle_boat"); + DataConverterMaterialId.ITEM_NAMES.put(447, "minecraft:acacia_boat"); + DataConverterMaterialId.ITEM_NAMES.put(448, "minecraft:dark_oak_boat"); + DataConverterMaterialId.ITEM_NAMES.put(449, "minecraft:totem_of_undying"); + DataConverterMaterialId.ITEM_NAMES.put(450, "minecraft:shulker_shell"); + DataConverterMaterialId.ITEM_NAMES.put(452, "minecraft:iron_nugget"); + DataConverterMaterialId.ITEM_NAMES.put(453, "minecraft:knowledge_book"); + + DataConverterSpawnEgg.ID_TO_ENTITY[23] = "Arrow"; + // CraftBukkit end } } }