Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-26 20:16:02 +01:00
Code Issues Projects Releases Wiki Activity

update handlers

Browse Source
This commit is contained in:
creeper123123321 2018-05-31 17:20:41 -03:00
parent 067da7e1d9
commit 2ea42eab62
No known key found for this signature in database
GPG Key ID: 0AC57D54786721D1
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/BannerHandler.java
View File

@ -8,11 +8,11 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEnt
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
public class BannerHandler implements BlockEntityProvider.BlockEntityHandler { public class BannerHandler implements BlockEntityProvider.BlockEntityHandler {
private final int WALL_BANNER_START = 7020; // 4 each private final int WALL_BANNER_START = 7092; // 4 each
private final int WALL_BANNER_STOP = 7083; private final int WALL_BANNER_STOP = 7155;
private final int BANNER_START = 6764; // 16 each private final int BANNER_START = 6836; // 16 each
private final int BANNER_STOP = 7019; private final int BANNER_STOP = 7091;
@Override @Override
public int transform(UserConnection user, CompoundTag tag) { public int transform(UserConnection user, CompoundTag tag) {

2
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/BedHandler.java
View File

@ -20,7 +20,7 @@ public class BedHandler implements BlockEntityProvider.BlockEntityHandler {
} }
// RED_BED + FIRST_BED // RED_BED + FIRST_BED
int blockId = storage.get(position).getOriginal() - 882 + 658; int blockId = storage.get(position).getOriginal() - 954 + 730;
int color = (int) tag.get("color").getValue(); int color = (int) tag.get("color").getValue();
blockId += (color * 16); blockId += (color * 16);

44
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/FlowerPotHandler.java
View File

@ -12,28 +12,28 @@ public class FlowerPotHandler implements BlockEntityProvider.BlockEntityHandler
private static final Map<Pair<String, Integer>, Integer> flowers = new ConcurrentHashMap<>(); private static final Map<Pair<String, Integer>, Integer> flowers = new ConcurrentHashMap<>();
static { static {
register("minecraft:air", 0, 5175); register("minecraft:air", 0, 5247);
register("minecraft:sapling", 0, 5176); register("minecraft:sapling", 0, 5248);
register("minecraft:sapling", 1, 5177); register("minecraft:sapling", 1, 5249);
register("minecraft:sapling", 2, 5178); register("minecraft:sapling", 2, 5250);
register("minecraft:sapling", 3, 5179); register("minecraft:sapling", 3, 5251);
register("minecraft:sapling", 4, 5180); register("minecraft:sapling", 4, 5252);
register("minecraft:sapling", 5, 5181); register("minecraft:sapling", 5, 5253);
register("minecraft:tallgrass", 2, 5182); register("minecraft:tallgrass", 2, 5254);
register("minecraft:yellow_flower", 0, 5183); register("minecraft:yellow_flower", 0, 5255);
register("minecraft:red_flower", 0, 5184); register("minecraft:red_flower", 0, 5256);
register("minecraft:red_flower", 1, 5185); register("minecraft:red_flower", 1, 5257);
register("minecraft:red_flower", 2, 5186); register("minecraft:red_flower", 2, 5258);
register("minecraft:red_flower", 3, 5187); register("minecraft:red_flower", 3, 5259);
register("minecraft:red_flower", 4, 5188); register("minecraft:red_flower", 4, 5260);
register("minecraft:red_flower", 5, 5189); register("minecraft:red_flower", 5, 5261);
register("minecraft:red_flower", 6, 5190); register("minecraft:red_flower", 6, 5262);
register("minecraft:red_flower", 7, 5191); register("minecraft:red_flower", 7, 5263);
register("minecraft:red_flower", 8, 5192); register("minecraft:red_flower", 8, 5264);
register("minecraft:red_mushroom", 0, 5193); register("minecraft:red_mushroom", 0, 5265);
register("minecraft:brown_mushroom", 0, 5194); register("minecraft:brown_mushroom", 0, 5266);
register("minecraft:deadbush", 0, 5195); register("minecraft:deadbush", 0, 5267);
register("minecraft:cactus", 0, 5196); register("minecraft:cactus", 0, 5268);
} }

4
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/providers/blockentities/SkullHandler.java
View File

@ -8,8 +8,8 @@ import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.providers.BlockEnt
import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage; import us.myles.ViaVersion.protocols.protocolsnapshotto1_12_2.storage.BlockStorage;
public class SkullHandler implements BlockEntityProvider.BlockEntityHandler { public class SkullHandler implements BlockEntityProvider.BlockEntityHandler {
private final int SKULL_WALL_START = 5357; private final int SKULL_WALL_START = 5429;
private final int SKULL_END = 5476; private final int SKULL_END = 5548;
@Override @Override
public int transform(UserConnection user, CompoundTag tag) { public int transform(UserConnection user, CompoundTag tag) {
BlockStorage storage = user.get(BlockStorage.class); BlockStorage storage = user.get(BlockStorage.class);

10
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/storage/BlockStorage.java
View File

@ -17,24 +17,24 @@ public class BlockStorage extends StoredObject {
static { static {
// Flower pots // Flower pots
whitelist.add(5175); whitelist.add(5247);
// Add those red beds // Add those red beds
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
whitelist.add(882 + i); whitelist.add(954 + i);
// Add the white banners // Add the white banners
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
whitelist.add(6764 + i); whitelist.add(6836 + i);
// Add the white wall banners // Add the white wall banners
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
whitelist.add(7020 + i); whitelist.add(7092 + i);
} }
// Skeleton skulls // Skeleton skulls
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
whitelist.add(5357 + i); whitelist.add(5429 + i);
} }
private Map<Position, ReplacementData> blocks = new ConcurrentHashMap<>(); private Map<Position, ReplacementData> blocks = new ConcurrentHashMap<>();