Skip to content

Commit

Permalink
Merge pull request #636 from ProtocolSupport/mcpe/super-remap-update
Browse files Browse the repository at this point in the history 
Update remaps
  • Loading branch information
@Shevchik
Shevchik committed Aug 13, 2017
2 parents afc2d1b + 60906d8 commit 8e50536
Showing 1 changed file with 64 additions and 64 deletions.
128 changes: 64 additions & 64 deletions src/protocolsupport/protocol/typeremapper/pe/PEDataValues.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package protocolsupport.protocol.typeremapper.pe;

import java.util.EnumMap;

import protocolsupport.protocol.typeremapper.utils.RemappingTable.ArrayBasedIdRemappingTable;
import protocolsupport.protocol.utils.minecraftdata.MinecraftData;
import protocolsupport.protocol.utils.types.NetworkEntityType;

import java.util.EnumMap;

public class PEDataValues {

private static final EnumMap<NetworkEntityType, Integer> livingEntityType = new EnumMap<>(NetworkEntityType.class);
Expand Down Expand Up @@ -119,6 +119,7 @@ private static void registerItemRemap(int from, int to) {
}

static {
// ===[ BLOCKS ]===
// Nether slab -> Quartz slab
registerBlockRemap(44, 7, 44, 6);
registerBlockRemap(44, 14, 44, 15);
Expand All @@ -127,6 +128,9 @@ private static void registerItemRemap(int from, int to) {
registerBlockRemap(44, 6, 44, 7);
registerBlockRemap(44, 15, 44, 14);
registerBlockRemap(43, 6, 44, 7);
// Prismarine data ID mismatch
registerBlockRemap(168, 1, 168, 2);
registerBlockRemap(168, 2, 168, 1);
// Podzol
registerBlockRemap(3, 2, 243, 0);
// Colored Fences
Expand All @@ -135,76 +139,72 @@ private static void registerItemRemap(int from, int to) {
registerBlockRemap(190, 85, 3);
registerBlockRemap(191, 85, 4);
registerBlockRemap(192, 85, 5);
// Concrete
registerBlockRemap(251, 236);
// Concrete Powder
registerBlockRemap(252, 237);
// Chrous Plant
registerBlockRemap(240, 199);
// Observer
registerBlockRemap(218, 251);
// Stained Glass - The block ID already exists in PE but the block apperence isn't implemented yet (1.1.1?)
registerBlockRemap(95, 241);
// ...Glazed Terracota
// Purple
registerBlockRemap(245, 219);
// White
registerBlockRemap(235, 220);
// Orange
registerBlockRemap(236, 221);
// Magenta
registerBlockRemap(237, 222);
// Light Blue
registerBlockRemap(238, 223);
// Yellow
registerBlockRemap(239, 224);
// Lime
registerBlockRemap(240, 225);
// Pink
registerBlockRemap(241, 226);
// Gray
registerBlockRemap(242, 227);
// Light Gray
registerBlockRemap(243, 228);
// Cyan
registerBlockRemap(244, 229);
// Blue
registerBlockRemap(245, 231);
// Brown
registerBlockRemap(247, 232);
// Green
registerBlockRemap(248, 233);
// Red
registerBlockRemap(249, 234);
// Black
registerBlockRemap(250, 235);
// Shulker Box
registerBlockRemap(229, 218);
// End Rod
registerBlockRemap(198, 208);
// Frosted Ice
registerBlockRemap(212, 207);
// Grass Path
registerBlockRemap(208, 198);
// Shulker Boxes
registerBlockRemap(219, 218); // WHITE_SHULKER_BOX
registerBlockRemap(220, 218); // ORANGE_SHULKER_BOX
registerBlockRemap(221, 218); // MAGENTA_SHULKER_BOX
registerBlockRemap(222, 218); // LIGHT_BLUE_SHULKER_BOX
registerBlockRemap(223, 218); // YELLOW_SHULKER_BOX
registerBlockRemap(224, 218); // LIME_SHULKER_BOX
registerBlockRemap(225, 218); // PINK_SHULKER_BOX
registerBlockRemap(226, 218); // GRAY_SHULKER_BOX
registerBlockRemap(227, 218); // SILVER_SHULKER_BOX
registerBlockRemap(228, 218); // CYAN_SHULKER_BOX
registerBlockRemap(229, 218); // PURPLE_SHULKER_BOX
registerBlockRemap(230, 218); // BLUE_SHULKER_BOX
registerBlockRemap(231, 218); // BROWN_SHULKER_BOX
registerBlockRemap(232, 218); // GREEN_SHULKER_BOX
registerBlockRemap(233, 218); // RED_SHULKER_BOX
registerBlockRemap(234, 218); // BLACK_SHULKER_BOX
// Chain Command Block
registerBlockRemap(211, 189);
// Repeating Command Block
registerBlockRemap(210, 188);
// Activator Rail
registerBlockRemap(157, 126);
// Grass Path
registerBlockRemap(208, 198);
// Double Wooden Slab
registerBlockRemap(125, 157);
// Dropper
registerBlockRemap(158, 125);
// Beetroot
registerBlockRemap(207, 244);
// Structure Block
registerBlockRemap(255, 252);
registerBlockRemap(126, 157);

registerBlockRemap(95, 241); // STAINED_GLASS
registerBlockRemap(157, 126); // ACTIVATOR_RAIL
registerBlockRemap(158, 125); // DROPPER
registerBlockRemap(198, 208); // END_ROD
registerBlockRemap(199, 240); // CHORUS_PLANT
registerBlockRemap(207, 244); // BEETROOT_BLOCK
registerBlockRemap(208, 198); // GRASS_PATH
registerBlockRemap(212, 207); // FROSTED_ICE
registerBlockRemap(218, 251); // OBSERVER
registerBlockRemap(235, 220); // WHITE_GLAZED_TERRACOTTA
registerBlockRemap(236, 221); // ORANGE_GLAZED_TERRACOTTA
registerBlockRemap(237, 222); // MAGENTA_GLAZED_TERRACOTTA
registerBlockRemap(238, 223); // LIGHT_BLUE_GLAZED_TERRACOTTA
registerBlockRemap(239, 224); // YELLOW_GLAZED_TERRACOTTA
registerBlockRemap(240, 225); // LIME_GLAZED_TERRACOTTA
registerBlockRemap(241, 226); // PINK_GLAZED_TERRACOTTA
registerBlockRemap(242, 227); // GRAY_GLAZED_TERRACOTTA
registerBlockRemap(243, 228); // SILVER_GLAZED_TERRACOTTA
registerBlockRemap(244, 229); // CYAN_GLAZED_TERRACOTTA
registerBlockRemap(245, 219); // PURPLE_GLAZED_TERRACOTTA
registerBlockRemap(246, 231); // BLUE_GLAZED_TERRACOTTA
registerBlockRemap(247, 232); // BROWN_GLAZED_TERRACOTTA
registerBlockRemap(248, 233); // GREEN_GLAZED_TERRACOTTA
registerBlockRemap(249, 234); // RED_GLAZED_TERRACOTTA
registerBlockRemap(250, 235); // BLACK_GLAZED_TERRACOTTA
registerBlockRemap(251, 236); // CONCRETE
registerBlockRemap(255, 252); // STRUCTURE_BLOCK

// Armor Stand
registerItemRemap(416, 425);
// Banner
registerItemRemap(425, 446);
// ===[ ITEMS ]===
registerItemRemap(410, 422); // PRISMARINE_CRYSTALS
registerItemRemap(416, 425); // ARMOR_STAND
registerItemRemap(425, 446); // BANNER
registerItemRemap(434, 457); // BEETROOT
registerItemRemap(435, 458); // BEETROOT_SEEDS
registerItemRemap(436, 459); // BEETROOT_SOUP
registerItemRemap(443, 444); // ELYTRA
registerItemRemap(449, 450); // TOTEM
registerItemRemap(450, 445); // SHULKER_SHELL
// Records
registerItemRemap(2256, 500);
registerItemRemap(2257, 501);
Expand Down

0 comments on commit 8e50536

Please sign in to comment.