Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-12-23 17:08:15 +01:00
Code Issues Projects Releases Wiki Activity

convert numerical ids to string ids on canplaceon/candestroy

Browse Source
This commit is contained in:
creeper123123321 2019-03-21 17:48:14 -03:00
parent b0c2d6f71c
commit c5e0fcae9a
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
3 changed files with 287 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/BlockIdData.java
View File

@ -13,6 +13,7 @@ import java.util.Map;
public class BlockIdData {
public static Map<String, String[]> blockIdMapping;
public static Map<String, String[]> fallbackReverseMapping;
public static Map<Integer, String> numberIdToString;
public static void init() {
InputStream stream = MappingData.class.getClassLoader()
@ -39,5 +40,22 @@ public class BlockIdData {
// Ignored
}
}
InputStream blockS = MappingData.class.getClassLoader()
.getResourceAsStream("assets/viaversion/data/blockNumberToString1.12.json");
InputStreamReader blockR = new InputStreamReader(blockS);
try {
numberIdToString = new HashMap<>((Map<Integer, String>) GsonUtil.getGson().fromJson(
blockR,
new TypeToken<Map<Integer, String>>() {
}.getType()
));
} finally {
try {
blockR.close();
} catch (IOException ignored) {
// Ignored
}
}
}
}

19
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
View File

@ -4,6 +4,7 @@ import com.github.steveice10.opennbt.conversion.ConverterRegistry;
import com.github.steveice10.opennbt.tag.builtin.*;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
import com.google.common.primitives.Ints;
import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.minecraft.item.Item;
@ -388,9 +389,12 @@ public class InventoryPackets {
tag.put(ConverterRegistry.convertToTag(NBT_TAG_NAME + "|CanPlaceOn", ConverterRegistry.convertToValue(old))); // There will be data losing
for (Tag oldTag : old) {
Object value = oldTag.getValue();
String[] newValues = BlockIdData.blockIdMapping.get(value instanceof String
? ((String) value).replace("minecraft:", "")
: null);
String oldId = value.toString().replace("minecraft:", "");
String numberConverted = BlockIdData.numberIdToString.get(Ints.tryParse(oldId));
if (numberConverted != null) {
oldId = numberConverted;
}
String[] newValues = BlockIdData.blockIdMapping.get(oldId);
if (newValues != null) {
for (String newValue : newValues) {
newCanPlaceOn.add(new StringTag("", newValue));
@ -407,9 +411,12 @@ public class InventoryPackets {
tag.put(ConverterRegistry.convertToTag(NBT_TAG_NAME + "|CanDestroy", ConverterRegistry.convertToValue(old))); // There will be data losing
for (Tag oldTag : old) {
Object value = oldTag.getValue();
String[] newValues = BlockIdData.blockIdMapping.get(value instanceof String
? ((String) value).replace("minecraft:", "")
: null);
String oldId = value.toString().replace("minecraft:", "");
String numberConverted = BlockIdData.numberIdToString.get(Ints.tryParse(oldId));
if (numberConverted != null) {
oldId = numberConverted;
}
String[] newValues = BlockIdData.blockIdMapping.get(oldId);
if (newValues != null) {
for (String newValue : newValues) {
newCanDestroy.add(new StringTag("", newValue));

256
common/src/main/resources/assets/viaversion/data/blockNumberToString1.12.json Normal file
View File

@ -0,0 +1,256 @@
{
"0": "air",
"1": "stone",
"2": "grass",
"3": "dirt",
"4": "cobblestone",
"5": "planks",
"6": "sapling",
"7": "bedrock",
"8": "flowing_water",
"9": "water",
"10": "flowing_lava",
"11": "lava",
"12": "sand",
"13": "gravel",
"14": "gold_ore",
"15": "iron_ore",
"16": "coal_ore",
"17": "log",
"18": "leaves",
"19": "sponge",
"20": "glass",
"21": "lapis_ore",
"22": "lapis_block",
"23": "dispenser",
"24": "sandstone",
"25": "noteblock",
"26": "bed",
"27": "golden_rail",
"28": "detector_rail",
"29": "sticky_piston",
"30": "web",
"31": "tallgrass",
"32": "deadbush",
"33": "piston",
"34": "piston_head",
"35": "wool",
"36": "piston_extension",
"37": "yellow_flower",
"38": "red_flower",
"39": "brown_mushroom",
"40": "red_mushroom",
"41": "gold_block",
"42": "iron_block",
"43": "double_stone_slab",
"44": "stone_slab",
"45": "brick_block",
"46": "tnt",
"47": "bookshelf",
"48": "mossy_cobblestone",
"49": "obsidian",
"50": "torch",
"51": "fire",
"52": "mob_spawner",
"53": "oak_stairs",
"54": "chest",
"55": "redstone_wire",
"56": "diamond_ore",
"57": "diamond_block",
"58": "crafting_table",
"59": "wheat",
"60": "farmland",
"61": "furnace",
"62": "lit_furnace",
"63": "standing_sign",
"64": "wooden_door",
"65": "ladder",
"66": "rail",
"67": "stone_stairs",
"68": "wall_sign",
"69": "lever",
"70": "stone_pressure_plate",
"71": "iron_door",
"72": "wooden_pressure_plate",
"73": "redstone_ore",
"74": "lit_redstone_ore",
"75": "unlit_redstone_torch",
"76": "redstone_torch",
"77": "stone_button",
"78": "snow_layer",
"79": "ice",
"80": "snow",
"81": "cactus",
"82": "clay",
"83": "reeds",
"84": "jukebox",
"85": "fence",
"86": "pumpkin",
"87": "netherrack",
"88": "soul_sand",
"89": "glowstone",
"90": "portal",
"91": "lit_pumpkin",
"92": "cake",
"93": "unpowered_repeater",
"94": "powered_repeater",
"95": "stained_glass",
"96": "trapdoor",
"97": "monster_egg",
"98": "stonebrick",
"99": "brown_mushroom_block",
"100": "red_mushroom_block",
"101": "iron_bars",
"102": "glass_pane",
"103": "melon_block",
"104": "pumpkin_stem",
"105": "melon_stem",
"106": "vine",
"107": "fence_gate",
"108": "brick_stairs",
"109": "stone_brick_stairs",
"110": "mycelium",
"111": "waterlily",
"112": "nether_brick",
"113": "nether_brick_fence",
"114": "nether_brick_stairs",
"115": "nether_wart",
"116": "enchanting_table",
"117": "brewing_stand",
"118": "cauldron",
"119": "end_portal",
"120": "end_portal_frame",
"121": "end_stone",
"122": "dragon_egg",
"123": "redstone_lamp",
"124": "lit_redstone_lamp",
"125": "double_wooden_slab",
"126": "wooden_slab",
"127": "cocoa",
"128": "sandstone_stairs",
"129": "emerald_ore",
"130": "ender_chest",
"131": "tripwire_hook",
"132": "tripwire",
"133": "emerald_block",
"134": "spruce_stairs",
"135": "birch_stairs",
"136": "jungle_stairs",
"137": "command_block",
"138": "beacon",
"139": "cobblestone_wall",
"140": "flower_pot",
"141": "carrots",
"142": "potatoes",
"143": "wooden_button",
"144": "skull",
"145": "anvil",
"146": "trapped_chest",
"147": "light_weighted_pressure_plate",
"148": "heavy_weighted_pressure_plate",
"149": "unpowered_comparator",
"150": "powered_comparator",
"151": "daylight_detector",
"152": "redstone_block",
"153": "quartz_ore",
"154": "hopper",
"155": "quartz_block",
"156": "quartz_stairs",
"157": "activator_rail",
"158": "dropper",
"159": "stained_hardened_clay",
"160": "stained_glass_pane",
"161": "leaves2",
"162": "log2",
"163": "acacia_stairs",
"164": "dark_oak_stairs",
"165": "slime",
"166": "barrier",
"167": "iron_trapdoor",
"168": "prismarine",
"169": "sea_lantern",
"170": "hay_block",
"171": "carpet",
"172": "hardened_clay",
"173": "coal_block",
"174": "packed_ice",
"175": "double_plant",
"176": "standing_banner",
"177": "wall_banner",
"178": "daylight_detector_inverted",
"179": "red_sandstone",
"180": "red_sandstone_stairs",
"181": "double_stone_slab2",
"182": "stone_slab2",
"183": "spruce_fence_gate",
"184": "birch_fence_gate",
"185": "jungle_fence_gate",
"186": "dark_oak_fence_gate",
"187": "acacia_fence_gate",
"188": "spruce_fence",
"189": "birch_fence",
"190": "jungle_fence",
"191": "dark_oak_fence",
"192": "acacia_fence",
"193": "spruce_door",
"194": "birch_door",
"195": "jungle_door",
"196": "acacia_door",
"197": "dark_oak_door",
"198": "end_rod",
"199": "chorus_plant",
"200": "chorus_flower",
"201": "purpur_block",
"202": "purpur_pillar",
"203": "purpur_stairs",
"204": "purpur_double_slab",
"205": "purpur_slab",
"206": "end_bricks",
"207": "beetroots",
"208": "grass_path",
"209": "end_gateway",
"210": "repeating_command_block",
"211": "chain_command_block",
"212": "frosted_ice",
"213": "magma",
"214": "nether_wart_block",
"215": "red_nether_brick",
"216": "bone_block",
"217": "structure_void",
"218": "observer",
"219": "white_shulker_box",
"220": "orange_shulker_box",
"221": "magenta_shulker_box",
"222": "light_blue_shulker_box",
"223": "yellow_shulker_box",
"224": "lime_shulker_box",
"225": "pink_shulker_box",
"226": "gray_shulker_box",
"227": "silver_shulker_box",
"228": "cyan_shulker_box",
"229": "purple_shulker_box",
"230": "blue_shulker_box",
"231": "brown_shulker_box",
"232": "green_shulker_box",
"233": "red_shulker_box",
"234": "black_shulker_box",
"235": "white_glazed_terracotta",
"236": "orange_glazed_terracotta",
"237": "magenta_glazed_terracotta",
"238": "light_blue_glazed_terracotta",
"239": "yellow_glazed_terracotta",
"240": "lime_glazed_terracotta",
"241": "pink_glazed_terracotta",
"242": "gray_glazed_terracotta",
"243": "silver_glazed_terracotta",
"244": "cyan_glazed_terracotta",
"245": "purple_glazed_terracotta",
"246": "blue_glazed_terracotta",
"247": "brown_glazed_terracotta",
"248": "green_glazed_terracotta",
"249": "red_glazed_terracotta",
"250": "black_glazed_terracotta",
"251": "concrete",
"252": "concrete_powder",
"255": "structure_block"
}