Merge branch 'master' into dev
This commit is contained in:
Myles
commit
1be617c110
5
LICENSE
5
LICENSE
|
|
@ -1,9 +1,6 @@
|
|||
License:
|
||||
--------
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) 2017
|
||||
Copyright (c) 2019
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import org.bukkit.event.block.Action;
|
|||
import org.bukkit.event.inventory.InventoryClickEvent;
|
||||
import org.bukkit.event.player.PlayerChangedWorldEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
import org.bukkit.event.player.PlayerItemBreakEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerRespawnEvent;
|
||||
import org.bukkit.inventory.CraftingInventory;
|
||||
|
|
@ -91,6 +92,11 @@ public class ArmorListener extends ViaBukkitListener {
|
|||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onItemBreak(PlayerItemBreakEvent e) {
|
||||
sendDelayedArmorUpdate(e.getPlayer());
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
|
||||
public void onJoin(PlayerJoinEvent e) {
|
||||
sendDelayedArmorUpdate(e.getPlayer());
|
||||
|
|
|
|||
|
|
@ -244,4 +244,9 @@ public class BukkitViaConfig extends Config implements ViaVersionConfig {
|
|||
public boolean isSnowCollisionFix() {
|
||||
return getBoolean("fix-low-snow-collision", false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int get1_13TabCompleteDelay() {
|
||||
return getInt("1_13-tab-complete-delay", 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,9 @@ public class BungeeChannelInitializer extends ChannelInitializer<SocketChannel>
|
|||
new ProtocolPipeline(info);
|
||||
// Add originals
|
||||
this.method.invoke(this.original, socketChannel);
|
||||
|
||||
if (socketChannel.pipeline().get("packet-encoder") == null) return; // Don't inject if no packet-encoder
|
||||
if (socketChannel.pipeline().get("packet-decoder") == null) return; // Don't inject if no packet-decoder
|
||||
// Add our transformers
|
||||
BungeeEncodeHandler encoder = new BungeeEncodeHandler(info);
|
||||
BungeeDecodeHandler decoder = new BungeeDecodeHandler(info);
|
||||
|
|
|
|||
|
|
@ -8,25 +8,27 @@ import net.md_5.bungee.api.plugin.Listener;
|
|||
import net.md_5.bungee.event.EventHandler;
|
||||
import net.md_5.bungee.event.EventPriority;
|
||||
import net.md_5.bungee.protocol.packet.PluginMessage;
|
||||
import us.myles.ViaVersion.api.PacketWrapper;
|
||||
import us.myles.ViaVersion.api.Pair;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.boss.BossBar;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.api.protocol.Protocol;
|
||||
import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
|
||||
import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
|
||||
import us.myles.ViaVersion.api.protocol.ProtocolVersion;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
import us.myles.ViaVersion.bungee.service.ProtocolDetectorService;
|
||||
import us.myles.ViaVersion.bungee.storage.BungeeStorage;
|
||||
import us.myles.ViaVersion.protocols.base.ProtocolInfo;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
|
||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
|
||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class BungeeServerHandler implements Listener {
|
||||
private static Method getHandshake;
|
||||
|
|
@ -86,14 +88,6 @@ public class BungeeServerHandler implements Listener {
|
|||
|
||||
public void checkServerChange(ServerConnectedEvent e, UserConnection user) throws Exception {
|
||||
if (user == null) return;
|
||||
// Manually hide ViaVersion-created BossBars if the childserver was version 1.8.x (#666)
|
||||
if (user.has(EntityTracker.class)) {
|
||||
EntityTracker tracker = user.get(EntityTracker.class);
|
||||
|
||||
if (tracker.getBossBarMap() != null)
|
||||
for (BossBar bar : tracker.getBossBarMap().values())
|
||||
bar.hide();
|
||||
}
|
||||
// Handle server/version change
|
||||
if (user.has(BungeeStorage.class)) {
|
||||
BungeeStorage storage = user.get(BungeeStorage.class);
|
||||
|
|
@ -107,6 +101,18 @@ public class BungeeServerHandler implements Listener {
|
|||
|
||||
int protocolId = ProtocolDetectorService.getProtocolId(serverName);
|
||||
|
||||
if (protocolId <= ProtocolVersion.v1_8.getId()) { // 1.8 doesn't have BossBar packet
|
||||
if (storage.getBossbar() != null) {
|
||||
for (UUID uuid : storage.getBossbar()) {
|
||||
PacketWrapper wrapper = new PacketWrapper(0x0C, null, user);
|
||||
wrapper.write(Type.UUID, uuid);
|
||||
wrapper.write(Type.VAR_INT, 1); // remove
|
||||
wrapper.send(Protocol1_9TO1_8.class, true, true);
|
||||
}
|
||||
storage.getBossbar().clear();
|
||||
}
|
||||
}
|
||||
|
||||
ProtocolInfo info = user.get(ProtocolInfo.class);
|
||||
int previousServerProtocol = info.getServerProtocolVersion();
|
||||
|
||||
|
|
@ -130,41 +136,32 @@ public class BungeeServerHandler implements Listener {
|
|||
|
||||
// Workaround 1.13 server change
|
||||
Object relayMessages = getRelayMessages.invoke(e.getPlayer().getPendingConnection());
|
||||
if (relayMessages instanceof List) {
|
||||
for (Object message : (List) relayMessages) {
|
||||
if (message instanceof PluginMessage) {
|
||||
PluginMessage plMsg = (PluginMessage) message;
|
||||
String channel = plMsg.getTag();
|
||||
if (previousServerProtocol != -1) {
|
||||
if (previousServerProtocol < ProtocolVersion.v1_13.getId()
|
||||
&& protocolId >= ProtocolVersion.v1_13.getId()) {
|
||||
channel = InventoryPackets.getNewPluginChannelId(channel);
|
||||
if (channel.equals("minecraft:register")) {
|
||||
String[] channels = new String(plMsg.getData(), StandardCharsets.UTF_8).split("\0");
|
||||
for (int i = 0; i < channels.length; i++) {
|
||||
channels[i] = InventoryPackets.getNewPluginChannelId(channels[i]);
|
||||
}
|
||||
plMsg.setData(Joiner.on('\0').join(channels).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
} else if (previousServerProtocol >= ProtocolVersion.v1_13.getId()
|
||||
&& protocolId < ProtocolVersion.v1_13.getId()) {
|
||||
channel = InventoryPackets.getOldPluginChannelId(channel);
|
||||
if (channel.equals("REGISTER")) {
|
||||
String[] channels = new String(plMsg.getData(), StandardCharsets.UTF_8).split("\0");
|
||||
for (int i = 0; i < channels.length; i++) {
|
||||
channels[i] = InventoryPackets.getOldPluginChannelId(channels[i]);
|
||||
}
|
||||
plMsg.setData(Joiner.on('\0').join(channels).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
for (Object message : (List) relayMessages) {
|
||||
PluginMessage plMsg = (PluginMessage) message;
|
||||
String channel = plMsg.getTag();
|
||||
int id1_13 = ProtocolVersion.v1_13.getId();
|
||||
if (previousServerProtocol != -1) {
|
||||
if (previousServerProtocol < id1_13 && protocolId >= id1_13) {
|
||||
channel = InventoryPackets.getNewPluginChannelId(channel);
|
||||
if (channel.equals("minecraft:register")) {
|
||||
String[] channels = new String(plMsg.getData(), StandardCharsets.UTF_8).split("\0");
|
||||
for (int i = 0; i < channels.length; i++) {
|
||||
channels[i] = InventoryPackets.getNewPluginChannelId(channels[i]);
|
||||
}
|
||||
plMsg.setData(Joiner.on('\0').join(channels).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
} else if (previousServerProtocol >= id1_13 && protocolId < id1_13) {
|
||||
channel = InventoryPackets.getOldPluginChannelId(channel);
|
||||
if (channel.equals("REGISTER")) {
|
||||
String[] channels = new String(plMsg.getData(), StandardCharsets.UTF_8).split("\0");
|
||||
for (int i = 0; i < channels.length; i++) {
|
||||
channels[i] = InventoryPackets.getOldPluginChannelId(channels[i]);
|
||||
}
|
||||
plMsg.setData(Joiner.on('\0').join(channels).getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
plMsg.setTag(channel);
|
||||
} else {
|
||||
Via.getPlatform().getLogger().warning("relayMessages contains a element that isn't a Handshake " + message);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
Via.getPlatform().getLogger().warning("relayMessages isn't a List! " + relayMessages);
|
||||
plMsg.setTag(channel);
|
||||
}
|
||||
|
||||
user.put(info);
|
||||
|
|
|
|||
|
|
@ -297,4 +297,9 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
|
|||
public boolean isSnowCollisionFix() {
|
||||
return getBoolean("fix-low-snow-collision", false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int get1_13TabCompleteDelay() {
|
||||
return getInt("1_13-tab-complete-delay", 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -302,4 +302,10 @@ public interface ViaVersionConfig {
|
|||
* @return True if enabled
|
||||
*/
|
||||
boolean isSnowCollisionFix();
|
||||
|
||||
/**
|
||||
* When greater than 0, enables tab complete request delaying by x ticks
|
||||
* @return the delay in ticks
|
||||
*/
|
||||
int get1_13TabCompleteDelay();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,11 +67,12 @@ public class NibbleArray {
|
|||
* @param value The desired value
|
||||
*/
|
||||
public void set(int index, int value) {
|
||||
index /= 2;
|
||||
if (index % 2 == 0) {
|
||||
handle[index] = (byte) (handle[index] & 0xF0 | value & 0xF);
|
||||
index /= 2;
|
||||
handle[index] = (byte) ((handle[index] & 0xF0) | (value & 0xF));
|
||||
} else {
|
||||
handle[index] = (byte) (handle[index] & 0xF | (value & 0xF) << 4);
|
||||
index /= 2;
|
||||
handle[index] = (byte) ((handle[index] & 0xF) | ((value & 0xF) << 4));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -98,8 +98,14 @@ public abstract class Protocol {
|
|||
* @param packetRemapper The remapper to use for the packet
|
||||
*/
|
||||
public void registerIncoming(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper) {
|
||||
registerIncoming(state, oldPacketID, newPacketID, packetRemapper, false);
|
||||
}
|
||||
|
||||
public void registerIncoming(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper, boolean override) {
|
||||
ProtocolPacket protocolPacket = new ProtocolPacket(state, oldPacketID, newPacketID, packetRemapper);
|
||||
incoming.put(new Pair<>(state, newPacketID), protocolPacket);
|
||||
Pair<State, Integer> pair = new Pair<>(state, newPacketID);
|
||||
if (!override && incoming.containsKey(pair)) throw new IllegalArgumentException(pair + " already registered");
|
||||
incoming.put(pair, protocolPacket);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -122,8 +128,14 @@ public abstract class Protocol {
|
|||
* @param packetRemapper The remapper to use for the packet
|
||||
*/
|
||||
public void registerOutgoing(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper) {
|
||||
registerOutgoing(state, oldPacketID, newPacketID, packetRemapper, false);
|
||||
}
|
||||
|
||||
public void registerOutgoing(State state, int oldPacketID, int newPacketID, PacketRemapper packetRemapper, boolean override) {
|
||||
ProtocolPacket protocolPacket = new ProtocolPacket(state, oldPacketID, newPacketID, packetRemapper);
|
||||
outgoing.put(new Pair<>(state, oldPacketID), protocolPacket);
|
||||
Pair<State, Integer> pair = new Pair<>(state, oldPacketID);
|
||||
if (!override && outgoing.containsKey(pair)) throw new IllegalArgumentException(pair + " already registered");
|
||||
outgoing.put(pair, protocolPacket);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -98,7 +98,9 @@ public class MetadataRewriter {
|
|||
// Handle AreaEffectCloud outside the loop
|
||||
if (type != null && type.is(Entity1_13Types.EntityType.AREA_EFFECT_CLOUD) && particleId != -1) {
|
||||
Particle particle = ParticleRewriter.rewriteParticle(particleId, new Integer[]{parameter1, parameter2});
|
||||
metadatas.add(new Metadata(9, MetaType1_13.PARTICLE, particle));
|
||||
if (particle != null && particle.getId() != -1) {
|
||||
metadatas.add(new Metadata(9, MetaType1_13.PARTICLE, particle));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -343,7 +343,6 @@ public class Protocol1_13To1_12_2 extends Protocol {
|
|||
registerOutgoing(State.PLAY, 0x1B, 0x1C);
|
||||
// New packet 0x1D - NBT Query
|
||||
registerOutgoing(State.PLAY, 0x1C, 0x1E);
|
||||
registerOutgoing(State.PLAY, 0x1D, 0x1F);
|
||||
registerOutgoing(State.PLAY, 0x1E, 0x20);
|
||||
registerOutgoing(State.PLAY, 0x1F, 0x21);
|
||||
// WorldPackets 0x20 -> 0x22
|
||||
|
|
@ -851,9 +850,15 @@ public class Protocol1_13To1_12_2 extends Protocol {
|
|||
// Fake the end of the packet
|
||||
create(new ValueCreator() {
|
||||
@Override
|
||||
public void write(PacketWrapper wrapper) {
|
||||
public void write(PacketWrapper wrapper) throws Exception {
|
||||
wrapper.write(Type.BOOLEAN, false);
|
||||
wrapper.write(Type.OPTIONAL_POSITION, null);
|
||||
if (!wrapper.isCancelled() && Via.getConfig().get1_13TabCompleteDelay() > 0) {
|
||||
TabCompleteTracker tracker = wrapper.user().get(TabCompleteTracker.class);
|
||||
wrapper.cancel();
|
||||
tracker.setTimeToSend(System.currentTimeMillis() + Via.getConfig().get1_13TabCompleteDelay() * 50);
|
||||
tracker.setLastTabComplete(wrapper.get(Type.STRING, 0));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -1139,6 +1144,9 @@ public class Protocol1_13To1_12_2 extends Protocol {
|
|||
userConnection.put(new BlockConnectionStorage(userConnection));
|
||||
}
|
||||
}
|
||||
if (Via.getConfig().get1_13TabCompleteDelay() > 0) {
|
||||
Via.getPlatform().runRepeatingSync(new TabCompleteThread(), 1L);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2;
|
||||
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.protocols.base.ProtocolInfo;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker;
|
||||
|
||||
public class TabCompleteThread implements Runnable {
|
||||
@Override
|
||||
public void run() {
|
||||
for (UserConnection info : Via.getManager().getPortedPlayers().values()) {
|
||||
if (info.has(ProtocolInfo.class) && info.get(ProtocolInfo.class).getPipeline().contains(Protocol1_13To1_12_2.class)) {
|
||||
if (info.getChannel().isOpen()) {
|
||||
info.get(TabCompleteTracker.class).sendPacketToServer();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -15,18 +15,25 @@ public abstract class AbstractFenceConnectionHandler extends ConnectionHandler {
|
|||
@Getter
|
||||
private Set<Integer> blockStates = new HashSet<>();
|
||||
private Map<Byte, Integer> connectedBlockStates = new HashMap<>();
|
||||
private static final StairConnectionHandler STAIR_CONNECTION_HANDLER = new StairConnectionHandler();
|
||||
|
||||
public AbstractFenceConnectionHandler(String blockConnections, String key) {
|
||||
public AbstractFenceConnectionHandler(String blockConnections) {
|
||||
this.blockConnections = blockConnections;
|
||||
}
|
||||
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
if (key.equals(blockState.getKey().split("\\[")[0])) {
|
||||
blockStates.add(blockState.getValue());
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), this);
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
connectedBlockStates.put(getStates(blockData), blockState.getValue());
|
||||
public ConnectionData.ConnectorInitAction getInitAction(final String key) {
|
||||
final AbstractFenceConnectionHandler handler = this;
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (key.equals(blockData.getMinecraftKey())) {
|
||||
if (blockData.hasData("waterlogged") && blockData.getValue("waterlogged").equals("true")) return;
|
||||
blockStates.add(blockData.getSavedBlockStateId());
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), handler);
|
||||
connectedBlockStates.put(getStates(blockData), blockData.getSavedBlockStateId());
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
protected byte getStates(WrappedBlockData blockData) {
|
||||
|
|
@ -35,7 +42,6 @@ public abstract class AbstractFenceConnectionHandler extends ConnectionHandler {
|
|||
if (blockData.getValue("north").equals("true")) states |= 2;
|
||||
if (blockData.getValue("south").equals("true")) states |= 4;
|
||||
if (blockData.getValue("west").equals("true")) states |= 8;
|
||||
if (blockData.hasData("waterlogged") && blockData.getValue("waterlogged").equals("true")) states |= 16;
|
||||
return states;
|
||||
}
|
||||
|
||||
|
|
@ -48,6 +54,11 @@ public abstract class AbstractFenceConnectionHandler extends ConnectionHandler {
|
|||
return states;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBlockData(UserConnection user, Position position) {
|
||||
return STAIR_CONNECTION_HANDLER.connect(user, position, super.getBlockData(user, position));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int connect(UserConnection user, Position position, int blockState) {
|
||||
final Integer newBlockState = connectedBlockStates.get(getStates(user, position, blockState));
|
||||
|
|
|
|||
|
|
@ -17,23 +17,27 @@ public class AbstractStempConnectionHandler extends ConnectionHandler {
|
|||
|
||||
private Map<BlockFace, Integer> stemps = new HashMap<>();
|
||||
|
||||
public AbstractStempConnectionHandler(String baseStateId, String blockId, String toKey) {
|
||||
public AbstractStempConnectionHandler(String baseStateId) {
|
||||
this.baseStateId = ConnectionData.getId(baseStateId);
|
||||
}
|
||||
|
||||
for (Map.Entry<String, Integer> entry : ConnectionData.keyToId.entrySet()) {
|
||||
String key = entry.getKey().split("\\[")[0];
|
||||
if (entry.getValue() == this.baseStateId || blockId.equals(key)) {
|
||||
if (entry.getValue() != this.baseStateId) {
|
||||
this.blockId.add(entry.getValue());
|
||||
public ConnectionData.ConnectorInitAction getInitAction(final String blockId, final String toKey) {
|
||||
final AbstractStempConnectionHandler handler = this;
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (blockData.getSavedBlockStateId() == baseStateId || blockId.equals(blockData.getMinecraftKey())) {
|
||||
if (blockData.getSavedBlockStateId() != baseStateId) {
|
||||
handler.blockId.add(blockData.getSavedBlockStateId());
|
||||
}
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), handler);
|
||||
}
|
||||
if (blockData.getMinecraftKey().equals(toKey)) {
|
||||
String facing = blockData.getValue("facing").toUpperCase();
|
||||
stemps.put(BlockFace.valueOf(facing), blockData.getSavedBlockStateId());
|
||||
}
|
||||
ConnectionData.connectionHandlerMap.put(entry.getValue(), this);
|
||||
}
|
||||
if (key.equals(toKey)) {
|
||||
WrappedBlockData data = WrappedBlockData.fromString(entry.getKey());
|
||||
String facing = data.getValue("facing").toUpperCase();
|
||||
stemps.put(BlockFace.valueOf(facing), entry.getValue());
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -1,17 +1,22 @@
|
|||
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class BasicFenceConnectionHandler extends AbstractFenceConnectionHandler {
|
||||
|
||||
static void init() {
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:oak_fence");
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:birch_fence");
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:jungle_fence");
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:dark_oak_fence");
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:acacia_fence");
|
||||
new BasicFenceConnectionHandler("fenceConnections", "minecraft:spruce_fence");
|
||||
static List<ConnectionData.ConnectorInitAction> init() {
|
||||
List<ConnectionData.ConnectorInitAction> actions = new ArrayList<>();
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:oak_fence"));
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:birch_fence"));
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:jungle_fence"));
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:dark_oak_fence"));
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:acacia_fence"));
|
||||
actions.add(new BasicFenceConnectionHandler("fenceConnections").getInitAction("minecraft:spruce_fence"));
|
||||
return actions;
|
||||
}
|
||||
|
||||
public BasicFenceConnectionHandler(String blockConnections, String key) {
|
||||
super(blockConnections, key);
|
||||
public BasicFenceConnectionHandler(String blockConnections) {
|
||||
super(blockConnections);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,18 +14,19 @@ class ChestConnectionHandler extends ConnectionHandler {
|
|||
private static Map<Byte, Integer> connectedStates = new HashMap<>();
|
||||
private static Set<Integer> trappedChests = new HashSet<>();
|
||||
|
||||
static void init() {
|
||||
ChestConnectionHandler connectionHandler = new ChestConnectionHandler();
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
String key = blockState.getKey().split("\\[")[0];
|
||||
if (!key.equals("minecraft:chest") && !key.equals("minecraft:trapped_chest")) continue;
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
if (blockData.getValue("waterlogged").equals("true")) continue;
|
||||
chestFacings.put(blockState.getValue(), BlockFace.valueOf(blockData.getValue("facing").toUpperCase()));
|
||||
if (key.equalsIgnoreCase("minecraft:trapped_chest")) trappedChests.add(blockState.getValue());
|
||||
connectedStates.put(getStates(blockData), blockState.getValue());
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), connectionHandler);
|
||||
}
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final ChestConnectionHandler connectionHandler = new ChestConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (!blockData.getMinecraftKey().equals("minecraft:chest") && !blockData.getMinecraftKey().equals("minecraft:trapped_chest")) return;
|
||||
if (blockData.getValue("waterlogged").equals("true")) return;
|
||||
chestFacings.put(blockData.getSavedBlockStateId(), BlockFace.valueOf(blockData.getValue("facing").toUpperCase()));
|
||||
if (blockData.getMinecraftKey().equalsIgnoreCase("minecraft:trapped_chest")) trappedChests.add(blockData.getSavedBlockStateId());
|
||||
connectedStates.put(getStates(blockData), blockData.getSavedBlockStateId());
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), connectionHandler);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static Byte getStates(WrappedBlockData blockData) {
|
||||
|
|
|
|||
|
|
@ -4,23 +4,35 @@ import us.myles.ViaVersion.api.data.UserConnection;
|
|||
import us.myles.ViaVersion.api.minecraft.BlockFace;
|
||||
import us.myles.ViaVersion.api.minecraft.Position;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ChorusPlantConnectionHandler extends AbstractFenceConnectionHandler {
|
||||
private int endstone;
|
||||
|
||||
static void init() {
|
||||
new ChorusPlantConnectionHandler("minecraft:chorus_plant");
|
||||
static List<ConnectionData.ConnectorInitAction> init() {
|
||||
List<ConnectionData.ConnectorInitAction> actions = new ArrayList<>(2);
|
||||
ChorusPlantConnectionHandler handler = new ChorusPlantConnectionHandler();
|
||||
actions.add(handler.getInitAction("minecraft:chorus_plant"));
|
||||
actions.add(handler.getExtraAction());
|
||||
return actions;
|
||||
}
|
||||
|
||||
public ChorusPlantConnectionHandler(String key) {
|
||||
super(null, key);
|
||||
public ChorusPlantConnectionHandler() {
|
||||
super(null);
|
||||
endstone = ConnectionData.getId("minecraft:end_stone");
|
||||
for (Map.Entry<String, Integer> entry : ConnectionData.keyToId.entrySet()) {
|
||||
if (entry.getKey().split("\\[")[0].equals("minecraft:chorus_flower")) {
|
||||
getBlockStates().add(entry.getValue());
|
||||
}
|
||||
|
||||
public ConnectionData.ConnectorInitAction getExtraAction() {
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (blockData.getMinecraftKey().equals("minecraft:chorus_flower")) {
|
||||
getBlockStates().add(blockData.getSavedBlockStateId());
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -16,195 +16,204 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections.provi
|
|||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections.providers.PacketBlockConnectionProvider;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.MappingData;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.Set;
|
||||
|
||||
public class ConnectionData {
|
||||
static Map<Integer, String> idToKey = new HashMap<>();
|
||||
static Map<String, Integer> keyToId = new HashMap<>();
|
||||
static Map<Integer, ConnectionHandler> connectionHandlerMap = new HashMap<>();
|
||||
static Map<Integer, BlockData> blockConnectionData = new HashMap<>();
|
||||
static Set<Integer> occludingStates = new HashSet<>();
|
||||
static Map<Integer, String> idToKey = new HashMap<>();
|
||||
static Map<String, Integer> keyToId = new HashMap<>();
|
||||
static Map<Integer, ConnectionHandler> connectionHandlerMap = new HashMap<>();
|
||||
static Map<Integer, BlockData> blockConnectionData = new HashMap<>();
|
||||
static Set<Integer> occludingStates = new HashSet<>();
|
||||
|
||||
public static void update(UserConnection user, Position position) {
|
||||
for (int x = -1; x <= 1; x++) {
|
||||
for (int z = -1; z <= 1; z++) {
|
||||
for (int y = -1; y <= 1; y++) {
|
||||
if (Math.abs(x) + Math.abs(y) + Math.abs(z) != 1) continue;
|
||||
Position pos = new Position(position.getX() + x, position.getY() + y, position.getZ() + z);
|
||||
int blockState = Via.getManager().getProviders().get(BlockConnectionProvider.class).getBlockdata(user, pos);
|
||||
if (!connects(blockState)) continue;
|
||||
int newBlockState = connect(user, pos, blockState);
|
||||
if (newBlockState == blockState) continue;
|
||||
public static void update(UserConnection user, Position position) {
|
||||
for (int x = -1; x <= 1; x++) {
|
||||
for (int z = -1; z <= 1; z++) {
|
||||
for (int y = -1; y <= 1; y++) {
|
||||
if (Math.abs(x) + Math.abs(y) + Math.abs(z) != 1) continue;
|
||||
Position pos = new Position(position.getX() + x, position.getY() + y, position.getZ() + z);
|
||||
int blockState = Via.getManager().getProviders().get(BlockConnectionProvider.class).getBlockdata(user, pos);
|
||||
if (!connects(blockState)) continue;
|
||||
int newBlockState = connect(user, pos, blockState);
|
||||
if (newBlockState == blockState) continue;
|
||||
|
||||
PacketWrapper blockUpdatePacket = new PacketWrapper(0x0B, null, user);
|
||||
blockUpdatePacket.write(Type.POSITION, pos);
|
||||
blockUpdatePacket.write(Type.VAR_INT, newBlockState);
|
||||
try {
|
||||
blockUpdatePacket.send(Protocol1_13To1_12_2.class, true, false);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
PacketWrapper blockUpdatePacket = new PacketWrapper(0x0B, null, user);
|
||||
blockUpdatePacket.write(Type.POSITION, pos);
|
||||
blockUpdatePacket.write(Type.VAR_INT, newBlockState);
|
||||
try {
|
||||
blockUpdatePacket.send(Protocol1_13To1_12_2.class, true, false);
|
||||
} catch (Exception ex) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static BlockConnectionProvider getProvider() {
|
||||
return Via.getManager().getProviders().get(BlockConnectionProvider.class);
|
||||
}
|
||||
public static BlockConnectionProvider getProvider() {
|
||||
return Via.getManager().getProviders().get(BlockConnectionProvider.class);
|
||||
}
|
||||
|
||||
public static void updateBlockStorage(UserConnection userConnection, Position position, int blockState) {
|
||||
if (!needStoreBlocks()) return;
|
||||
if (ConnectionData.isWelcome(blockState)) {
|
||||
ConnectionData.getProvider().storeBlock(userConnection, position, blockState);
|
||||
} else {
|
||||
ConnectionData.getProvider().removeBlock(userConnection, position);
|
||||
}
|
||||
}
|
||||
public static void updateBlockStorage(UserConnection userConnection, Position position, int blockState) {
|
||||
if (!needStoreBlocks()) return;
|
||||
if (ConnectionData.isWelcome(blockState)) {
|
||||
ConnectionData.getProvider().storeBlock(userConnection, position, blockState);
|
||||
} else {
|
||||
ConnectionData.getProvider().removeBlock(userConnection, position);
|
||||
}
|
||||
}
|
||||
|
||||
public static void clearBlockStorage(UserConnection connection) {
|
||||
if (!needStoreBlocks()) return;
|
||||
getProvider().clearStorage(connection);
|
||||
}
|
||||
public static void clearBlockStorage(UserConnection connection) {
|
||||
if (!needStoreBlocks()) return;
|
||||
getProvider().clearStorage(connection);
|
||||
}
|
||||
|
||||
public static boolean needStoreBlocks() {
|
||||
return getProvider().storesBlocks();
|
||||
}
|
||||
public static boolean needStoreBlocks() {
|
||||
return getProvider().storesBlocks();
|
||||
}
|
||||
|
||||
public static void connectBlocks(UserConnection user, Chunk chunk) {
|
||||
long xOff = chunk.getX() << 4;
|
||||
long zOff = chunk.getZ() << 4;
|
||||
public static void connectBlocks(UserConnection user, Chunk chunk) {
|
||||
long xOff = chunk.getX() << 4;
|
||||
long zOff = chunk.getZ() << 4;
|
||||
|
||||
for (int i = 0; i < chunk.getSections().length; i++) {
|
||||
ChunkSection section = chunk.getSections()[i];
|
||||
if (section == null) continue;
|
||||
for (int i = 0; i < chunk.getSections().length; i++) {
|
||||
ChunkSection section = chunk.getSections()[i];
|
||||
if (section == null) continue;
|
||||
|
||||
boolean willConnect = false;
|
||||
boolean willConnect = false;
|
||||
|
||||
for (int p = 0; p < section.getPaletteSize(); p++) {
|
||||
int id = section.getPaletteEntry(p);
|
||||
if (ConnectionData.connects(id)) {
|
||||
willConnect = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!willConnect) continue;
|
||||
for (int p = 0; p < section.getPaletteSize(); p++) {
|
||||
int id = section.getPaletteEntry(p);
|
||||
if (ConnectionData.connects(id)) {
|
||||
willConnect = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!willConnect) continue;
|
||||
|
||||
long yOff = i << 4;
|
||||
long yOff = i << 4;
|
||||
|
||||
for (int x = 0; x < 16; x++) {
|
||||
for (int y = 0; y < 16; y++) {
|
||||
for (int z = 0; z < 16; z++) {
|
||||
int block = section.getFlatBlock(x, y, z);
|
||||
for (int x = 0; x < 16; x++) {
|
||||
for (int y = 0; y < 16; y++) {
|
||||
for (int z = 0; z < 16; z++) {
|
||||
int block = section.getFlatBlock(x, y, z);
|
||||
|
||||
if (ConnectionData.connects(block)) {
|
||||
block = ConnectionData.connect(user, new Position(xOff + x, yOff + y, zOff + z), block);
|
||||
section.setFlatBlock(x, y, z, block);
|
||||
}
|
||||
if (ConnectionData.connects(block)) {
|
||||
block = ConnectionData.connect(user, new Position(xOff + x, yOff + y, zOff + z), block);
|
||||
section.setFlatBlock(x, y, z, block);
|
||||
}
|
||||
|
||||
if (x == 0) {
|
||||
update(user, new Position(xOff - 1, yOff + y, zOff + z));
|
||||
} else if (x == 15) {
|
||||
update(user, new Position(xOff + 16, yOff + y, zOff + z));
|
||||
}
|
||||
if (z == 0) {
|
||||
update(user, new Position(xOff + x, yOff + y, zOff - 1));
|
||||
} else if (z == 15) {
|
||||
update(user, new Position(xOff + x, yOff + y, zOff + 16));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (x == 0) {
|
||||
update(user, new Position(xOff - 1, yOff + y, zOff + z));
|
||||
} else if (x == 15) {
|
||||
update(user, new Position(xOff + 16, yOff + y, zOff + z));
|
||||
}
|
||||
if (z == 0) {
|
||||
update(user, new Position(xOff + x, yOff + y, zOff - 1));
|
||||
} else if (z == 15) {
|
||||
update(user, new Position(xOff + x, yOff + y, zOff + 16));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void init() {
|
||||
if (!Via.getConfig().isServersideBlockConnections()) return;
|
||||
Via.getPlatform().getLogger().info("Loading block connection mappings ...");
|
||||
JsonObject mapping1_13 = MappingData.loadData("mapping-1.13.json");
|
||||
JsonObject blocks1_13 = mapping1_13.getAsJsonObject("blocks");
|
||||
for (Entry<String, JsonElement> blockState : blocks1_13.entrySet()) {
|
||||
Integer id = Integer.parseInt(blockState.getKey());
|
||||
String key = blockState.getValue().getAsString();
|
||||
idToKey.put(id, key);
|
||||
keyToId.put(key, id);
|
||||
}
|
||||
public static void init() {
|
||||
if (!Via.getConfig().isServersideBlockConnections()) return;
|
||||
Via.getPlatform().getLogger().info("Loading block connection mappings ...");
|
||||
JsonObject mapping1_13 = MappingData.loadData("mapping-1.13.json");
|
||||
JsonObject blocks1_13 = mapping1_13.getAsJsonObject("blocks");
|
||||
for (Entry<String, JsonElement> blockState : blocks1_13.entrySet()) {
|
||||
Integer id = Integer.parseInt(blockState.getKey());
|
||||
String key = blockState.getValue().getAsString();
|
||||
idToKey.put(id, key);
|
||||
keyToId.put(key, id);
|
||||
}
|
||||
|
||||
if (!Via.getConfig().isReduceBlockStorageMemory()) {
|
||||
JsonObject mappingBlockConnections = MappingData.loadData("blockConnections.json");
|
||||
for (Entry<String, JsonElement> entry : mappingBlockConnections.entrySet()) {
|
||||
int id = keyToId.get(entry.getKey());
|
||||
BlockData blockData = new BlockData();
|
||||
for (Entry<String, JsonElement> type : entry.getValue().getAsJsonObject().entrySet()) {
|
||||
String name = type.getKey();
|
||||
JsonObject object = type.getValue().getAsJsonObject();
|
||||
Boolean[] data = new Boolean[6];
|
||||
for (BlockFace value : BlockFace.values()) {
|
||||
String face = value.toString().toLowerCase();
|
||||
if (object.has(face)) {
|
||||
data[value.ordinal()] = object.getAsJsonPrimitive(face).getAsBoolean();
|
||||
} else {
|
||||
data[value.ordinal()] = false;
|
||||
}
|
||||
}
|
||||
blockData.put(name, data);
|
||||
}
|
||||
blockConnectionData.put(id, blockData);
|
||||
}
|
||||
}
|
||||
if (!Via.getConfig().isReduceBlockStorageMemory()) {
|
||||
JsonObject mappingBlockConnections = MappingData.loadData("blockConnections.json");
|
||||
for (Entry<String, JsonElement> entry : mappingBlockConnections.entrySet()) {
|
||||
int id = keyToId.get(entry.getKey());
|
||||
BlockData blockData = new BlockData();
|
||||
for (Entry<String, JsonElement> type : entry.getValue().getAsJsonObject().entrySet()) {
|
||||
String name = type.getKey();
|
||||
JsonObject object = type.getValue().getAsJsonObject();
|
||||
Boolean[] data = new Boolean[6];
|
||||
for (BlockFace value : BlockFace.values()) {
|
||||
String face = value.toString().toLowerCase();
|
||||
if (object.has(face)) {
|
||||
data[value.ordinal()] = object.getAsJsonPrimitive(face).getAsBoolean();
|
||||
} else {
|
||||
data[value.ordinal()] = false;
|
||||
}
|
||||
}
|
||||
blockData.put(name, data);
|
||||
}
|
||||
blockConnectionData.put(id, blockData);
|
||||
}
|
||||
}
|
||||
|
||||
JsonObject blockData = MappingData.loadData("blockData.json");
|
||||
JsonArray occluding = blockData.getAsJsonArray("occluding");
|
||||
for (JsonElement jsonElement : occluding) {
|
||||
occludingStates.add(keyToId.get(jsonElement.getAsString()));
|
||||
}
|
||||
JsonObject blockData = MappingData.loadData("blockData.json");
|
||||
JsonArray occluding = blockData.getAsJsonArray("occluding");
|
||||
for (JsonElement jsonElement : occluding) {
|
||||
occludingStates.add(keyToId.get(jsonElement.getAsString()));
|
||||
}
|
||||
|
||||
PumpkinConnectionHandler.init();
|
||||
MelonConnectionHandler.init();
|
||||
BasicFenceConnectionHandler.init();
|
||||
NetherFenceConnectionHandler.init();
|
||||
WallConnectionHandler.init();
|
||||
MelonConnectionHandler.init();
|
||||
GlassConnectionHandler.init();
|
||||
ChestConnectionHandler.init();
|
||||
DoorConnectionHandler.init();
|
||||
RedstoneConnectionHandler.init();
|
||||
StairConnectionHandler.init();
|
||||
FlowerConnectionHandler.init();
|
||||
ChorusPlantConnectionHandler.init();
|
||||
TripwireConnectionHandler.init();
|
||||
List<ConnectorInitAction> initActions = new ArrayList<>();
|
||||
initActions.add(PumpkinConnectionHandler.init());
|
||||
initActions.addAll(BasicFenceConnectionHandler.init());
|
||||
initActions.add(NetherFenceConnectionHandler.init());
|
||||
initActions.addAll(WallConnectionHandler.init());
|
||||
initActions.add(MelonConnectionHandler.init());
|
||||
initActions.addAll(GlassConnectionHandler.init());
|
||||
initActions.add(ChestConnectionHandler.init());
|
||||
initActions.add(DoorConnectionHandler.init());
|
||||
initActions.add(RedstoneConnectionHandler.init());
|
||||
initActions.add(StairConnectionHandler.init());
|
||||
initActions.add(FlowerConnectionHandler.init());
|
||||
initActions.addAll(ChorusPlantConnectionHandler.init());
|
||||
initActions.add(TripwireConnectionHandler.init());
|
||||
initActions.add(SnowyGrassConnectionHandler.init());
|
||||
for (String key : keyToId.keySet()) {
|
||||
WrappedBlockData wrappedBlockData = WrappedBlockData.fromString(key);
|
||||
for (ConnectorInitAction action : initActions) {
|
||||
action.check(wrappedBlockData);
|
||||
}
|
||||
}
|
||||
|
||||
if (Via.getConfig().getBlockConnectionMethod().equalsIgnoreCase("packet")) {
|
||||
Via.getManager().getProviders().register(BlockConnectionProvider.class, new PacketBlockConnectionProvider());
|
||||
}
|
||||
}
|
||||
if (Via.getConfig().getBlockConnectionMethod().equalsIgnoreCase("packet")) {
|
||||
Via.getManager().getProviders().register(BlockConnectionProvider.class, new PacketBlockConnectionProvider());
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isWelcome(int blockState) {
|
||||
return blockConnectionData.containsKey(blockState) || connectionHandlerMap.containsKey(blockState);
|
||||
}
|
||||
public static boolean isWelcome(int blockState) {
|
||||
return blockConnectionData.containsKey(blockState) || connectionHandlerMap.containsKey(blockState);
|
||||
}
|
||||
|
||||
public static boolean connects(int blockState) {
|
||||
return connectionHandlerMap.containsKey(blockState);
|
||||
}
|
||||
public static boolean connects(int blockState) {
|
||||
return connectionHandlerMap.containsKey(blockState);
|
||||
}
|
||||
|
||||
public static int connect(UserConnection user, Position position, int blockState) {
|
||||
if (connectionHandlerMap.containsKey(blockState)) {
|
||||
ConnectionHandler handler = connectionHandlerMap.get(blockState);
|
||||
return handler.connect(user, position, blockState);
|
||||
} else {
|
||||
return blockState;
|
||||
}
|
||||
}
|
||||
public static int connect(UserConnection user, Position position, int blockState) {
|
||||
if (connectionHandlerMap.containsKey(blockState)) {
|
||||
ConnectionHandler handler = connectionHandlerMap.get(blockState);
|
||||
return handler.connect(user, position, blockState);
|
||||
} else {
|
||||
return blockState;
|
||||
}
|
||||
}
|
||||
|
||||
public static int getId(String key) {
|
||||
return keyToId.containsKey(key) ? keyToId.get(key) : -1;
|
||||
}
|
||||
public static int getId(String key) {
|
||||
return keyToId.containsKey(key) ? keyToId.get(key) : -1;
|
||||
}
|
||||
|
||||
public static String getKey(int id) {
|
||||
return idToKey.get(id);
|
||||
}
|
||||
public static String getKey(int id) {
|
||||
return idToKey.get(id);
|
||||
}
|
||||
|
||||
interface ConnectorInitAction {
|
||||
|
||||
void check(WrappedBlockData blockData);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ public class DoorConnectionHandler extends ConnectionHandler {
|
|||
private static Map<Integer, DoorData> doorDataMap = new HashMap<>();
|
||||
private static Map<Short, Integer> connectedStates = new HashMap<>();
|
||||
|
||||
static void init() {
|
||||
List<String> baseDoors = new LinkedList<>();
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final List<String> baseDoors = new LinkedList<>();
|
||||
baseDoors.add("minecraft:oak_door");
|
||||
baseDoors.add("minecraft:birch_door");
|
||||
baseDoors.add("minecraft:jungle_door");
|
||||
|
|
@ -26,30 +26,31 @@ public class DoorConnectionHandler extends ConnectionHandler {
|
|||
baseDoors.add("minecraft:spruce_door");
|
||||
baseDoors.add("minecraft:iron_door");
|
||||
|
||||
DoorConnectionHandler connectionHandler = new DoorConnectionHandler();
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
String key = blockState.getKey().split("\\[")[0];
|
||||
int type = baseDoors.indexOf(key);
|
||||
if (type == -1) continue;
|
||||
final DoorConnectionHandler connectionHandler = new DoorConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
int type = baseDoors.indexOf(blockData.getMinecraftKey());
|
||||
if (type == -1) return;
|
||||
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
int id = blockState.getValue();
|
||||
int id = blockData.getSavedBlockStateId();
|
||||
|
||||
DoorData doorData = new DoorData(
|
||||
blockData.getValue("half").equals("lower"),
|
||||
blockData.getValue("hinge").equals("right"),
|
||||
blockData.getValue("powered").equals("true"),
|
||||
blockData.getValue("open").equals("true"),
|
||||
BlockFace.valueOf(blockData.getValue("facing").toUpperCase()),
|
||||
type
|
||||
);
|
||||
DoorData doorData = new DoorData(
|
||||
blockData.getValue("half").equals("lower"),
|
||||
blockData.getValue("hinge").equals("right"),
|
||||
blockData.getValue("powered").equals("true"),
|
||||
blockData.getValue("open").equals("true"),
|
||||
BlockFace.valueOf(blockData.getValue("facing").toUpperCase()),
|
||||
type
|
||||
);
|
||||
|
||||
doorDataMap.put(id, doorData);
|
||||
doorDataMap.put(id, doorData);
|
||||
|
||||
connectedStates.put(getStates(doorData), id);
|
||||
connectedStates.put(getStates(doorData), id);
|
||||
|
||||
ConnectionData.connectionHandlerMap.put(id, connectionHandler);
|
||||
}
|
||||
ConnectionData.connectionHandlerMap.put(id, connectionHandler);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static short getStates(DoorData doorData) {
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ import java.util.Set;
|
|||
public class FlowerConnectionHandler extends ConnectionHandler {
|
||||
private static Map<Integer, Integer> flowers = new HashMap<>();
|
||||
|
||||
static void init() {
|
||||
Set<String> baseFlower = new HashSet<>();
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final Set<String> baseFlower = new HashSet<>();
|
||||
baseFlower.add("minecraft:rose_bush");
|
||||
baseFlower.add("minecraft:sunflower");
|
||||
baseFlower.add("minecraft:peony");
|
||||
|
|
@ -23,17 +23,19 @@ public class FlowerConnectionHandler extends ConnectionHandler {
|
|||
baseFlower.add("minecraft:large_fern");
|
||||
baseFlower.add("minecraft:lilac");
|
||||
|
||||
FlowerConnectionHandler handler = new FlowerConnectionHandler();
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
WrappedBlockData data = WrappedBlockData.fromString(blockState.getKey());
|
||||
if (baseFlower.contains(data.getMinecraftKey())) {
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), handler);
|
||||
if (data.getValue("half").equals("lower")) {
|
||||
data.set("half", "upper");
|
||||
flowers.put(blockState.getValue(), data.getBlockStateId());
|
||||
final FlowerConnectionHandler handler = new FlowerConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (baseFlower.contains(blockData.getMinecraftKey())) {
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), handler);
|
||||
if (blockData.getValue("half").equals("lower")) {
|
||||
blockData.set("half", "upper");
|
||||
flowers.put(blockData.getSavedBlockStateId(), blockData.getBlockStateId());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -4,31 +4,36 @@ import us.myles.ViaVersion.api.data.UserConnection;
|
|||
import us.myles.ViaVersion.api.minecraft.Position;
|
||||
import us.myles.ViaVersion.protocols.base.ProtocolInfo;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class GlassConnectionHandler extends AbstractFenceConnectionHandler {
|
||||
|
||||
static void init() {
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:white_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:orange_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:magenta_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:light_blue_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:yellow_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:lime_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:pink_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:gray_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:light_gray_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:cyan_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:purple_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:blue_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:brown_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:green_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:red_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:black_stained_glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:glass_pane");
|
||||
new GlassConnectionHandler("paneConnections", "minecraft:iron_bars");
|
||||
static List<ConnectionData.ConnectorInitAction> init() {
|
||||
List<ConnectionData.ConnectorInitAction> actions = new ArrayList<>(18);
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:white_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:orange_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:magenta_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:light_blue_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:yellow_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:lime_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:pink_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:gray_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:light_gray_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:cyan_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:purple_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:blue_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:brown_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:green_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:red_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:black_stained_glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:glass_pane"));
|
||||
actions.add(new GlassConnectionHandler("paneConnections").getInitAction("minecraft:iron_bars"));
|
||||
return actions;
|
||||
}
|
||||
|
||||
public GlassConnectionHandler(String blockConnections, String key) {
|
||||
super(blockConnections, key);
|
||||
public GlassConnectionHandler(String blockConnections) {
|
||||
super(blockConnections);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections;
|
|||
|
||||
public class MelonConnectionHandler extends AbstractStempConnectionHandler {
|
||||
|
||||
public MelonConnectionHandler(String baseStateId, String blockId, String toKey) {
|
||||
super(baseStateId, blockId, toKey);
|
||||
public MelonConnectionHandler(String baseStateId) {
|
||||
super(baseStateId);
|
||||
}
|
||||
|
||||
static void init() {
|
||||
new MelonConnectionHandler("minecraft:melon_stem[age=7]", "minecraft:melon", "minecraft:attached_melon_stem");
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
return new MelonConnectionHandler("minecraft:melon_stem[age=7]").getInitAction("minecraft:melon", "minecraft:attached_melon_stem");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections;
|
|||
|
||||
public class NetherFenceConnectionHandler extends AbstractFenceConnectionHandler {
|
||||
|
||||
static void init() {
|
||||
new NetherFenceConnectionHandler("netherFenceConnections", "minecraft:nether_brick_fence");
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
return new NetherFenceConnectionHandler("netherFenceConnections").getInitAction("minecraft:nether_brick_fence");
|
||||
}
|
||||
|
||||
public NetherFenceConnectionHandler(String blockConnections, String key) {
|
||||
super(blockConnections, key);
|
||||
public NetherFenceConnectionHandler(String blockConnections) {
|
||||
super(blockConnections);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections;
|
|||
|
||||
public class PumpkinConnectionHandler extends AbstractStempConnectionHandler {
|
||||
|
||||
static void init() {
|
||||
new PumpkinConnectionHandler("minecraft:pumpkin_stem[age=7]", "minecraft:carved_pumpkin", "minecraft:attached_pumpkin_stem");
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
return new PumpkinConnectionHandler("minecraft:pumpkin_stem[age=7]").getInitAction("minecraft:carved_pumpkin", "minecraft:attached_pumpkin_stem");
|
||||
}
|
||||
|
||||
public PumpkinConnectionHandler(String baseStateId, String blockId, String toKey) {
|
||||
super(baseStateId, blockId, toKey);
|
||||
public PumpkinConnectionHandler(String baseStateId) {
|
||||
super(baseStateId);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,18 +14,19 @@ public class RedstoneConnectionHandler extends ConnectionHandler {
|
|||
private static Map<Short, Integer> connectedBlockStates = new HashMap<>();
|
||||
private static Map<Integer, Integer> powerMappings = new HashMap<>();
|
||||
|
||||
static void init() {
|
||||
RedstoneConnectionHandler connectionHandler = new RedstoneConnectionHandler();
|
||||
String redstoneKey = "minecraft:redstone_wire";
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
String key = blockState.getKey().split("\\[")[0];
|
||||
if (!redstoneKey.equals(key)) continue;
|
||||
redstone.add(blockState.getValue());
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), connectionHandler);
|
||||
WrappedBlockData blockData = WrappedBlockData.fromStateId(blockState.getValue());
|
||||
connectedBlockStates.put(getStates(blockData), blockData.getBlockStateId());
|
||||
powerMappings.put(blockData.getBlockStateId(), Integer.valueOf(blockData.getValue("power")));
|
||||
}
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final RedstoneConnectionHandler connectionHandler = new RedstoneConnectionHandler();
|
||||
final String redstoneKey = "minecraft:redstone_wire";
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (!redstoneKey.equals(blockData.getMinecraftKey())) return;
|
||||
redstone.add(blockData.getSavedBlockStateId());
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), connectionHandler);
|
||||
connectedBlockStates.put(getStates(blockData), blockData.getSavedBlockStateId());
|
||||
powerMappings.put(blockData.getSavedBlockStateId(), Integer.valueOf(blockData.getValue("power")));
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static short getStates(WrappedBlockData data) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.blockconnections;
|
||||
|
||||
import us.myles.ViaVersion.api.Pair;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.api.minecraft.BlockFace;
|
||||
import us.myles.ViaVersion.api.minecraft.Position;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
public class SnowyGrassConnectionHandler extends ConnectionHandler {
|
||||
private static Map<Pair<Integer, Boolean>, Integer> grassBlocks = new HashMap<>();
|
||||
private static Set<Integer> snows = new HashSet<>();
|
||||
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final Set<String> snowyGrassBlocks = new HashSet<>();
|
||||
snowyGrassBlocks.add("minecraft:grass_block");
|
||||
snowyGrassBlocks.add("minecraft:podzol");
|
||||
snowyGrassBlocks.add("minecraft:mycelium");
|
||||
|
||||
final SnowyGrassConnectionHandler handler = new SnowyGrassConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (snowyGrassBlocks.contains(blockData.getMinecraftKey())) {
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), handler);
|
||||
blockData.set("snowy", "true");
|
||||
grassBlocks.put(new Pair<>(blockData.getSavedBlockStateId(), true), blockData.getBlockStateId());
|
||||
blockData.set("snowy", "false");
|
||||
grassBlocks.put(new Pair<>(blockData.getSavedBlockStateId(), false), blockData.getBlockStateId());
|
||||
}
|
||||
if (blockData.getMinecraftKey().equals("minecraft:snow") || blockData.getMinecraftKey().equals("minecraft:snow_block")) {
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), handler);
|
||||
snows.add(blockData.getSavedBlockStateId());
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
public int connect(UserConnection user, Position position, int blockState) {
|
||||
int blockUpId = getBlockData(user, position.getRelative(BlockFace.TOP));
|
||||
Integer newId = grassBlocks.get(new Pair<>(blockState, snows.contains(blockUpId)));
|
||||
if (newId != null) {
|
||||
return newId;
|
||||
}
|
||||
return blockState;
|
||||
}
|
||||
}
|
||||
|
|
@ -16,8 +16,8 @@ public class StairConnectionHandler extends ConnectionHandler {
|
|||
private static Map<Integer, StairData> stairDataMap = new HashMap<>();
|
||||
private static Map<Short, Integer> connectedBlocks = new HashMap<>();
|
||||
|
||||
static void init() {
|
||||
List<String> baseStairs = new LinkedList<>();
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final List<String> baseStairs = new LinkedList<>();
|
||||
baseStairs.add("minecraft:oak_stairs");
|
||||
baseStairs.add("minecraft:cobblestone_stairs");
|
||||
baseStairs.add("minecraft:brick_stairs");
|
||||
|
|
@ -36,36 +36,37 @@ public class StairConnectionHandler extends ConnectionHandler {
|
|||
baseStairs.add("minecraft:prismarine_brick_stairs");
|
||||
baseStairs.add("minecraft:dark_prismarine_stairs");
|
||||
|
||||
StairConnectionHandler connectionHandler = new StairConnectionHandler();
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
String key = blockState.getKey().split("\\[")[0];
|
||||
int type = baseStairs.indexOf(key);
|
||||
if (type == -1) continue;
|
||||
final StairConnectionHandler connectionHandler = new StairConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
int type = baseStairs.indexOf(blockData.getMinecraftKey());
|
||||
if (type == -1) return;
|
||||
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
if (blockData.getValue("waterlogged").equals("true")) continue;
|
||||
if (blockData.getValue("waterlogged").equals("true")) return;
|
||||
|
||||
byte shape;
|
||||
switch (blockData.getValue("shape")) {
|
||||
case "straight": shape = 0; break;
|
||||
case "inner_left": shape = 1; break;
|
||||
case "inner_right": shape = 2; break;
|
||||
case "outer_left": shape = 3; break;
|
||||
case "outer_right": shape = 4; break;
|
||||
default: continue;
|
||||
byte shape;
|
||||
switch (blockData.getValue("shape")) {
|
||||
case "straight": shape = 0; break;
|
||||
case "inner_left": shape = 1; break;
|
||||
case "inner_right": shape = 2; break;
|
||||
case "outer_left": shape = 3; break;
|
||||
case "outer_right": shape = 4; break;
|
||||
default: return;
|
||||
}
|
||||
|
||||
StairData stairData = new StairData(
|
||||
blockData.getValue("half").equals("bottom"),
|
||||
shape, (byte) type,
|
||||
BlockFace.valueOf(blockData.getValue("facing").toUpperCase())
|
||||
);
|
||||
|
||||
stairDataMap.put(blockData.getSavedBlockStateId(), stairData);
|
||||
connectedBlocks.put(getStates(stairData), blockData.getSavedBlockStateId());
|
||||
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), connectionHandler);
|
||||
}
|
||||
|
||||
StairData stairData = new StairData(
|
||||
blockData.getValue("half").equals("bottom"),
|
||||
shape, (byte) type,
|
||||
BlockFace.valueOf(blockData.getValue("facing").toUpperCase())
|
||||
);
|
||||
|
||||
stairDataMap.put(blockState.getValue(), stairData);
|
||||
connectedBlocks.put(getStates(stairData), blockState.getValue());
|
||||
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), connectionHandler);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static short getStates(StairData stairData) {
|
||||
|
|
@ -98,15 +99,15 @@ public class StairConnectionHandler extends ConnectionHandler {
|
|||
StairData relativeStair = stairDataMap.get(getBlockData(user, position.getRelative(facing)));
|
||||
if (relativeStair != null && relativeStair.isBottom() == stair.isBottom()) {
|
||||
BlockFace facing2 = relativeStair.getFacing();
|
||||
if (facing.getAxis() != facing2.getAxis() && checkOpposite(user, stair, position, facing2.opposite())){
|
||||
if (facing.getAxis() != facing2.getAxis() && checkOpposite(user, stair, position, facing2.opposite())) {
|
||||
return facing2 == rotateAntiClockwise(facing) ? 3 : 4; // outer_left : outer_right
|
||||
}
|
||||
}
|
||||
|
||||
relativeStair = stairDataMap.get(getBlockData(user, position.getRelative(facing.opposite())));
|
||||
if(relativeStair != null && relativeStair.isBottom() == stair.isBottom()) {
|
||||
if (relativeStair != null && relativeStair.isBottom() == stair.isBottom()) {
|
||||
BlockFace facing2 = relativeStair.getFacing();
|
||||
if (facing.getAxis() != facing2.getAxis() && checkOpposite(user, stair, position, facing2)){
|
||||
if (facing.getAxis() != facing2.getAxis() && checkOpposite(user, stair, position, facing2)) {
|
||||
return facing2 == rotateAntiClockwise(facing) ? 1 : 2; // inner_left : inner_right
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,29 +15,27 @@ public class TripwireConnectionHandler extends ConnectionHandler {
|
|||
private static Map<Byte, Integer> connectedBlocks = new HashMap<>();
|
||||
private static Map<Integer, BlockFace> tripwireHooks = new HashMap<>();
|
||||
|
||||
static void init() {
|
||||
TripwireConnectionHandler connectionHandler = new TripwireConnectionHandler();
|
||||
for (Map.Entry<String, Integer> blockState : ConnectionData.keyToId.entrySet()) {
|
||||
String key = blockState.getKey().split("\\[")[0];
|
||||
static ConnectionData.ConnectorInitAction init() {
|
||||
final TripwireConnectionHandler connectionHandler = new TripwireConnectionHandler();
|
||||
return new ConnectionData.ConnectorInitAction() {
|
||||
@Override
|
||||
public void check(WrappedBlockData blockData) {
|
||||
if (blockData.getMinecraftKey().equals("minecraft:tripwire_hook")) {
|
||||
tripwireHooks.put(blockData.getSavedBlockStateId(), BlockFace.valueOf(blockData.getValue("facing").toUpperCase()));
|
||||
} else if (blockData.getMinecraftKey().equals("minecraft:tripwire")) {
|
||||
TripwireData tripwireData = new TripwireData(
|
||||
blockData.getValue("attached").equals("true"),
|
||||
blockData.getValue("disarmed").equals("true"),
|
||||
blockData.getValue("powered").equals("true")
|
||||
);
|
||||
|
||||
if (key.equals("minecraft:tripwire_hook")) {
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
tripwireHooks.put(blockState.getValue(), BlockFace.valueOf(blockData.getValue("facing").toUpperCase()));
|
||||
} else if (key.equals("minecraft:tripwire")) {
|
||||
WrappedBlockData blockData = WrappedBlockData.fromString(blockState.getKey());
|
||||
tripwireDataMap.put(blockData.getSavedBlockStateId(), tripwireData);
|
||||
connectedBlocks.put(getStates(blockData), blockData.getSavedBlockStateId());
|
||||
|
||||
TripwireData tripwireData = new TripwireData(
|
||||
blockData.getValue("attached").equals("true"),
|
||||
blockData.getValue("disarmed").equals("true"),
|
||||
blockData.getValue("powered").equals("true")
|
||||
);
|
||||
|
||||
tripwireDataMap.put(blockState.getValue(), tripwireData);
|
||||
connectedBlocks.put(getStates(blockData), blockState.getValue());
|
||||
|
||||
ConnectionData.connectionHandlerMap.put(blockState.getValue(), connectionHandler);
|
||||
ConnectionData.connectionHandlerMap.put(blockData.getSavedBlockStateId(), connectionHandler);
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static byte getStates(WrappedBlockData blockData) {
|
||||
|
|
|
|||
|
|
@ -4,30 +4,35 @@ import us.myles.ViaVersion.api.data.UserConnection;
|
|||
import us.myles.ViaVersion.api.minecraft.BlockFace;
|
||||
import us.myles.ViaVersion.api.minecraft.Position;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class WallConnectionHandler extends AbstractFenceConnectionHandler {
|
||||
private static final BlockFace[] BLOCK_FACES = {BlockFace.EAST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.WEST};
|
||||
private static final int[] OPPOSITES = {3, 2, 1, 0};
|
||||
|
||||
static void init() {
|
||||
new WallConnectionHandler("cobbleWallConnections", "minecraft:cobblestone_wall");
|
||||
new WallConnectionHandler("cobbleWallConnections", "minecraft:mossy_cobblestone_wall");
|
||||
static List<ConnectionData.ConnectorInitAction> init() {
|
||||
List<ConnectionData.ConnectorInitAction> actions = new ArrayList<>(2);
|
||||
actions.add(new WallConnectionHandler("cobbleWallConnections").getInitAction("minecraft:cobblestone_wall"));
|
||||
actions.add(new WallConnectionHandler("cobbleWallConnections").getInitAction("minecraft:mossy_cobblestone_wall"));
|
||||
return actions;
|
||||
}
|
||||
|
||||
|
||||
public WallConnectionHandler(String blockConnections, String key) {
|
||||
super(blockConnections, key);
|
||||
public WallConnectionHandler(String blockConnections) {
|
||||
super(blockConnections);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected byte getStates(WrappedBlockData blockData) {
|
||||
byte states = super.getStates(blockData);
|
||||
if (blockData.getValue("up").equals("true")) states |= 32;
|
||||
if (blockData.getValue("up").equals("true")) states |= 16;
|
||||
return states;
|
||||
}
|
||||
|
||||
protected byte getStates(UserConnection user, Position position, int blockState) {
|
||||
byte states = super.getStates(user, position, blockState);
|
||||
if (up(user, position)) states |= 32;
|
||||
if (up(user, position)) states |= 16;
|
||||
return states;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,14 @@ import java.util.Map.Entry;
|
|||
public class WrappedBlockData {
|
||||
@Getter
|
||||
private String minecraftKey;
|
||||
@Getter
|
||||
private int savedBlockStateId;
|
||||
private LinkedHashMap<String, String> blockData = new LinkedHashMap<>();
|
||||
|
||||
public static WrappedBlockData fromString(String s) {
|
||||
String[] array = s.split("\\[");
|
||||
String key = array[0];
|
||||
WrappedBlockData wrappedBlockdata = new WrappedBlockData(key);
|
||||
WrappedBlockData wrappedBlockdata = new WrappedBlockData(key, ConnectionData.getId(s));
|
||||
if (array.length > 1) {
|
||||
String blockData = array[1];
|
||||
blockData = blockData.replace("]", "");
|
||||
|
|
@ -36,8 +38,9 @@ public class WrappedBlockData {
|
|||
return fromString("minecraft:air");
|
||||
}
|
||||
|
||||
private WrappedBlockData(String key) {
|
||||
minecraftKey = key;
|
||||
private WrappedBlockData(String minecraftKey, int savedBlockStateId) {
|
||||
this.minecraftKey = minecraftKey;
|
||||
this.savedBlockStateId = savedBlockStateId;
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class MappingData {
|
|||
String[] keyAndTranslation = line.split("=", 2);
|
||||
if (keyAndTranslation.length != 2) continue;
|
||||
String key = keyAndTranslation[0];
|
||||
String translation = keyAndTranslation[1];
|
||||
String translation = keyAndTranslation[1].replaceAll("%(\\d\\$)?d", "%$1s");
|
||||
if (!translateData.containsKey(key)) {
|
||||
translateMapping.put(key, translation);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -11,11 +11,10 @@ import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.WorldPackets;
|
|||
import java.util.Arrays;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
public class ParticleRewriter {
|
||||
private static List<NewParticle> particles = new LinkedList<>();
|
||||
private static Random rand = new Random();
|
||||
|
||||
static {
|
||||
add(34); // (0->34) explode -> minecraft:poof
|
||||
|
|
@ -108,17 +107,17 @@ public class ParticleRewriter {
|
|||
return new ParticleDataHandler() {
|
||||
@Override
|
||||
public Particle handler(Particle particle, Integer[] data) {
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Red 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Green 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomFloat())); // Blue 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1));// Scale 0.01 - 4
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Red 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 0f)); // Green 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, randomBool() ? 1f : 0f)); // Blue 0 - 1
|
||||
particle.getArguments().add(new Particle.ParticleData(Type.FLOAT, 1f));// Scale 0.01 - 4
|
||||
return particle;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static float randomFloat() {
|
||||
return rand.nextFloat();
|
||||
private static boolean randomBool() {
|
||||
return ThreadLocalRandom.current().nextBoolean();
|
||||
}
|
||||
|
||||
// Rewrite IconCrack items to new format :)
|
||||
|
|
|
|||
|
|
@ -615,7 +615,7 @@ public class InventoryPackets {
|
|||
ench.add(enchEntry);
|
||||
}
|
||||
}
|
||||
tag.remove("Enchantment");
|
||||
tag.remove("Enchantments");
|
||||
tag.put(ench);
|
||||
}
|
||||
if (tag.get("StoredEnchantments") instanceof ListTag) {
|
||||
|
|
|
|||
|
|
@ -175,12 +175,13 @@ public class WorldPackets {
|
|||
|
||||
if (Via.getConfig().isServersideBlockConnections()) {
|
||||
UserConnection userConnection = wrapper.user();
|
||||
|
||||
ConnectionData.updateBlockStorage(userConnection, position, newId);
|
||||
|
||||
if (ConnectionData.connects(newId)) {
|
||||
newId = ConnectionData.connect(userConnection, position, newId);
|
||||
}
|
||||
|
||||
ConnectionData.updateBlockStorage(userConnection, position, newId);
|
||||
|
||||
ConnectionData.update(userConnection, position);
|
||||
}
|
||||
|
||||
|
|
@ -415,15 +416,20 @@ public class WorldPackets {
|
|||
if (particle.getId() == 11) {
|
||||
int count = wrapper.get(Type.INT, 1);
|
||||
float speed = wrapper.get(Type.FLOAT, 6);
|
||||
// Only handle for count = 0 & speed = 1
|
||||
if (count == 0 && speed == 1) {
|
||||
// Only handle for count = 0
|
||||
if (count == 0) {
|
||||
wrapper.set(Type.INT, 1, 1);
|
||||
wrapper.set(Type.FLOAT, 6, 0f);
|
||||
|
||||
List<Particle.ParticleData> arguments = particle.getArguments();
|
||||
for (int i = 0; i < 3; i++) {
|
||||
//RGB values are represented by the X/Y/Z offset
|
||||
arguments.get(i).setValue(wrapper.get(Type.FLOAT, i + 3));
|
||||
float colorValue = wrapper.get(Type.FLOAT, i + 3) * speed;
|
||||
if (colorValue == 0 && i == 0) {
|
||||
// https://minecraft.gamepedia.com/User:Alphappy/reddust
|
||||
colorValue = 1;
|
||||
}
|
||||
arguments.get(i).setValue(colorValue);
|
||||
wrapper.set(Type.FLOAT, i + 3, 0f);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +1,88 @@
|
|||
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import us.myles.ViaVersion.api.Pair;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.data.StoredObject;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.api.minecraft.Position;
|
||||
import us.myles.ViaVersion.api.minecraft.chunks.NibbleArray;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.data.MappingData;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.WorldPackets;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class BlockConnectionStorage extends StoredObject {
|
||||
private Map<Pair<Integer, Integer>, Map<BlockPositon, Integer>> blockStorage = new HashMap<>();
|
||||
private Map<Long, Pair<byte[], NibbleArray>> blockStorage = createLongObjectMap();
|
||||
|
||||
private static Constructor<?> fastUtilLongObjectHashMap;
|
||||
private static HashMap<Short, Short> reverseBlockMappings;
|
||||
|
||||
static {
|
||||
try {
|
||||
fastUtilLongObjectHashMap = Class.forName("it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap").getConstructor();
|
||||
Via.getPlatform().getLogger().info("Using FastUtil Long2ObjectOpenHashMap for block connections");
|
||||
} catch (ClassNotFoundException | NoSuchMethodException ignored) {
|
||||
}
|
||||
reverseBlockMappings = new HashMap<>();
|
||||
for (int i = 0; i < 4096; i++) {
|
||||
int newBlock = MappingData.blockMappings.getNewBlock(i);
|
||||
if (newBlock != -1) reverseBlockMappings.put((short) newBlock, (short) i);
|
||||
}
|
||||
}
|
||||
|
||||
public BlockConnectionStorage(UserConnection user) {
|
||||
super(user);
|
||||
}
|
||||
|
||||
public void store(Position position, int blockState) {
|
||||
Pair pair = getPair(position);
|
||||
Map<BlockPositon, Integer> map = getChunkMap(pair);
|
||||
map.put(new BlockPositon(position), blockState);
|
||||
Short mapping = reverseBlockMappings.get((short) blockState);
|
||||
if (mapping == null) return;
|
||||
blockState = mapping;
|
||||
long pair = getChunkSectionIndex(position);
|
||||
Pair<byte[], NibbleArray> map = getChunkSection(pair, (blockState & 0xF) != 0);
|
||||
int blockIndex = encodeBlockPos(position);
|
||||
map.getKey()[blockIndex] = (byte) (blockState >> 4);
|
||||
NibbleArray nibbleArray = map.getValue();
|
||||
if (nibbleArray != null) nibbleArray.set(blockIndex, blockState);
|
||||
}
|
||||
|
||||
public int get(Position position) {
|
||||
Pair pair = getPair(position);
|
||||
Map<BlockPositon, Integer> map = getChunkMap(pair);
|
||||
BlockPositon blockPositon = new BlockPositon(position);
|
||||
return map.containsKey(blockPositon) ? map.get(blockPositon) : 0;
|
||||
long pair = getChunkSectionIndex(position);
|
||||
Pair<byte[], NibbleArray> map = blockStorage.get(pair);
|
||||
if (map == null) return 0;
|
||||
short blockPosition = encodeBlockPos(position);
|
||||
NibbleArray nibbleArray = map.getValue();
|
||||
return WorldPackets.toNewId(
|
||||
((map.getKey()[blockPosition] & 0xFF) << 4)
|
||||
| (nibbleArray == null ? 0 : nibbleArray.get(blockPosition))
|
||||
);
|
||||
}
|
||||
|
||||
public void remove(Position position) {
|
||||
Pair pair = getPair(position);
|
||||
Map<BlockPositon, Integer> map = getChunkMap(pair);
|
||||
map.remove(new BlockPositon(position));
|
||||
if (map.isEmpty()) {
|
||||
blockStorage.remove(pair);
|
||||
long pair = getChunkSectionIndex(position);
|
||||
Pair<byte[], NibbleArray> map = blockStorage.get(pair);
|
||||
if (map == null) return;
|
||||
int blockIndex = encodeBlockPos(position);
|
||||
NibbleArray nibbleArray = map.getValue();
|
||||
if (nibbleArray != null) {
|
||||
nibbleArray.set(blockIndex, 0);
|
||||
boolean allZero = true;
|
||||
for (int i = 0; i < 4096; i++) {
|
||||
if (nibbleArray.get(i) != 0) {
|
||||
allZero = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (allZero) map.setValue(null);
|
||||
}
|
||||
map.getKey()[blockIndex] = 0;
|
||||
for (short entry : map.getKey()) {
|
||||
if (entry != 0) return;
|
||||
}
|
||||
blockStorage.remove(pair);
|
||||
}
|
||||
|
||||
public void clear() {
|
||||
|
|
@ -44,33 +90,47 @@ public class BlockConnectionStorage extends StoredObject {
|
|||
}
|
||||
|
||||
public void unloadChunk(int x, int z) {
|
||||
blockStorage.remove(new Pair<>(x, z));
|
||||
for (int y = 0; y < 256; y += 16) {
|
||||
blockStorage.remove(getChunkSectionIndex(x, y, z));
|
||||
}
|
||||
}
|
||||
|
||||
private Map<BlockPositon, Integer> getChunkMap(Pair pair) {
|
||||
Map<BlockPositon, Integer> map = blockStorage.get(pair);
|
||||
private Pair<byte[], NibbleArray> getChunkSection(long index, boolean requireNibbleArray) {
|
||||
Pair<byte[], NibbleArray> map = blockStorage.get(index);
|
||||
if (map == null) {
|
||||
map = new HashMap<>();
|
||||
blockStorage.put(pair, map);
|
||||
map = new Pair<>(new byte[4096], null);
|
||||
blockStorage.put(index, map);
|
||||
}
|
||||
if (map.getValue() == null && requireNibbleArray) {
|
||||
map.setValue(new NibbleArray(4096));
|
||||
}
|
||||
return map;
|
||||
}
|
||||
|
||||
private Pair<Integer, Integer> getPair(Position position) {
|
||||
int chunkX = (int) (position.getX() >> 4);
|
||||
int chunkZ = (int) (position.getZ() >> 4);
|
||||
return new Pair<>(chunkX, chunkZ);
|
||||
private long getChunkSectionIndex(int x, int y, int z) {
|
||||
return (((x >> 4) & 0x3FFFFFFL) << 38) | (((y >> 4) & 0xFFFL) << 26) | ((z >> 4) & 0x3FFFFFFL);
|
||||
}
|
||||
|
||||
@EqualsAndHashCode
|
||||
@Data
|
||||
private class BlockPositon {
|
||||
int x, y, z;
|
||||
private long getChunkSectionIndex(Position position) {
|
||||
return getChunkSectionIndex(position.getX().intValue(), position.getY().intValue(), position.getZ().intValue());
|
||||
}
|
||||
|
||||
public BlockPositon(Position position) {
|
||||
x = position.getX().intValue();
|
||||
y = position.getY().intValue();
|
||||
z = position.getZ().intValue();
|
||||
private short encodeBlockPos(int x, int y, int z) {
|
||||
return (short) (((y & 0xF) << 8) | ((x & 0xF) << 4) | (z & 0xF));
|
||||
}
|
||||
|
||||
private short encodeBlockPos(Position pos) {
|
||||
return encodeBlockPos(pos.getX().intValue(), pos.getY().intValue(), pos.getZ().intValue());
|
||||
}
|
||||
|
||||
private <T> Map<Long, T> createLongObjectMap() {
|
||||
if (fastUtilLongObjectHashMap != null) {
|
||||
try {
|
||||
return (Map<Long, T>) fastUtilLongObjectHashMap.newInstance();
|
||||
} catch (IllegalAccessException | InstantiationException | InvocationTargetException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return new HashMap<>();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,29 +1,36 @@
|
|||
package us.myles.ViaVersion.protocols.protocol1_13to1_12_2.storage;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import us.myles.ViaVersion.api.PacketWrapper;
|
||||
import us.myles.ViaVersion.api.data.StoredObject;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.Protocol1_13To1_12_2;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
public class TabCompleteTracker extends StoredObject {
|
||||
private int transactionId;
|
||||
private String input;
|
||||
private String lastTabComplete;
|
||||
private long timeToSend;
|
||||
|
||||
public TabCompleteTracker(UserConnection user) {
|
||||
super(user);
|
||||
}
|
||||
|
||||
public int getTransactionId() {
|
||||
return transactionId;
|
||||
}
|
||||
|
||||
public void setTransactionId(int transactionId) {
|
||||
this.transactionId = transactionId;
|
||||
}
|
||||
|
||||
public String getInput() {
|
||||
return input;
|
||||
}
|
||||
|
||||
public void setInput(String input) {
|
||||
this.input = input;
|
||||
public void sendPacketToServer() {
|
||||
if (lastTabComplete == null || timeToSend > System.currentTimeMillis()) return;
|
||||
PacketWrapper wrapper = new PacketWrapper(0x01, null, getUser());
|
||||
wrapper.write(Type.STRING, lastTabComplete);
|
||||
wrapper.write(Type.BOOLEAN, false);
|
||||
wrapper.write(Type.OPTIONAL_POSITION, null);
|
||||
try {
|
||||
wrapper.sendToServer(Protocol1_13To1_12_2.class);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
lastTabComplete = null;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -392,19 +392,6 @@ public class PlayerPackets {
|
|||
|
||||
/* Removed packets */
|
||||
|
||||
// Map Bulk
|
||||
protocol.registerOutgoing(State.PLAY, 0x26, 0x26, new PacketRemapper() {
|
||||
@Override
|
||||
public void registerMap() {
|
||||
handler(new PacketHandler() {
|
||||
@Override
|
||||
public void handle(PacketWrapper wrapper) throws Exception {
|
||||
wrapper.cancel();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
// Set Compression
|
||||
protocol.registerOutgoing(State.PLAY, 0x46, 0x46, new PacketRemapper() {
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -114,6 +114,8 @@ team-colour-fix: true
|
|||
suppress-1_13-conversion-errors: false
|
||||
# 1.13 introduced new auto complete which can trigger "Kicked for spamming" for servers older than 1.13, the following option will disable it completely.
|
||||
disable-1_13-auto-complete: false
|
||||
# The following option will delay the tab complete request in x ticks if greater than 0, if other tab-complete is received, the previous is cancelled
|
||||
1_13-tab-complete-delay: 0
|
||||
# For 1.13 clients the smallest (1 layer) snow doesn't have collision, this will send these as 2 snowlayers for 1.13+ clients to prevent them bugging through them
|
||||
fix-low-snow-collision: false
|
||||
#
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -7,11 +7,9 @@
|
|||
"minecraft:polished_diorite",
|
||||
"minecraft:andesite",
|
||||
"minecraft:polished_andesite",
|
||||
"minecraft:grass_block[snowy=true]",
|
||||
"minecraft:grass_block[snowy=false]",
|
||||
"minecraft:dirt",
|
||||
"minecraft:coarse_dirt",
|
||||
"minecraft:podzol[snowy=true]",
|
||||
"minecraft:podzol[snowy=false]",
|
||||
"minecraft:cobblestone",
|
||||
"minecraft:oak_planks",
|
||||
|
|
@ -45,60 +43,12 @@
|
|||
"minecraft:dark_oak_log[axis=x]",
|
||||
"minecraft:dark_oak_log[axis=y]",
|
||||
"minecraft:dark_oak_log[axis=z]",
|
||||
"minecraft:stripped_spruce_log[axis=x]",
|
||||
"minecraft:stripped_spruce_log[axis=y]",
|
||||
"minecraft:stripped_spruce_log[axis=z]",
|
||||
"minecraft:stripped_birch_log[axis=x]",
|
||||
"minecraft:stripped_birch_log[axis=y]",
|
||||
"minecraft:stripped_birch_log[axis=z]",
|
||||
"minecraft:stripped_jungle_log[axis=x]",
|
||||
"minecraft:stripped_jungle_log[axis=y]",
|
||||
"minecraft:stripped_jungle_log[axis=z]",
|
||||
"minecraft:stripped_acacia_log[axis=x]",
|
||||
"minecraft:stripped_acacia_log[axis=y]",
|
||||
"minecraft:stripped_acacia_log[axis=z]",
|
||||
"minecraft:stripped_dark_oak_log[axis=x]",
|
||||
"minecraft:stripped_dark_oak_log[axis=y]",
|
||||
"minecraft:stripped_dark_oak_log[axis=z]",
|
||||
"minecraft:stripped_oak_log[axis=x]",
|
||||
"minecraft:stripped_oak_log[axis=y]",
|
||||
"minecraft:stripped_oak_log[axis=z]",
|
||||
"minecraft:oak_wood[axis=x]",
|
||||
"minecraft:oak_wood[axis=y]",
|
||||
"minecraft:oak_wood[axis=z]",
|
||||
"minecraft:spruce_wood[axis=x]",
|
||||
"minecraft:spruce_wood[axis=y]",
|
||||
"minecraft:spruce_wood[axis=z]",
|
||||
"minecraft:birch_wood[axis=x]",
|
||||
"minecraft:birch_wood[axis=y]",
|
||||
"minecraft:birch_wood[axis=z]",
|
||||
"minecraft:jungle_wood[axis=x]",
|
||||
"minecraft:jungle_wood[axis=y]",
|
||||
"minecraft:jungle_wood[axis=z]",
|
||||
"minecraft:acacia_wood[axis=x]",
|
||||
"minecraft:acacia_wood[axis=y]",
|
||||
"minecraft:acacia_wood[axis=z]",
|
||||
"minecraft:dark_oak_wood[axis=x]",
|
||||
"minecraft:dark_oak_wood[axis=y]",
|
||||
"minecraft:dark_oak_wood[axis=z]",
|
||||
"minecraft:stripped_oak_wood[axis=x]",
|
||||
"minecraft:stripped_oak_wood[axis=y]",
|
||||
"minecraft:stripped_oak_wood[axis=z]",
|
||||
"minecraft:stripped_spruce_wood[axis=x]",
|
||||
"minecraft:stripped_spruce_wood[axis=y]",
|
||||
"minecraft:stripped_spruce_wood[axis=z]",
|
||||
"minecraft:stripped_birch_wood[axis=x]",
|
||||
"minecraft:stripped_birch_wood[axis=y]",
|
||||
"minecraft:stripped_birch_wood[axis=z]",
|
||||
"minecraft:stripped_jungle_wood[axis=x]",
|
||||
"minecraft:stripped_jungle_wood[axis=y]",
|
||||
"minecraft:stripped_jungle_wood[axis=z]",
|
||||
"minecraft:stripped_acacia_wood[axis=x]",
|
||||
"minecraft:stripped_acacia_wood[axis=y]",
|
||||
"minecraft:stripped_acacia_wood[axis=z]",
|
||||
"minecraft:stripped_dark_oak_wood[axis=x]",
|
||||
"minecraft:stripped_dark_oak_wood[axis=y]",
|
||||
"minecraft:stripped_dark_oak_wood[axis=z]",
|
||||
"minecraft:sponge",
|
||||
"minecraft:wet_sponge",
|
||||
"minecraft:lapis_ore",
|
||||
|
|
@ -118,506 +68,7 @@
|
|||
"minecraft:sandstone",
|
||||
"minecraft:chiseled_sandstone",
|
||||
"minecraft:cut_sandstone",
|
||||
"minecraft:note_block[instrument=harp,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=harp,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=harp,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=basedrum,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=basedrum,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=snare,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=snare,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=hat,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=hat,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=bass,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=bass,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=flute,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=flute,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=bell,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=bell,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=guitar,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=guitar,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=chime,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=chime,note=24,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=0,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=0,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=1,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=1,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=2,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=2,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=3,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=3,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=4,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=4,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=5,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=5,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=6,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=6,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=7,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=7,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=8,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=8,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=9,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=9,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=10,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=10,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=11,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=11,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=12,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=12,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=13,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=13,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=14,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=14,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=15,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=15,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=16,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=16,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=17,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=17,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=18,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=18,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=19,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=19,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=20,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=20,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=21,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=21,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=22,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=22,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=23,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=23,powered=false]",
|
||||
"minecraft:note_block[instrument=xylophone,note=24,powered=true]",
|
||||
"minecraft:note_block[instrument=xylophone,note=24,powered=false]",
|
||||
"minecraft:white_wool",
|
||||
"minecraft:orange_wool",
|
||||
"minecraft:magenta_wool",
|
||||
|
|
@ -658,7 +109,6 @@
|
|||
"minecraft:clay",
|
||||
"minecraft:jukebox[has_record=true]",
|
||||
"minecraft:jukebox[has_record=false]",
|
||||
"minecraft:pumpkin",
|
||||
"minecraft:netherrack",
|
||||
"minecraft:soul_sand",
|
||||
"minecraft:carved_pumpkin[facing=north]",
|
||||
|
|
@ -680,199 +130,30 @@
|
|||
"minecraft:cracked_stone_bricks",
|
||||
"minecraft:chiseled_stone_bricks",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=true,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:brown_mushroom_block[down=false,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=true,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:red_mushroom_block[down=false,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=true,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=true,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=true,south=false,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=true,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=true,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=true,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=true,up=false,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=false,up=true,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=false,up=true,west=false]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=false,up=false,west=true]",
|
||||
"minecraft:mushroom_stem[down=false,east=false,north=false,south=false,up=false,west=false]",
|
||||
"minecraft:melon",
|
||||
"minecraft:mycelium[snowy=true]",
|
||||
"minecraft:mycelium[snowy=false]",
|
||||
"minecraft:nether_bricks",
|
||||
"minecraft:end_stone",
|
||||
|
|
@ -931,12 +212,6 @@
|
|||
"minecraft:prismarine",
|
||||
"minecraft:prismarine_bricks",
|
||||
"minecraft:dark_prismarine",
|
||||
"minecraft:prismarine_slab[type=double,waterlogged=true]",
|
||||
"minecraft:prismarine_slab[type=double,waterlogged=false]",
|
||||
"minecraft:prismarine_brick_slab[type=double,waterlogged=true]",
|
||||
"minecraft:prismarine_brick_slab[type=double,waterlogged=false]",
|
||||
"minecraft:dark_prismarine_slab[type=double,waterlogged=true]",
|
||||
"minecraft:dark_prismarine_slab[type=double,waterlogged=false]",
|
||||
"minecraft:hay_block[axis=x]",
|
||||
"minecraft:hay_block[axis=y]",
|
||||
"minecraft:hay_block[axis=z]",
|
||||
|
|
@ -946,37 +221,21 @@
|
|||
"minecraft:red_sandstone",
|
||||
"minecraft:chiseled_red_sandstone",
|
||||
"minecraft:cut_red_sandstone",
|
||||
"minecraft:oak_slab[type=double,waterlogged=true]",
|
||||
"minecraft:oak_slab[type=double,waterlogged=false]",
|
||||
"minecraft:spruce_slab[type=double,waterlogged=true]",
|
||||
"minecraft:spruce_slab[type=double,waterlogged=false]",
|
||||
"minecraft:birch_slab[type=double,waterlogged=true]",
|
||||
"minecraft:birch_slab[type=double,waterlogged=false]",
|
||||
"minecraft:jungle_slab[type=double,waterlogged=true]",
|
||||
"minecraft:jungle_slab[type=double,waterlogged=false]",
|
||||
"minecraft:acacia_slab[type=double,waterlogged=true]",
|
||||
"minecraft:acacia_slab[type=double,waterlogged=false]",
|
||||
"minecraft:dark_oak_slab[type=double,waterlogged=true]",
|
||||
"minecraft:dark_oak_slab[type=double,waterlogged=false]",
|
||||
"minecraft:stone_slab[type=double,waterlogged=true]",
|
||||
"minecraft:stone_slab[type=double,waterlogged=false]",
|
||||
"minecraft:sandstone_slab[type=double,waterlogged=true]",
|
||||
"minecraft:sandstone_slab[type=double,waterlogged=false]",
|
||||
"minecraft:petrified_oak_slab[type=double,waterlogged=true]",
|
||||
"minecraft:petrified_oak_slab[type=double,waterlogged=false]",
|
||||
"minecraft:cobblestone_slab[type=double,waterlogged=true]",
|
||||
"minecraft:cobblestone_slab[type=double,waterlogged=false]",
|
||||
"minecraft:brick_slab[type=double,waterlogged=true]",
|
||||
"minecraft:brick_slab[type=double,waterlogged=false]",
|
||||
"minecraft:stone_brick_slab[type=double,waterlogged=true]",
|
||||
"minecraft:stone_brick_slab[type=double,waterlogged=false]",
|
||||
"minecraft:nether_brick_slab[type=double,waterlogged=true]",
|
||||
"minecraft:nether_brick_slab[type=double,waterlogged=false]",
|
||||
"minecraft:quartz_slab[type=double,waterlogged=true]",
|
||||
"minecraft:quartz_slab[type=double,waterlogged=false]",
|
||||
"minecraft:red_sandstone_slab[type=double,waterlogged=true]",
|
||||
"minecraft:red_sandstone_slab[type=double,waterlogged=false]",
|
||||
"minecraft:purpur_slab[type=double,waterlogged=true]",
|
||||
"minecraft:purpur_slab[type=double,waterlogged=false]",
|
||||
"minecraft:smooth_stone",
|
||||
"minecraft:smooth_sandstone",
|
||||
|
|
@ -1113,18 +372,6 @@
|
|||
"minecraft:green_concrete_powder",
|
||||
"minecraft:red_concrete_powder",
|
||||
"minecraft:black_concrete_powder",
|
||||
"minecraft:dried_kelp_block",
|
||||
"minecraft:dead_tube_coral_block",
|
||||
"minecraft:dead_brain_coral_block",
|
||||
"minecraft:dead_bubble_coral_block",
|
||||
"minecraft:dead_fire_coral_block",
|
||||
"minecraft:dead_horn_coral_block",
|
||||
"minecraft:tube_coral_block",
|
||||
"minecraft:brain_coral_block",
|
||||
"minecraft:bubble_coral_block",
|
||||
"minecraft:fire_coral_block",
|
||||
"minecraft:horn_coral_block",
|
||||
"minecraft:blue_ice",
|
||||
"minecraft:structure_block[mode=save]",
|
||||
"minecraft:structure_block[mode=load]",
|
||||
"minecraft:structure_block[mode=corner]",
|
||||
|
|
|
|||
|
|
@ -448,16 +448,16 @@
|
|||
"1106": "minecraft:lever[face=wall,facing=west,powered=false]",
|
||||
"1107": "minecraft:lever[face=wall,facing=south,powered=false]",
|
||||
"1108": "minecraft:lever[face=wall,facing=north,powered=false]",
|
||||
"1109": "minecraft:lever[face=floor,facing=west,powered=false]",
|
||||
"1110": "minecraft:lever[face=floor,facing=north,powered=false]",
|
||||
"1109": "minecraft:lever[face=floor,facing=north,powered=false]",
|
||||
"1110": "minecraft:lever[face=floor,facing=west,powered=false]",
|
||||
"1111": "minecraft:lever[face=ceiling,facing=north,powered=false]",
|
||||
"1112": "minecraft:lever[face=ceiling,facing=west,powered=true]",
|
||||
"1113": "minecraft:lever[face=wall,facing=east,powered=true]",
|
||||
"1114": "minecraft:lever[face=wall,facing=west,powered=true]",
|
||||
"1115": "minecraft:lever[face=wall,facing=south,powered=true]",
|
||||
"1116": "minecraft:lever[face=wall,facing=north,powered=true]",
|
||||
"1117": "minecraft:lever[face=floor,facing=east,powered=true]",
|
||||
"1118": "minecraft:lever[face=floor,facing=north,powered=true]",
|
||||
"1117": "minecraft:lever[face=floor,facing=north,powered=true]",
|
||||
"1118": "minecraft:lever[face=floor,facing=west,powered=true]",
|
||||
"1119": "minecraft:lever[face=ceiling,facing=north,powered=true]",
|
||||
"1120": "minecraft:stone_pressure_plate[powered=false]",
|
||||
"1121": "minecraft:stone_pressure_plate[powered=true]",
|
||||
|
|
|
|||
|
|
@ -250,4 +250,9 @@ public class SpongeViaConfig extends Config implements ViaVersionConfig {
|
|||
public boolean isSnowCollisionFix() {
|
||||
return getBoolean("fix-low-snow-collision", false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int get1_13TabCompleteDelay() {
|
||||
return getInt("1_13-tab-complete-delay", 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,21 +5,27 @@ import com.velocitypowered.api.event.Subscribe;
|
|||
import com.velocitypowered.api.event.player.ServerConnectedEvent;
|
||||
import com.velocitypowered.api.event.player.ServerPreConnectEvent;
|
||||
import com.velocitypowered.api.network.ProtocolVersion;
|
||||
import us.myles.ViaVersion.api.PacketWrapper;
|
||||
import us.myles.ViaVersion.api.Pair;
|
||||
import us.myles.ViaVersion.api.Via;
|
||||
import us.myles.ViaVersion.api.boss.BossBar;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.api.protocol.Protocol;
|
||||
import us.myles.ViaVersion.api.protocol.ProtocolPipeline;
|
||||
import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
|
||||
import us.myles.ViaVersion.api.type.Type;
|
||||
import us.myles.ViaVersion.protocols.base.ProtocolInfo;
|
||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
|
||||
import us.myles.ViaVersion.protocols.protocol1_13to1_12_2.packets.InventoryPackets;
|
||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
|
||||
import us.myles.ViaVersion.util.ReflectionUtil;
|
||||
import us.myles.ViaVersion.velocity.service.ProtocolDetectorService;
|
||||
import us.myles.ViaVersion.velocity.storage.VelocityStorage;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.Semaphore;
|
||||
|
||||
public class VelocityServerHandler {
|
||||
|
|
@ -27,6 +33,7 @@ public class VelocityServerHandler {
|
|||
private static Method setNextProtocolVersion;
|
||||
private static Method getMinecraftConnection;
|
||||
private static Method getNextProtocolVersion;
|
||||
private static Method getKnownChannels;
|
||||
|
||||
static {
|
||||
try {
|
||||
|
|
@ -38,6 +45,8 @@ public class VelocityServerHandler {
|
|||
.getDeclaredMethod("getMinecraftConnection");
|
||||
getNextProtocolVersion = Class.forName("com.velocitypowered.proxy.connection.MinecraftConnection")
|
||||
.getDeclaredMethod("getNextProtocolVersion");
|
||||
getKnownChannels = Class.forName("com.velocitypowered.proxy.connection.client.ClientPlaySessionHandler")
|
||||
.getDeclaredMethod("getKnownChannels");
|
||||
} catch (NoSuchMethodException | ClassNotFoundException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
|
@ -78,14 +87,6 @@ public class VelocityServerHandler {
|
|||
|
||||
public void checkServerChange(ServerConnectedEvent e, UserConnection user) throws Exception {
|
||||
if (user == null) return;
|
||||
// Manually hide ViaVersion-created BossBars if the childserver was version 1.8.x (#666)
|
||||
if (user.has(EntityTracker.class)) {
|
||||
EntityTracker tracker = user.get(EntityTracker.class);
|
||||
|
||||
if (tracker.getBossBarMap() != null)
|
||||
for (BossBar bar : tracker.getBossBarMap().values())
|
||||
bar.hide();
|
||||
}
|
||||
// Handle server/version change
|
||||
if (user.has(VelocityStorage.class)) {
|
||||
// Wait all the scheduled packets be sent
|
||||
|
|
@ -99,6 +100,8 @@ public class VelocityServerHandler {
|
|||
|
||||
VelocityStorage storage = user.get(VelocityStorage.class);
|
||||
|
||||
if (storage.getBossbar() == null) storage.saveServerBossBars();
|
||||
|
||||
if (e.getServer() != null) {
|
||||
if (!e.getServer().getServerInfo().getName().equals(storage.getCurrentServer())) {
|
||||
String serverName = e.getServer().getServerInfo().getName();
|
||||
|
|
@ -107,7 +110,20 @@ public class VelocityServerHandler {
|
|||
|
||||
int protocolId = ProtocolDetectorService.getProtocolId(serverName);
|
||||
|
||||
if (protocolId <= ProtocolVersion.MINECRAFT_1_8.getProtocol()) { // 1.8 doesn't have BossBar packet
|
||||
if (storage.getBossbar() != null) {
|
||||
for (UUID uuid : storage.getBossbar()) {
|
||||
PacketWrapper wrapper = new PacketWrapper(0x0C, null, user);
|
||||
wrapper.write(Type.UUID, uuid);
|
||||
wrapper.write(Type.VAR_INT, 1); // remove
|
||||
wrapper.send(Protocol1_9TO1_8.class, true, true);
|
||||
}
|
||||
storage.getBossbar().clear();
|
||||
}
|
||||
}
|
||||
|
||||
ProtocolInfo info = user.get(ProtocolInfo.class);
|
||||
int previousServerProtocol = info.getServerProtocolVersion();
|
||||
|
||||
// Refresh the pipes
|
||||
List<Pair<Integer, Protocol>> protocols = ProtocolRegistry.getProtocolPath(info.getProtocolVersion(), protocolId);
|
||||
|
|
@ -127,6 +143,33 @@ public class VelocityServerHandler {
|
|||
// Add version-specific base Protocol
|
||||
pipeline.add(ProtocolRegistry.getBaseProtocol(protocolId));
|
||||
|
||||
// Workaround 1.13 server change
|
||||
Set<String> knownChannels = (Set<String>) getKnownChannels.invoke(
|
||||
ReflectionUtil.invoke(
|
||||
getMinecraftConnection.invoke(e.getPlayer()),
|
||||
"getSessionHandler"
|
||||
)
|
||||
);
|
||||
if (previousServerProtocol != -1) {
|
||||
int id1_13 = ProtocolVersion.MINECRAFT_1_13.getProtocol();
|
||||
if (previousServerProtocol < id1_13 && protocolId >= id1_13) {
|
||||
ArrayList<String> newChannels = new ArrayList<>();
|
||||
for (String oldChannel : knownChannels) {
|
||||
newChannels.add(InventoryPackets.getNewPluginChannelId(oldChannel));
|
||||
}
|
||||
knownChannels.clear();
|
||||
knownChannels.addAll(newChannels);
|
||||
|
||||
} else if (previousServerProtocol >= id1_13 && protocolId < id1_13) {
|
||||
ArrayList<String> newChannels = new ArrayList<>();
|
||||
for (String oldChannel : knownChannels) {
|
||||
newChannels.add(InventoryPackets.getOldPluginChannelId(oldChannel));
|
||||
}
|
||||
knownChannels.clear();
|
||||
knownChannels.addAll(newChannels);
|
||||
}
|
||||
}
|
||||
|
||||
user.put(info);
|
||||
user.put(storage);
|
||||
|
||||
|
|
|
|||
|
|
@ -302,4 +302,9 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
|
|||
public boolean isSnowCollisionFix() {
|
||||
return getBoolean("fix-low-snow-collision", false);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int get1_13TabCompleteDelay() {
|
||||
return getInt("1_13-tab-complete-delay", 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,10 @@ import lombok.Data;
|
|||
import lombok.EqualsAndHashCode;
|
||||
import us.myles.ViaVersion.api.data.StoredObject;
|
||||
import us.myles.ViaVersion.api.data.UserConnection;
|
||||
import us.myles.ViaVersion.util.ReflectionUtil;
|
||||
|
||||
import java.util.Set;
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
@Data
|
||||
|
|
@ -14,24 +16,24 @@ import java.util.UUID;
|
|||
public class VelocityStorage extends StoredObject {
|
||||
private Player player;
|
||||
private String currentServer;
|
||||
private Set<UUID> bossbar;
|
||||
private List<UUID> bossbar;
|
||||
|
||||
public VelocityStorage(UserConnection user, Player player) {
|
||||
super(user);
|
||||
this.player = player;
|
||||
this.currentServer = "";
|
||||
}
|
||||
|
||||
public void saveServerBossBars() {
|
||||
// Get bossbar list if it's supported
|
||||
/* TODO make this work - do we need this?
|
||||
try {
|
||||
Object connection = ReflectionUtil.invoke(player, "getConnection");
|
||||
Object connection = ReflectionUtil.invoke(player, "getMinecraftConnection");
|
||||
Object sessionHandler = ReflectionUtil.invoke(connection, "getSessionHandler");
|
||||
if (sessionHandler.getClass().getSimpleName().contains("Play")) {
|
||||
bossbar = (Set<UUID>) ReflectionUtil.invoke(sessionHandler, "getServerBossBars");
|
||||
bossbar = (List<UUID>) ReflectionUtil.invoke(sessionHandler, "getServerBossBars");
|
||||
}
|
||||
} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue