Mirror von
https://github.com/ViaVersion/ViaVersion.git
synchronisiert 2024-12-26 16:12:42 +01:00
Remove event-based commandblock listeners
Dieser Commit ist enthalten in:
Matsv
Ursprung
52bbf1affe
Commit
dd6423de06
@ -1,143 +0,0 @@
|
|||||||
package us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8;
|
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
import io.netty.buffer.ByteBufOutputStream;
|
|
||||||
import io.netty.buffer.Unpooled;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.block.Block;
|
|
||||||
import org.bukkit.block.CommandBlock;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.event.EventHandler;
|
|
||||||
import org.bukkit.event.EventPriority;
|
|
||||||
import org.bukkit.event.block.Action;
|
|
||||||
import org.bukkit.event.player.PlayerChangedWorldEvent;
|
|
||||||
import org.bukkit.event.player.PlayerInteractEvent;
|
|
||||||
import org.bukkit.event.player.PlayerJoinEvent;
|
|
||||||
import org.bukkit.event.player.PlayerRespawnEvent;
|
|
||||||
import org.spacehq.opennbt.tag.builtin.ByteTag;
|
|
||||||
import org.spacehq.opennbt.tag.builtin.CompoundTag;
|
|
||||||
import us.myles.ViaVersion.ViaVersionPlugin;
|
|
||||||
import us.myles.ViaVersion.api.PacketWrapper;
|
|
||||||
import us.myles.ViaVersion.api.data.UserConnection;
|
|
||||||
import us.myles.ViaVersion.api.minecraft.Position;
|
|
||||||
import us.myles.ViaVersion.api.type.Type;
|
|
||||||
import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
|
|
||||||
import us.myles.ViaVersion.bukkit.util.NMSUtil;
|
|
||||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
|
|
||||||
import us.myles.ViaVersion.util.ReflectionUtil;
|
|
||||||
|
|
||||||
import java.io.DataOutput;
|
|
||||||
import java.io.DataOutputStream;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
|
|
||||||
public class CommandBlockListener extends ViaBukkitListener {
|
|
||||||
|
|
||||||
public CommandBlockListener(ViaVersionPlugin plugin) {
|
|
||||||
super(plugin, Protocol1_9TO1_8.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
|
||||||
public void onJoin(PlayerJoinEvent e) {
|
|
||||||
sendOp(e.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
public void onRespawn(final PlayerRespawnEvent e) {
|
|
||||||
if (!isOnPipe(e.getPlayer())) return;
|
|
||||||
|
|
||||||
Bukkit.getScheduler().runTaskLater(getPlugin(), new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
sendOp(e.getPlayer());
|
|
||||||
}
|
|
||||||
}, 1L);
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
public void onWorldChange(PlayerChangedWorldEvent e) {
|
|
||||||
sendOp(e.getPlayer());
|
|
||||||
}
|
|
||||||
|
|
||||||
@EventHandler(ignoreCancelled = true)
|
|
||||||
public void onInteract(PlayerInteractEvent e) {
|
|
||||||
if (e.getAction() == Action.RIGHT_CLICK_BLOCK && isOnPipe(e.getPlayer()) && e.getPlayer().isOp()) {
|
|
||||||
try {
|
|
||||||
sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
|
|
||||||
} catch (Exception ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendOp(Player p) {
|
|
||||||
if (p.isOp() && isOnPipe(p)) {
|
|
||||||
try {
|
|
||||||
PacketWrapper wrapper = new PacketWrapper(0x1B, null, getUserConnection(p)); // Entity status
|
|
||||||
|
|
||||||
wrapper.write(Type.INT, p.getEntityId()); // Entity ID
|
|
||||||
wrapper.write(Type.BYTE, (byte) 26); //Hardcoded op permission level
|
|
||||||
|
|
||||||
wrapper.send(Protocol1_9TO1_8.class);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendCommandBlockPacket(Block b, Player player) throws Exception {
|
|
||||||
if (!(b.getState() instanceof CommandBlock))
|
|
||||||
return;
|
|
||||||
CommandBlock cmd = (CommandBlock) b.getState();
|
|
||||||
|
|
||||||
Object tileEntityCommand = ReflectionUtil.get(cmd, "commandBlock", NMSUtil.nms("TileEntityCommand"));
|
|
||||||
Object updatePacket = ReflectionUtil.invoke(tileEntityCommand, "getUpdatePacket");
|
|
||||||
|
|
||||||
PacketWrapper wrapper = generatePacket(updatePacket, getUserConnection(player));
|
|
||||||
wrapper.send(Protocol1_9TO1_8.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
private PacketWrapper generatePacket(Object updatePacket, UserConnection usr) throws Exception {
|
|
||||||
PacketWrapper wrapper = new PacketWrapper(0x09, null, usr); // Update block entity
|
|
||||||
|
|
||||||
long[] pos = getPosition(ReflectionUtil.get(updatePacket, "a", NMSUtil.nms("BlockPosition")));
|
|
||||||
|
|
||||||
wrapper.write(Type.POSITION, new Position(pos[0], pos[1], pos[2])); //Block position
|
|
||||||
wrapper.write(Type.BYTE, (byte) 2); // Action id always 2
|
|
||||||
|
|
||||||
CompoundTag nbt = getNBT(ReflectionUtil.get(updatePacket, "c", NMSUtil.nms("NBTTagCompound")));
|
|
||||||
if (nbt == null) {
|
|
||||||
wrapper.write(Type.BYTE, (byte) 0); //If nbt is null. Use 0 as nbt
|
|
||||||
return wrapper;
|
|
||||||
}
|
|
||||||
nbt.put(new ByteTag("powered", (byte) 0));
|
|
||||||
nbt.put(new ByteTag("auto", (byte) 0));
|
|
||||||
nbt.put(new ByteTag("conditionMet", (byte) 0));
|
|
||||||
|
|
||||||
wrapper.write(Type.NBT, nbt); // NBT TAG
|
|
||||||
return wrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
private long[] getPosition(Object obj) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
|
|
||||||
return new long[]{
|
|
||||||
(long) ReflectionUtil.getSuper(obj, "a", int.class), //X
|
|
||||||
(long) ReflectionUtil.getSuper(obj, isR1() ? "b" : "c", int.class), //Y
|
|
||||||
(long) ReflectionUtil.getSuper(obj, isR1() ? "c" : "d", int.class) //Z
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean isR1() {
|
|
||||||
return NMSUtil.getVersion().equals("v1_8_R1");
|
|
||||||
}
|
|
||||||
|
|
||||||
private CompoundTag getNBT(Object obj) throws Exception {
|
|
||||||
ByteBuf buf = Unpooled.buffer();
|
|
||||||
Method m = NMSUtil.nms("NBTCompressedStreamTools").getMethod("a", NMSUtil.nms("NBTTagCompound"), DataOutput.class);
|
|
||||||
m.invoke(null, obj, new DataOutputStream(new ByteBufOutputStream(buf)));
|
|
||||||
try {
|
|
||||||
return Type.NBT.read(buf);
|
|
||||||
} finally {
|
|
||||||
buf.release();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -45,7 +45,6 @@ public class BukkitViaLoader implements ViaPlatformLoader {
|
|||||||
/* 1.9 client to 1.8 server */
|
/* 1.9 client to 1.8 server */
|
||||||
|
|
||||||
new ArmorListener(plugin).register();
|
new ArmorListener(plugin).register();
|
||||||
new CommandBlockListener(plugin).register();
|
|
||||||
new DeathListener(plugin).register();
|
new DeathListener(plugin).register();
|
||||||
new BlockListener(plugin).register();
|
new BlockListener(plugin).register();
|
||||||
|
|
||||||
|
|||||||
@ -341,6 +341,7 @@ public class PlayerPackets {
|
|||||||
public void handle(PacketWrapper wrapper) throws Exception {
|
public void handle(PacketWrapper wrapper) throws Exception {
|
||||||
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
CommandBlockProvider provider = Via.getManager().getProviders().get(CommandBlockProvider.class);
|
||||||
provider.sendPermission(wrapper.user());
|
provider.sendPermission(wrapper.user());
|
||||||
|
provider.unloadChunks(wrapper.user());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@ -62,4 +62,9 @@ public class CommandBlockProvider implements Provider {
|
|||||||
public boolean isEnabled() {
|
public boolean isEnabled() {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void unloadChunks(UserConnection userConnection) {
|
||||||
|
if (isEnabled())
|
||||||
|
getStorage(userConnection).unloadChunks();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -69,4 +69,8 @@ public class CommandBlockStorage extends StoredObject {
|
|||||||
|
|
||||||
return Optional.of(tag);
|
return Optional.of(tag);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void unloadChunks() {
|
||||||
|
storedCommandBlocks.clear();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,156 +0,0 @@
|
|||||||
package us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8;
|
|
||||||
|
|
||||||
import io.netty.buffer.ByteBuf;
|
|
||||||
import io.netty.buffer.ByteBufOutputStream;
|
|
||||||
import io.netty.buffer.Unpooled;
|
|
||||||
import org.spacehq.opennbt.tag.builtin.ByteTag;
|
|
||||||
import org.spacehq.opennbt.tag.builtin.CompoundTag;
|
|
||||||
import org.spongepowered.api.Sponge;
|
|
||||||
import org.spongepowered.api.block.tileentity.CommandBlock;
|
|
||||||
import org.spongepowered.api.block.tileentity.TileEntity;
|
|
||||||
import org.spongepowered.api.entity.living.player.Player;
|
|
||||||
import org.spongepowered.api.event.Listener;
|
|
||||||
import org.spongepowered.api.event.block.InteractBlockEvent;
|
|
||||||
import org.spongepowered.api.event.entity.living.humanoid.player.RespawnPlayerEvent;
|
|
||||||
import org.spongepowered.api.event.filter.cause.Root;
|
|
||||||
import org.spongepowered.api.event.network.ClientConnectionEvent;
|
|
||||||
import org.spongepowered.api.world.Location;
|
|
||||||
import org.spongepowered.api.world.World;
|
|
||||||
import us.myles.ViaVersion.SpongePlugin;
|
|
||||||
import us.myles.ViaVersion.api.PacketWrapper;
|
|
||||||
import us.myles.ViaVersion.api.data.UserConnection;
|
|
||||||
import us.myles.ViaVersion.api.minecraft.Position;
|
|
||||||
import us.myles.ViaVersion.api.type.Type;
|
|
||||||
import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
|
|
||||||
import us.myles.ViaVersion.sponge.listeners.ViaSpongeListener;
|
|
||||||
import us.myles.ViaVersion.util.ReflectionUtil;
|
|
||||||
|
|
||||||
import java.io.DataOutput;
|
|
||||||
import java.io.DataOutputStream;
|
|
||||||
import java.lang.reflect.Method;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
// TODO Change to bytebuf to not use reflection bullsh*t
|
|
||||||
public class CommandBlockListener extends ViaSpongeListener {
|
|
||||||
public CommandBlockListener(SpongePlugin plugin) {
|
|
||||||
super(plugin, Protocol1_9TO1_8.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Listener
|
|
||||||
public void onJoin(ClientConnectionEvent.Join e) {
|
|
||||||
sendOp(e.getTargetEntity());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Listener
|
|
||||||
public void onRespawn(RespawnPlayerEvent e) {
|
|
||||||
if (!isOnPipe(e.getTargetEntity().getUniqueId())) return;
|
|
||||||
|
|
||||||
Sponge.getScheduler().createTaskBuilder().delayTicks(1).execute(new Runnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
sendOp(e.getTargetEntity());
|
|
||||||
}
|
|
||||||
}).submit(getPlugin());
|
|
||||||
}
|
|
||||||
|
|
||||||
@Listener
|
|
||||||
public void onInteract(InteractBlockEvent e, @Root Player player) {
|
|
||||||
Optional<Location<World>> location = e.getTargetBlock().getLocation();
|
|
||||||
if (!location.isPresent()) return;
|
|
||||||
Optional<TileEntity> optTile = location.get().getTileEntity();
|
|
||||||
if (!optTile.isPresent()) return;
|
|
||||||
TileEntity block = optTile.get();
|
|
||||||
if (block instanceof CommandBlock) {
|
|
||||||
CommandBlock cmd = (CommandBlock) block;
|
|
||||||
try {
|
|
||||||
sendCommandBlockPacket(cmd, player);
|
|
||||||
} catch (Exception ex) {
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO Change world
|
|
||||||
// @EventHandler(priority = EventPriority.MONITOR)
|
|
||||||
// public void onWorldChange(PlayerChangedWorldEvent e) {
|
|
||||||
// sendOp(e.getPlayer());
|
|
||||||
// }
|
|
||||||
|
|
||||||
// @EventHandler(ignoreCancelled = true)
|
|
||||||
// public void onInteract(PlayerInteractEvent e) {
|
|
||||||
// if (e.getAction() == Action.RIGHT_CLICK_BLOCK && isOnPipe(e.getPlayer()) && e.getPlayer().isOp()) {
|
|
||||||
// try {
|
|
||||||
// sendCommandBlockPacket(e.getClickedBlock(), e.getPlayer());
|
|
||||||
// } catch (Exception ex) {
|
|
||||||
// ex.printStackTrace();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
private void sendOp(Player p) {
|
|
||||||
// TODO Is there an isOp check?
|
|
||||||
if (p.hasPermission("viaversion.commandblocks") && isOnPipe(p.getUniqueId())) {
|
|
||||||
try {
|
|
||||||
PacketWrapper wrapper = new PacketWrapper(0x1B, null, getUserConnection(p.getUniqueId())); // Entity status
|
|
||||||
|
|
||||||
wrapper.write(Type.INT, getEntityId(p)); // Entity ID
|
|
||||||
wrapper.write(Type.BYTE, (byte) 26); //Hardcoded op permission level
|
|
||||||
|
|
||||||
wrapper.send(Protocol1_9TO1_8.class);
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void sendCommandBlockPacket(CommandBlock b, Player player) throws Exception {
|
|
||||||
Method m = b.getClass().getDeclaredMethod("func_145844_m");
|
|
||||||
m.setAccessible(true);
|
|
||||||
|
|
||||||
Object updatePacket = m.invoke(b);
|
|
||||||
|
|
||||||
PacketWrapper wrapper = generatePacket(updatePacket, getUserConnection(player.getUniqueId()));
|
|
||||||
wrapper.send(Protocol1_9TO1_8.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
private PacketWrapper generatePacket(Object updatePacket, UserConnection usr) throws Exception {
|
|
||||||
PacketWrapper wrapper = new PacketWrapper(0x09, null, usr); // Update block entity
|
|
||||||
|
|
||||||
long[] pos = getPosition(ReflectionUtil.get(updatePacket, "field_179824_a", Class.forName("net.minecraft.util.BlockPos")));
|
|
||||||
|
|
||||||
wrapper.write(Type.POSITION, new Position(pos[0], pos[1], pos[2])); //Block position
|
|
||||||
wrapper.write(Type.BYTE, (byte) 2); // Action id always 2
|
|
||||||
|
|
||||||
CompoundTag nbt = getNBT(ReflectionUtil.get(updatePacket, "field_148860_e", Class.forName("net.minecraft.nbt.NBTTagCompound")));
|
|
||||||
if (nbt == null) {
|
|
||||||
wrapper.write(Type.BYTE, (byte) 0); //If nbt is null. Use 0 as nbt
|
|
||||||
return wrapper;
|
|
||||||
}
|
|
||||||
nbt.put(new ByteTag("powered", (byte) 0));
|
|
||||||
nbt.put(new ByteTag("auto", (byte) 0));
|
|
||||||
nbt.put(new ByteTag("conditionMet", (byte) 0));
|
|
||||||
|
|
||||||
wrapper.write(Type.NBT, nbt); // NBT TAG
|
|
||||||
return wrapper;
|
|
||||||
}
|
|
||||||
|
|
||||||
private long[] getPosition(Object obj) throws ClassNotFoundException, NoSuchFieldException, IllegalAccessException {
|
|
||||||
return new long[]{
|
|
||||||
(long) ReflectionUtil.getSuper(obj, "field_177962_a", int.class), //X
|
|
||||||
(long) ReflectionUtil.getSuper(obj, "field_177960_b", int.class), //Y
|
|
||||||
(long) ReflectionUtil.getSuper(obj, "field_177961_c", int.class) //Z
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
private CompoundTag getNBT(Object obj) throws Exception {
|
|
||||||
ByteBuf buf = Unpooled.buffer();
|
|
||||||
Method m = Class.forName("net.minecraft.nbt.CompressedStreamTools").getMethod("func_74800_a", Class.forName("net.minecraft.nbt.NBTTagCompound"), DataOutput.class);
|
|
||||||
m.invoke(null, obj, new DataOutputStream(new ByteBufOutputStream(buf)));
|
|
||||||
try {
|
|
||||||
return Type.NBT.read(buf);
|
|
||||||
} finally {
|
|
||||||
buf.release();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -14,7 +14,6 @@ import us.myles.ViaVersion.protocols.protocol1_9to1_8.providers.MovementTransmit
|
|||||||
import us.myles.ViaVersion.sponge.listeners.ClientLeaveListener;
|
import us.myles.ViaVersion.sponge.listeners.ClientLeaveListener;
|
||||||
import us.myles.ViaVersion.sponge.listeners.UpdateListener;
|
import us.myles.ViaVersion.sponge.listeners.UpdateListener;
|
||||||
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.BlockListener;
|
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.BlockListener;
|
||||||
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.CommandBlockListener;
|
|
||||||
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.DeathListener;
|
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.DeathListener;
|
||||||
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.HandItemCache;
|
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.HandItemCache;
|
||||||
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.sponge4.Sponge4ArmorListener;
|
import us.myles.ViaVersion.sponge.listeners.protocol1_9to1_8.sponge4.Sponge4ArmorListener;
|
||||||
@ -39,7 +38,6 @@ public class SpongeViaLoader implements ViaPlatformLoader {
|
|||||||
} catch (ClassNotFoundException e) {
|
} catch (ClassNotFoundException e) {
|
||||||
new Sponge5ArmorListener(plugin).register();
|
new Sponge5ArmorListener(plugin).register();
|
||||||
}
|
}
|
||||||
new CommandBlockListener(plugin).register();
|
|
||||||
new DeathListener(plugin).register();
|
new DeathListener(plugin).register();
|
||||||
new BlockListener(plugin).register();
|
new BlockListener(plugin).register();
|
||||||
|
|
||||||
|
|||||||
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren