mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-12-22 14:34:59 +01:00
More item changes, remove/deprecate more tooltier usages, change stored map colors
This commit is contained in:
onebeastchris
parent
5162aeb9b3
commit
84faeba4b2
6 changed files with 295 additions and 305 deletions
|
|
@ -112,6 +112,7 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
|
|||
return toolType;
|
||||
}
|
||||
|
||||
@SuppressWarnings("removal")
|
||||
@Override
|
||||
public String toolTier() {
|
||||
return toolTier;
|
||||
|
|
@ -132,6 +133,7 @@ public final class GeyserNonVanillaCustomItemData extends GeyserCustomItemData i
|
|||
return translationString;
|
||||
}
|
||||
|
||||
@SuppressWarnings("removal")
|
||||
@Override
|
||||
public Set<String> repairMaterials() {
|
||||
return repairMaterials;
|
||||
|
|
|
|||
|
|
@ -43,7 +43,9 @@ import org.geysermc.geyser.item.type.FireworkStarItem;
|
|||
import org.geysermc.geyser.item.type.FishingRodItem;
|
||||
import org.geysermc.geyser.item.type.GoatHornItem;
|
||||
import org.geysermc.geyser.item.type.Item;
|
||||
import org.geysermc.geyser.item.type.LightItem;
|
||||
import org.geysermc.geyser.item.type.MapItem;
|
||||
import org.geysermc.geyser.item.type.OminousBottleItem;
|
||||
import org.geysermc.geyser.item.type.PlayerHeadItem;
|
||||
import org.geysermc.geyser.item.type.PotionItem;
|
||||
import org.geysermc.geyser.item.type.ShieldItem;
|
||||
|
|
@ -295,8 +297,8 @@ public final class Items {
|
|||
public static final Item RED_WOOL = register(new BlockItem(builder(), Blocks.RED_WOOL));
|
||||
public static final Item BLACK_WOOL = register(new BlockItem(builder(), Blocks.BLACK_WOOL));
|
||||
public static final Item DANDELION = register(new BlockItem(builder(), Blocks.DANDELION));
|
||||
// TODO public static final Item OPEN_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.OPEN_EYEBLOSSOM));
|
||||
// TODO public static final Item CLOSED_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.CLOSED_EYEBLOSSOM));
|
||||
public static final Item OPEN_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.OPEN_EYEBLOSSOM));
|
||||
public static final Item CLOSED_EYEBLOSSOM = register(new BlockItem(builder(), Blocks.CLOSED_EYEBLOSSOM));
|
||||
public static final Item POPPY = register(new BlockItem(builder(), Blocks.POPPY));
|
||||
public static final Item BLUE_ORCHID = register(new BlockItem(builder(), Blocks.BLUE_ORCHID));
|
||||
public static final Item ALLIUM = register(new BlockItem(builder(), Blocks.ALLIUM));
|
||||
|
|
@ -445,13 +447,13 @@ public final class Items {
|
|||
public static final Item MELON = register(new BlockItem(builder(), Blocks.MELON));
|
||||
public static final Item VINE = register(new BlockItem(builder(), Blocks.VINE));
|
||||
public static final Item GLOW_LICHEN = register(new BlockItem(builder(), Blocks.GLOW_LICHEN));
|
||||
//TODO public static final Item RESIN_CLUMP = register(new BlockItem(builder(), Blocks.RESIN_CLUMP));
|
||||
//TODO public static final Item RESIN_BLOCK = register(new BlockItem(builder(), Blocks.RESIN_BLOCK));
|
||||
//TODO public static final Item RESIN_BRICKS = register(new BlockItem(builder(), Blocks.RESIN_BRICKS));
|
||||
//TODO public static final Item RESIN_BRICK_STAIRS = register(new BlockItem(builder(), Blocks.RESIN_BRICK_STAIRS));
|
||||
//TODO public static final Item RESIN_BRICK_SLAB = register(new BlockItem(builder(), Blocks.RESIN_BRICK_SLAB));
|
||||
//TODO public static final Item RESIN_BRICK_WALL = register(new BlockItem(builder(), Blocks.RESIN_BRICK_WALL));
|
||||
//TODO public static final Item CHISELED_RESIN_BRICKS = register(new BlockItem(builder(), Blocks.CHISELED_RESIN_BRICKS));
|
||||
public static final Item RESIN_CLUMP = register(new BlockItem(builder(), Blocks.RESIN_CLUMP));
|
||||
public static final Item RESIN_BLOCK = register(new BlockItem(builder(), Blocks.RESIN_BLOCK));
|
||||
public static final Item RESIN_BRICKS = register(new BlockItem(builder(), Blocks.RESIN_BRICKS));
|
||||
public static final Item RESIN_BRICK_STAIRS = register(new BlockItem(builder(), Blocks.RESIN_BRICK_STAIRS));
|
||||
public static final Item RESIN_BRICK_SLAB = register(new BlockItem(builder(), Blocks.RESIN_BRICK_SLAB));
|
||||
public static final Item RESIN_BRICK_WALL = register(new BlockItem(builder(), Blocks.RESIN_BRICK_WALL));
|
||||
public static final Item CHISELED_RESIN_BRICKS = register(new BlockItem(builder(), Blocks.CHISELED_RESIN_BRICKS));
|
||||
public static final Item BRICK_STAIRS = register(new BlockItem(builder(), Blocks.BRICK_STAIRS));
|
||||
public static final Item STONE_BRICK_STAIRS = register(new BlockItem(builder(), Blocks.STONE_BRICK_STAIRS));
|
||||
public static final Item MUD_BRICK_STAIRS = register(new BlockItem(builder(), Blocks.MUD_BRICK_STAIRS));
|
||||
|
|
@ -536,7 +538,7 @@ public final class Items {
|
|||
public static final Item RED_TERRACOTTA = register(new BlockItem(builder(), Blocks.RED_TERRACOTTA));
|
||||
public static final Item BLACK_TERRACOTTA = register(new BlockItem(builder(), Blocks.BLACK_TERRACOTTA));
|
||||
public static final Item BARRIER = register(new BlockItem(builder(), Blocks.BARRIER));
|
||||
public static final Item LIGHT = register(new BlockItem(builder(), Blocks.LIGHT));
|
||||
public static final Item LIGHT = register(new LightItem(builder(), Blocks.LIGHT));
|
||||
public static final Item HAY_BLOCK = register(new BlockItem(builder(), Blocks.HAY_BLOCK));
|
||||
public static final Item WHITE_CARPET = register(new BlockItem(builder(), Blocks.WHITE_CARPET));
|
||||
public static final Item ORANGE_CARPET = register(new BlockItem(builder(), Blocks.ORANGE_CARPET));
|
||||
|
|
@ -894,10 +896,10 @@ public final class Items {
|
|||
public static final Item BAMBOO_CHEST_RAFT = register(new BoatItem("bamboo_chest_raft", builder()));
|
||||
public static final Item STRUCTURE_BLOCK = register(new BlockItem(builder(), Blocks.STRUCTURE_BLOCK));
|
||||
public static final Item JIGSAW = register(new BlockItem(builder(), Blocks.JIGSAW));
|
||||
public static final Item TURTLE_HELMET = register(new ArmorItem("turtle_helmet", ArmorMaterial.TURTLE, builder()));
|
||||
public static final Item TURTLE_HELMET = register(new ArmorItem("turtle_helmet", builder()));
|
||||
public static final Item TURTLE_SCUTE = register(new Item("turtle_scute", builder()));
|
||||
public static final Item ARMADILLO_SCUTE = register(new Item("armadillo_scute", builder()));
|
||||
public static final Item WOLF_ARMOR = register(new WolfArmorItem("wolf_armor", ArmorMaterial.ARMADILLO, builder()));
|
||||
public static final Item WOLF_ARMOR = register(new WolfArmorItem("wolf_armor", builder()));
|
||||
public static final Item FLINT_AND_STEEL = register(new Item("flint_and_steel", builder()));
|
||||
public static final Item BOWL = register(new Item("bowl", builder()));
|
||||
public static final Item APPLE = register(new Item("apple", builder()));
|
||||
|
|
@ -956,30 +958,30 @@ public final class Items {
|
|||
public static final Item WHEAT_SEEDS = register(new BlockItem("wheat_seeds", builder(), Blocks.WHEAT));
|
||||
public static final Item WHEAT = register(new Item("wheat", builder()));
|
||||
public static final Item BREAD = register(new Item("bread", builder()));
|
||||
public static final Item LEATHER_HELMET = register(new DyeableArmorItem("leather_helmet", ArmorMaterial.LEATHER, builder()));
|
||||
public static final Item LEATHER_CHESTPLATE = register(new DyeableArmorItem("leather_chestplate", ArmorMaterial.LEATHER, builder()));
|
||||
public static final Item LEATHER_LEGGINGS = register(new DyeableArmorItem("leather_leggings", ArmorMaterial.LEATHER, builder()));
|
||||
public static final Item LEATHER_BOOTS = register(new DyeableArmorItem("leather_boots", ArmorMaterial.LEATHER, builder()));
|
||||
public static final Item CHAINMAIL_HELMET = register(new ArmorItem("chainmail_helmet", ArmorMaterial.CHAINMAIL, builder()));
|
||||
public static final Item CHAINMAIL_CHESTPLATE = register(new ArmorItem("chainmail_chestplate", ArmorMaterial.CHAINMAIL, builder()));
|
||||
public static final Item CHAINMAIL_LEGGINGS = register(new ArmorItem("chainmail_leggings", ArmorMaterial.CHAINMAIL, builder()));
|
||||
public static final Item CHAINMAIL_BOOTS = register(new ArmorItem("chainmail_boots", ArmorMaterial.CHAINMAIL, builder()));
|
||||
public static final Item IRON_HELMET = register(new ArmorItem("iron_helmet", ArmorMaterial.IRON, builder()));
|
||||
public static final Item IRON_CHESTPLATE = register(new ArmorItem("iron_chestplate", ArmorMaterial.IRON, builder()));
|
||||
public static final Item IRON_LEGGINGS = register(new ArmorItem("iron_leggings", ArmorMaterial.IRON, builder()));
|
||||
public static final Item IRON_BOOTS = register(new ArmorItem("iron_boots", ArmorMaterial.IRON, builder()));
|
||||
public static final Item DIAMOND_HELMET = register(new ArmorItem("diamond_helmet", ArmorMaterial.DIAMOND, builder()));
|
||||
public static final Item DIAMOND_CHESTPLATE = register(new ArmorItem("diamond_chestplate", ArmorMaterial.DIAMOND, builder()));
|
||||
public static final Item DIAMOND_LEGGINGS = register(new ArmorItem("diamond_leggings", ArmorMaterial.DIAMOND, builder()));
|
||||
public static final Item DIAMOND_BOOTS = register(new ArmorItem("diamond_boots", ArmorMaterial.DIAMOND, builder()));
|
||||
public static final Item GOLDEN_HELMET = register(new ArmorItem("golden_helmet", ArmorMaterial.GOLD, builder()));
|
||||
public static final Item GOLDEN_CHESTPLATE = register(new ArmorItem("golden_chestplate", ArmorMaterial.GOLD, builder()));
|
||||
public static final Item GOLDEN_LEGGINGS = register(new ArmorItem("golden_leggings", ArmorMaterial.GOLD, builder()));
|
||||
public static final Item GOLDEN_BOOTS = register(new ArmorItem("golden_boots", ArmorMaterial.GOLD, builder()));
|
||||
public static final Item NETHERITE_HELMET = register(new ArmorItem("netherite_helmet", ArmorMaterial.NETHERITE, builder()));
|
||||
public static final Item NETHERITE_CHESTPLATE = register(new ArmorItem("netherite_chestplate", ArmorMaterial.NETHERITE, builder()));
|
||||
public static final Item NETHERITE_LEGGINGS = register(new ArmorItem("netherite_leggings", ArmorMaterial.NETHERITE, builder()));
|
||||
public static final Item NETHERITE_BOOTS = register(new ArmorItem("netherite_boots", ArmorMaterial.NETHERITE, builder()));
|
||||
public static final Item LEATHER_HELMET = register(new DyeableArmorItem("leather_helmet", builder()));
|
||||
public static final Item LEATHER_CHESTPLATE = register(new DyeableArmorItem("leather_chestplate", builder()));
|
||||
public static final Item LEATHER_LEGGINGS = register(new DyeableArmorItem("leather_leggings", builder()));
|
||||
public static final Item LEATHER_BOOTS = register(new DyeableArmorItem("leather_boots", builder()));
|
||||
public static final Item CHAINMAIL_HELMET = register(new ArmorItem("chainmail_helmet", builder()));
|
||||
public static final Item CHAINMAIL_CHESTPLATE = register(new ArmorItem("chainmail_chestplate", builder()));
|
||||
public static final Item CHAINMAIL_LEGGINGS = register(new ArmorItem("chainmail_leggings", builder()));
|
||||
public static final Item CHAINMAIL_BOOTS = register(new ArmorItem("chainmail_boots", builder()));
|
||||
public static final Item IRON_HELMET = register(new ArmorItem("iron_helmet", builder()));
|
||||
public static final Item IRON_CHESTPLATE = register(new ArmorItem("iron_chestplate", builder()));
|
||||
public static final Item IRON_LEGGINGS = register(new ArmorItem("iron_leggings", builder()));
|
||||
public static final Item IRON_BOOTS = register(new ArmorItem("iron_boots", builder()));
|
||||
public static final Item DIAMOND_HELMET = register(new ArmorItem("diamond_helmet", builder()));
|
||||
public static final Item DIAMOND_CHESTPLATE = register(new ArmorItem("diamond_chestplate", builder()));
|
||||
public static final Item DIAMOND_LEGGINGS = register(new ArmorItem("diamond_leggings", builder()));
|
||||
public static final Item DIAMOND_BOOTS = register(new ArmorItem("diamond_boots", builder()));
|
||||
public static final Item GOLDEN_HELMET = register(new ArmorItem("golden_helmet", builder()));
|
||||
public static final Item GOLDEN_CHESTPLATE = register(new ArmorItem("golden_chestplate", builder()));
|
||||
public static final Item GOLDEN_LEGGINGS = register(new ArmorItem("golden_leggings", builder()));
|
||||
public static final Item GOLDEN_BOOTS = register(new ArmorItem("golden_boots", builder()));
|
||||
public static final Item NETHERITE_HELMET = register(new ArmorItem("netherite_helmet", builder()));
|
||||
public static final Item NETHERITE_CHESTPLATE = register(new ArmorItem("netherite_chestplate", builder()));
|
||||
public static final Item NETHERITE_LEGGINGS = register(new ArmorItem("netherite_leggings", builder()));
|
||||
public static final Item NETHERITE_BOOTS = register(new ArmorItem("netherite_boots", builder()));
|
||||
public static final Item FLINT = register(new Item("flint", builder()));
|
||||
public static final Item PORKCHOP = register(new Item("porkchop", builder()));
|
||||
public static final Item COOKED_PORKCHOP = register(new Item("cooked_porkchop", builder()));
|
||||
|
|
@ -1248,7 +1250,7 @@ public final class Items {
|
|||
public static final Item IRON_HORSE_ARMOR = register(new Item("iron_horse_armor", builder()));
|
||||
public static final Item GOLDEN_HORSE_ARMOR = register(new Item("golden_horse_armor", builder()));
|
||||
public static final Item DIAMOND_HORSE_ARMOR = register(new Item("diamond_horse_armor", builder()));
|
||||
public static final Item LEATHER_HORSE_ARMOR = register(new Item("leather_horse_armor", builder()));
|
||||
public static final Item LEATHER_HORSE_ARMOR = register(new DyeableArmorItem("leather_horse_armor", builder()));
|
||||
public static final Item LEAD = register(new Item("lead", builder()));
|
||||
public static final Item NAME_TAG = register(new Item("name_tag", builder()));
|
||||
public static final Item COMMAND_BLOCK_MINECART = register(new Item("command_block_minecart", builder()));
|
||||
|
|
@ -1453,7 +1455,7 @@ public final class Items {
|
|||
public static final Item TRIAL_KEY = register(new Item("trial_key", builder()));
|
||||
public static final Item OMINOUS_TRIAL_KEY = register(new Item("ominous_trial_key", builder()));
|
||||
public static final Item VAULT = register(new BlockItem(builder(), Blocks.VAULT));
|
||||
public static final Item OMINOUS_BOTTLE = register(new Item("ominous_bottle", builder()));
|
||||
public static final Item OMINOUS_BOTTLE = register(new OminousBottleItem("ominous_bottle", builder()));
|
||||
|
||||
public static final int AIR_ID = AIR.javaId();
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import org.geysermc.geyser.session.GeyserSession;
|
|||
import org.geysermc.geyser.translator.item.BedrockItemBuilder;
|
||||
import org.geysermc.mcprotocollib.protocol.data.game.item.component.DataComponents;
|
||||
|
||||
public class WolfArmorItem extends ArmorItem {
|
||||
public class WolfArmorItem extends Item {
|
||||
public WolfArmorItem(String javaIdentifier, Builder builder) {
|
||||
super(javaIdentifier, builder);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,268 +26,261 @@
|
|||
package org.geysermc.geyser.level;
|
||||
|
||||
public enum MapColor {
|
||||
COLOR_0(-1, -1, -1),
|
||||
COLOR_1(-1, -1, -1),
|
||||
COLOR_2(-1, -1, -1),
|
||||
COLOR_3(-1, -1, -1),
|
||||
COLOR_4(39, 125, 89),
|
||||
COLOR_5(48, 153, 109),
|
||||
COLOR_6(56, 178, 127),
|
||||
COLOR_7(29, 94, 67),
|
||||
COLOR_8(115, 164, 174),
|
||||
COLOR_9(140, 201, 213),
|
||||
COLOR_10(163, 233, 247),
|
||||
COLOR_11(86, 123, 130),
|
||||
COLOR_12(140, 140, 140),
|
||||
COLOR_13(171, 171, 171),
|
||||
COLOR_14(199, 199, 199),
|
||||
COLOR_15(105, 105, 105),
|
||||
COLOR_16(0, 0, 180),
|
||||
COLOR_17(0, 0, 220),
|
||||
COLOR_18(0, 0, 255),
|
||||
COLOR_19(0, 0, 135),
|
||||
COLOR_20(180, 112, 112),
|
||||
COLOR_21(220, 138, 138),
|
||||
COLOR_22(255, 160, 160),
|
||||
COLOR_23(135, 84, 84),
|
||||
COLOR_24(117, 117, 117),
|
||||
COLOR_25(144, 144, 144),
|
||||
COLOR_26(167, 167, 167),
|
||||
COLOR_27(88, 88, 88),
|
||||
COLOR_28(0, 87, 0),
|
||||
COLOR_29(0, 106, 0),
|
||||
COLOR_30(0, 124, 0),
|
||||
COLOR_31(0, 65, 0),
|
||||
COLOR_32(180, 180, 180),
|
||||
COLOR_33(220, 220, 220),
|
||||
COLOR_34(255, 255, 255),
|
||||
COLOR_35(135, 135, 135),
|
||||
COLOR_36(129, 118, 115),
|
||||
COLOR_37(158, 144, 141),
|
||||
COLOR_38(184, 168, 164),
|
||||
COLOR_39(97, 88, 86),
|
||||
COLOR_40(54, 76, 106),
|
||||
COLOR_41(66, 94, 130),
|
||||
COLOR_42(77, 109, 151),
|
||||
COLOR_43(40, 57, 79),
|
||||
COLOR_44(79, 79, 79),
|
||||
COLOR_45(96, 96, 96),
|
||||
COLOR_46(112, 112, 112),
|
||||
COLOR_47(59, 59, 59),
|
||||
COLOR_48(180, 45, 45),
|
||||
COLOR_49(220, 55, 55),
|
||||
COLOR_50(255, 64, 64),
|
||||
COLOR_51(135, 33, 33),
|
||||
COLOR_52(50, 84, 100),
|
||||
COLOR_53(62, 102, 123),
|
||||
COLOR_54(72, 119, 143),
|
||||
COLOR_55(38, 63, 75),
|
||||
COLOR_56(172, 177, 180),
|
||||
COLOR_57(211, 217, 220),
|
||||
COLOR_58(245, 252, 255),
|
||||
COLOR_59(129, 133, 135),
|
||||
COLOR_60(36, 89, 152),
|
||||
COLOR_61(44, 109, 186),
|
||||
COLOR_62(51, 127, 216),
|
||||
COLOR_63(27, 67, 114),
|
||||
COLOR_64(152, 53, 125),
|
||||
COLOR_65(186, 65, 153),
|
||||
COLOR_66(216, 76, 178),
|
||||
COLOR_67(114, 40, 94),
|
||||
COLOR_68(152, 108, 72),
|
||||
COLOR_69(186, 132, 88),
|
||||
COLOR_70(216, 153, 102),
|
||||
COLOR_71(114, 81, 54),
|
||||
COLOR_72(36, 161, 161),
|
||||
COLOR_73(44, 197, 197),
|
||||
COLOR_74(51, 229, 229),
|
||||
COLOR_75(27, 121, 121),
|
||||
COLOR_76(17, 144, 89),
|
||||
COLOR_77(21, 176, 109),
|
||||
COLOR_78(25, 204, 127),
|
||||
COLOR_79(13, 108, 67),
|
||||
COLOR_80(116, 89, 170),
|
||||
COLOR_81(142, 109, 208),
|
||||
COLOR_82(165, 127, 242),
|
||||
COLOR_83(87, 67, 128),
|
||||
COLOR_84(53, 53, 53),
|
||||
COLOR_85(65, 65, 65),
|
||||
COLOR_86(76, 76, 76),
|
||||
COLOR_87(40, 40, 40),
|
||||
COLOR_88(108, 108, 108),
|
||||
COLOR_89(132, 132, 132),
|
||||
COLOR_90(153, 153, 153),
|
||||
COLOR_91(81, 81, 81),
|
||||
COLOR_92(108, 89, 53),
|
||||
COLOR_93(132, 109, 65),
|
||||
COLOR_94(153, 127, 76),
|
||||
COLOR_95(81, 67, 40),
|
||||
COLOR_96(125, 44, 89),
|
||||
COLOR_97(153, 54, 109),
|
||||
COLOR_98(178, 63, 127),
|
||||
COLOR_99(94, 33, 67),
|
||||
COLOR_100(125, 53, 36),
|
||||
COLOR_101(153, 65, 44),
|
||||
COLOR_102(178, 76, 51),
|
||||
COLOR_103(94, 40, 27),
|
||||
COLOR_104(36, 53, 72),
|
||||
COLOR_105(44, 65, 88),
|
||||
COLOR_106(51, 76, 102),
|
||||
COLOR_107(27, 40, 54),
|
||||
COLOR_108(36, 89, 72),
|
||||
COLOR_109(44, 109, 88),
|
||||
COLOR_110(51, 127, 102),
|
||||
COLOR_111(27, 67, 54),
|
||||
COLOR_112(36, 36, 108),
|
||||
COLOR_113(44, 44, 132),
|
||||
COLOR_114(51, 51, 153),
|
||||
COLOR_115(27, 27, 81),
|
||||
COLOR_116(17, 17, 17),
|
||||
COLOR_117(21, 21, 21),
|
||||
COLOR_118(25, 25, 25),
|
||||
COLOR_119(13, 13, 13),
|
||||
COLOR_120(54, 168, 176),
|
||||
COLOR_121(66, 205, 215),
|
||||
COLOR_122(77, 238, 250),
|
||||
COLOR_123(40, 126, 132),
|
||||
COLOR_124(150, 154, 64),
|
||||
COLOR_125(183, 188, 79),
|
||||
COLOR_126(213, 219, 92),
|
||||
COLOR_127(112, 115, 48),
|
||||
COLOR_128(180, 90, 52),
|
||||
COLOR_129(220, 110, 63),
|
||||
COLOR_130(255, 128, 74),
|
||||
COLOR_131(135, 67, 39),
|
||||
COLOR_132(40, 153, 0),
|
||||
COLOR_133(50, 187, 0),
|
||||
COLOR_134(58, 217, 0),
|
||||
COLOR_135(30, 114, 0),
|
||||
COLOR_136(34, 60, 91),
|
||||
COLOR_137(42, 74, 111),
|
||||
COLOR_138(49, 86, 129),
|
||||
COLOR_139(25, 45, 68),
|
||||
COLOR_140(0, 1, 79),
|
||||
COLOR_141(0, 1, 96),
|
||||
COLOR_142(0, 2, 112),
|
||||
COLOR_143(0, 1, 59),
|
||||
COLOR_144(113, 124, 147),
|
||||
COLOR_145(138, 152, 180),
|
||||
COLOR_146(161, 177, 209),
|
||||
COLOR_147(85, 93, 110),
|
||||
COLOR_148(25, 57, 112),
|
||||
COLOR_149(31, 70, 137),
|
||||
COLOR_150(36, 82, 159),
|
||||
COLOR_151(19, 43, 84),
|
||||
COLOR_152(76, 61, 105),
|
||||
COLOR_153(93, 75, 128),
|
||||
COLOR_154(108, 87, 149),
|
||||
COLOR_155(57, 46, 78),
|
||||
COLOR_156(97, 76, 79),
|
||||
COLOR_157(119, 93, 96),
|
||||
COLOR_158(138, 108, 112),
|
||||
COLOR_159(73, 57, 59),
|
||||
COLOR_160(25, 93, 131),
|
||||
COLOR_161(31, 114, 160),
|
||||
COLOR_162(36, 133, 186),
|
||||
COLOR_163(19, 70, 98),
|
||||
COLOR_164(37, 82, 72),
|
||||
COLOR_165(45, 100, 88),
|
||||
COLOR_166(53, 117, 103),
|
||||
COLOR_167(28, 61, 54),
|
||||
COLOR_168(55, 54, 112),
|
||||
COLOR_169(67, 66, 138),
|
||||
COLOR_170(78, 77, 160),
|
||||
COLOR_171(41, 40, 84),
|
||||
COLOR_172(24, 28, 40),
|
||||
COLOR_173(30, 35, 49),
|
||||
COLOR_174(35, 41, 57),
|
||||
COLOR_175(18, 21, 30),
|
||||
COLOR_176(69, 75, 95),
|
||||
COLOR_177(84, 92, 116),
|
||||
COLOR_178(98, 107, 135),
|
||||
COLOR_179(51, 56, 71),
|
||||
COLOR_180(64, 64, 61),
|
||||
COLOR_181(79, 79, 75),
|
||||
COLOR_182(92, 92, 87),
|
||||
COLOR_183(48, 48, 46),
|
||||
COLOR_184(62, 51, 86),
|
||||
COLOR_185(75, 62, 105),
|
||||
COLOR_186(88, 73, 122),
|
||||
COLOR_187(46, 38, 64),
|
||||
COLOR_188(64, 43, 53),
|
||||
COLOR_189(79, 53, 65),
|
||||
COLOR_190(92, 62, 76),
|
||||
COLOR_191(48, 32, 40),
|
||||
COLOR_192(24, 35, 53),
|
||||
COLOR_193(30, 43, 65),
|
||||
COLOR_194(35, 50, 76),
|
||||
COLOR_195(18, 26, 40),
|
||||
COLOR_196(29, 57, 53),
|
||||
COLOR_197(36, 70, 65),
|
||||
COLOR_198(42, 82, 76),
|
||||
COLOR_199(22, 43, 40),
|
||||
COLOR_200(32, 42, 100),
|
||||
COLOR_201(39, 51, 122),
|
||||
COLOR_202(46, 60, 142),
|
||||
COLOR_203(24, 31, 75),
|
||||
COLOR_204(11, 15, 26),
|
||||
COLOR_205(13, 18, 31),
|
||||
COLOR_206(16, 22, 37),
|
||||
COLOR_207(8, 11, 19),
|
||||
COLOR_208(34, 33, 133),
|
||||
COLOR_209(42, 41, 163),
|
||||
COLOR_210(49, 48, 189),
|
||||
COLOR_211(25, 25, 100),
|
||||
COLOR_212(68, 44, 104),
|
||||
COLOR_213(83, 54, 127),
|
||||
COLOR_214(97, 63, 148),
|
||||
COLOR_215(51, 33, 78),
|
||||
COLOR_216(20, 17, 64),
|
||||
COLOR_217(25, 21, 79),
|
||||
COLOR_218(29, 25, 92),
|
||||
COLOR_219(15, 13, 48),
|
||||
COLOR_220(94, 88, 15),
|
||||
COLOR_221(115, 108, 18),
|
||||
COLOR_222(134, 126, 22),
|
||||
COLOR_223(70, 66, 11),
|
||||
COLOR_224(98, 100, 40),
|
||||
COLOR_225(120, 122, 50),
|
||||
COLOR_226(140, 142, 58),
|
||||
COLOR_227(74, 75, 30),
|
||||
COLOR_228(43, 31, 60),
|
||||
COLOR_229(53, 37, 74),
|
||||
COLOR_230(62, 44, 86),
|
||||
COLOR_231(32, 23, 45),
|
||||
COLOR_232(93, 127, 14),
|
||||
COLOR_233(114, 155, 17),
|
||||
COLOR_234(133, 180, 20),
|
||||
COLOR_235(70, 95, 10),
|
||||
COLOR_236(70, 70, 70),
|
||||
COLOR_237(86, 86, 86),
|
||||
COLOR_238(100, 100, 100),
|
||||
COLOR_239(52, 52, 52),
|
||||
COLOR_240(103, 123, 152),
|
||||
COLOR_241(126, 150, 186),
|
||||
COLOR_242(147, 175, 216),
|
||||
COLOR_243(77, 92, 114),
|
||||
COLOR_244(105, 117, 89),
|
||||
COLOR_245(129, 144, 109),
|
||||
COLOR_246(150, 167, 127),
|
||||
COLOR_247(79, 88, 67);
|
||||
COLOR_0(0),
|
||||
COLOR_1(0),
|
||||
COLOR_2(0),
|
||||
COLOR_3(0),
|
||||
COLOR_4(-10912473),
|
||||
COLOR_5(-9594576),
|
||||
COLOR_6(-8408520),
|
||||
COLOR_7(-12362211),
|
||||
COLOR_8(-5331853),
|
||||
COLOR_9(-2766452),
|
||||
COLOR_10(-530013),
|
||||
COLOR_11(-8225962),
|
||||
COLOR_12(-7566196),
|
||||
COLOR_13(-5526613),
|
||||
COLOR_14(-3684409),
|
||||
COLOR_15(-9868951),
|
||||
COLOR_16(-4980736),
|
||||
COLOR_17(-2359296),
|
||||
COLOR_18(-65536),
|
||||
COLOR_19(-7929856),
|
||||
COLOR_20(-9408332),
|
||||
COLOR_21(-7697700),
|
||||
COLOR_22(-6250241),
|
||||
COLOR_23(-11250553),
|
||||
COLOR_24(-9079435),
|
||||
COLOR_25(-7303024),
|
||||
COLOR_26(-5789785),
|
||||
COLOR_27(-10987432),
|
||||
COLOR_28(-16754944),
|
||||
COLOR_29(-16750080),
|
||||
COLOR_30(-16745472),
|
||||
COLOR_31(-16760576),
|
||||
COLOR_32(-4934476),
|
||||
COLOR_33(-2302756),
|
||||
COLOR_34(-1),
|
||||
COLOR_35(-7895161),
|
||||
COLOR_36(-9210239),
|
||||
COLOR_37(-7499618),
|
||||
COLOR_38(-5986120),
|
||||
COLOR_39(-11118495),
|
||||
COLOR_40(-9810890),
|
||||
COLOR_41(-8233406),
|
||||
COLOR_42(-6853299),
|
||||
COLOR_43(-11585240),
|
||||
COLOR_44(-11579569),
|
||||
COLOR_45(-10461088),
|
||||
COLOR_46(-9408400),
|
||||
COLOR_47(-12895429),
|
||||
COLOR_48(-13816396),
|
||||
COLOR_49(-13158436),
|
||||
COLOR_50(-12566273),
|
||||
COLOR_51(-14605945),
|
||||
COLOR_52(-10202062),
|
||||
COLOR_53(-8690114),
|
||||
COLOR_54(-7375032),
|
||||
COLOR_55(-11845850),
|
||||
COLOR_56(-4935252),
|
||||
COLOR_57(-2303533),
|
||||
COLOR_58(-779),
|
||||
COLOR_59(-7895679),
|
||||
COLOR_60(-6792924),
|
||||
COLOR_61(-4559572),
|
||||
COLOR_62(-2588877),
|
||||
COLOR_63(-9288933),
|
||||
COLOR_64(-8571496),
|
||||
COLOR_65(-6733382),
|
||||
COLOR_66(-5092136),
|
||||
COLOR_67(-10606478),
|
||||
COLOR_68(-12030824),
|
||||
COLOR_69(-10976070),
|
||||
COLOR_70(-10053160),
|
||||
COLOR_71(-13217422),
|
||||
COLOR_72(-6184668),
|
||||
COLOR_73(-3816148),
|
||||
COLOR_74(-1710797),
|
||||
COLOR_75(-8816357),
|
||||
COLOR_76(-10907631),
|
||||
COLOR_77(-9588715),
|
||||
COLOR_78(-8401895),
|
||||
COLOR_79(-12358643),
|
||||
COLOR_80(-5613196),
|
||||
COLOR_81(-3117682),
|
||||
COLOR_82(-884827),
|
||||
COLOR_83(-8371369),
|
||||
COLOR_84(-13290187),
|
||||
COLOR_85(-12500671),
|
||||
COLOR_86(-11776948),
|
||||
COLOR_87(-14145496),
|
||||
COLOR_88(-9671572),
|
||||
COLOR_89(-8092540),
|
||||
COLOR_90(-6710887),
|
||||
COLOR_91(-11447983),
|
||||
COLOR_92(-13280916),
|
||||
COLOR_93(-12489340),
|
||||
COLOR_94(-11763815),
|
||||
COLOR_95(-14138543),
|
||||
COLOR_96(-10933123),
|
||||
COLOR_97(-9619815),
|
||||
COLOR_98(-8437838),
|
||||
COLOR_99(-12377762),
|
||||
COLOR_100(-14404227),
|
||||
COLOR_101(-13876839),
|
||||
COLOR_102(-13415246),
|
||||
COLOR_103(-14997410),
|
||||
COLOR_104(-12045020),
|
||||
COLOR_105(-10993364),
|
||||
COLOR_106(-10073037),
|
||||
COLOR_107(-13228005),
|
||||
COLOR_108(-12035804),
|
||||
COLOR_109(-10982100),
|
||||
COLOR_110(-10059981),
|
||||
COLOR_111(-13221093),
|
||||
COLOR_112(-9690076),
|
||||
COLOR_113(-8115156),
|
||||
COLOR_114(-6737101),
|
||||
COLOR_115(-11461861),
|
||||
COLOR_116(-15658735),
|
||||
COLOR_117(-15395563),
|
||||
COLOR_118(-15132391),
|
||||
COLOR_119(-15921907),
|
||||
COLOR_120(-5199818),
|
||||
COLOR_121(-2634430),
|
||||
COLOR_122(-332211),
|
||||
COLOR_123(-8094168),
|
||||
COLOR_124(-12543338),
|
||||
COLOR_125(-11551561),
|
||||
COLOR_126(-10691627),
|
||||
COLOR_127(-13601936),
|
||||
COLOR_128(-13346124),
|
||||
COLOR_129(-12620068),
|
||||
COLOR_130(-11894529),
|
||||
COLOR_131(-14204025),
|
||||
COLOR_132(-16738008),
|
||||
COLOR_133(-16729294),
|
||||
COLOR_134(-16721606),
|
||||
COLOR_135(-16748002),
|
||||
COLOR_136(-10798046),
|
||||
COLOR_137(-9483734),
|
||||
COLOR_138(-8301007),
|
||||
COLOR_139(-12309223),
|
||||
COLOR_140(-11599616),
|
||||
COLOR_141(-10485504),
|
||||
COLOR_142(-9436672),
|
||||
COLOR_143(-12910336),
|
||||
COLOR_144(-7111567),
|
||||
COLOR_145(-4941686),
|
||||
COLOR_146(-3034719),
|
||||
COLOR_147(-9544363),
|
||||
COLOR_148(-9422567),
|
||||
COLOR_149(-7780833),
|
||||
COLOR_150(-6335964),
|
||||
COLOR_151(-11261165),
|
||||
COLOR_152(-9880244),
|
||||
COLOR_153(-8369315),
|
||||
COLOR_154(-6989972),
|
||||
COLOR_155(-11653575),
|
||||
COLOR_156(-11580319),
|
||||
COLOR_157(-10461833),
|
||||
COLOR_158(-9409398),
|
||||
COLOR_159(-12895927),
|
||||
COLOR_160(-8168167),
|
||||
COLOR_161(-6262241),
|
||||
COLOR_162(-4553436),
|
||||
COLOR_163(-10336749),
|
||||
COLOR_164(-12037595),
|
||||
COLOR_165(-10984403),
|
||||
COLOR_166(-9997003),
|
||||
COLOR_167(-13222628),
|
||||
COLOR_168(-9423305),
|
||||
COLOR_169(-7716285),
|
||||
COLOR_170(-6271666),
|
||||
COLOR_171(-11261911),
|
||||
COLOR_172(-14148584),
|
||||
COLOR_173(-13556962),
|
||||
COLOR_174(-13031133),
|
||||
COLOR_175(-14805742),
|
||||
COLOR_176(-10532027),
|
||||
COLOR_177(-9151404),
|
||||
COLOR_178(-7902366),
|
||||
COLOR_179(-12109773),
|
||||
COLOR_180(-12763072),
|
||||
COLOR_181(-11841713),
|
||||
COLOR_182(-11051940),
|
||||
COLOR_183(-13750224),
|
||||
COLOR_184(-11128002),
|
||||
COLOR_185(-9879989),
|
||||
COLOR_186(-8763048),
|
||||
COLOR_187(-12573138),
|
||||
COLOR_188(-13292736),
|
||||
COLOR_189(-12503729),
|
||||
COLOR_190(-11780516),
|
||||
COLOR_191(-14147536),
|
||||
COLOR_192(-13294824),
|
||||
COLOR_193(-12506338),
|
||||
COLOR_194(-11783645),
|
||||
COLOR_195(-14149102),
|
||||
COLOR_196(-13289187),
|
||||
COLOR_197(-12499420),
|
||||
COLOR_198(-11775446),
|
||||
COLOR_199(-14144746),
|
||||
COLOR_200(-10212832),
|
||||
COLOR_201(-8768729),
|
||||
COLOR_202(-7455698),
|
||||
COLOR_203(-11854056),
|
||||
COLOR_204(-15069429),
|
||||
COLOR_205(-14740979),
|
||||
COLOR_206(-14346736),
|
||||
COLOR_207(-15529208),
|
||||
COLOR_208(-8052446),
|
||||
COLOR_209(-6084310),
|
||||
COLOR_210(-4378575),
|
||||
COLOR_211(-10217191),
|
||||
COLOR_212(-9950140),
|
||||
COLOR_213(-8440237),
|
||||
COLOR_214(-7061663),
|
||||
COLOR_215(-11656909),
|
||||
COLOR_216(-12578540),
|
||||
COLOR_217(-11594471),
|
||||
COLOR_218(-10741475),
|
||||
COLOR_219(-13628145),
|
||||
COLOR_220(-15771554),
|
||||
COLOR_221(-15569805),
|
||||
COLOR_222(-15303034),
|
||||
COLOR_223(-16039354),
|
||||
COLOR_224(-14130078),
|
||||
COLOR_225(-13469064),
|
||||
COLOR_226(-12939636),
|
||||
COLOR_227(-14791862),
|
||||
COLOR_228(-12837077),
|
||||
COLOR_229(-11918027),
|
||||
COLOR_230(-11129794),
|
||||
COLOR_231(-13822176),
|
||||
COLOR_232(-15827107),
|
||||
COLOR_233(-15623310),
|
||||
COLOR_234(-15420283),
|
||||
COLOR_235(-16097466),
|
||||
COLOR_236(-12171706),
|
||||
COLOR_237(-11119018),
|
||||
COLOR_238(-10197916),
|
||||
COLOR_239(-13355980),
|
||||
COLOR_240(-6784153),
|
||||
COLOR_241(-4548994),
|
||||
COLOR_242(-2576493),
|
||||
COLOR_243(-9282483),
|
||||
COLOR_244(-10914455),
|
||||
COLOR_245(-9596799),
|
||||
COLOR_246(-8411242),
|
||||
COLOR_247(-12363697);
|
||||
|
||||
private static final MapColor[] VALUES = values();
|
||||
|
||||
private final int value;
|
||||
|
||||
MapColor(int red, int green, int blue) {
|
||||
int alpha = 255;
|
||||
if (red == -1 && green == -1 && blue == -1)
|
||||
alpha = 0; // transparent
|
||||
|
||||
this.value = ((alpha & 0xFF) << 24) |
|
||||
((red & 0xFF) << 16) |
|
||||
((green & 0xFF) << 8) |
|
||||
(blue & 0xFF);
|
||||
MapColor(int value) {
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
public static MapColor fromId(int id) {
|
||||
|
|
@ -297,4 +290,4 @@ public enum MapColor {
|
|||
public int getARGB() {
|
||||
return value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -425,13 +425,7 @@ public class ItemRegistryPopulator {
|
|||
.javaItem(javaItem);
|
||||
|
||||
if (mappingItem.getToolType() != null) {
|
||||
if (mappingItem.getToolTier() != null) {
|
||||
mappingBuilder = mappingBuilder.toolType(mappingItem.getToolType().intern())
|
||||
.toolTier(mappingItem.getToolTier().intern());
|
||||
} else {
|
||||
mappingBuilder = mappingBuilder.toolType(mappingItem.getToolType().intern())
|
||||
.toolTier("");
|
||||
}
|
||||
mappingBuilder = mappingBuilder.toolType(mappingItem.getToolType().intern());
|
||||
}
|
||||
|
||||
if (javaOnlyItems.contains(javaItem) || javaItem.defaultRarity() != Rarity.COMMON) {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,6 @@ public class GeyserMappingItem {
|
|||
Integer firstBlockRuntimeId;
|
||||
Integer lastBlockRuntimeId;
|
||||
@JsonProperty("tool_type") String toolType;
|
||||
@JsonProperty("tool_tier") String toolTier;
|
||||
@JsonProperty("armor_type") String armorType;
|
||||
@JsonProperty("protection_value") int protectionValue;
|
||||
@JsonProperty("is_edible") boolean edible = false;
|
||||
|
|
|
|||
Loading…
Reference in a new issue