Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2024-12-04 21:01:02 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add ClientUpdateStructureBlockPacket

Browse source
This commit is contained in:
Jonas Herzig 2018-07-19 14:29:23 +02:00
parent f00f25ad69
commit 488bc9fd4e
7 changed files with 212 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/github/steveice10/mc/protocol/MinecraftProtocol.java
View file

@ -37,6 +37,7 @@ import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientPrepa
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientRenameItemPacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientSelectTradePacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientSetBeaconEffectPacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientUpdateStructureBlockPacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.window.ClientWindowActionPacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientBlockNBTRequestPacket;
import com.github.steveice10.mc.protocol.packet.ingame.client.world.ClientEntityNBTRequestPacket;
@ -479,7 +480,7 @@ public class MinecraftProtocol extends PacketProtocol {
this.registerOutgoing(0x22, ClientUpdateCommandBlockPacket.class);
this.registerOutgoing(0x23, ClientUpdateCommandBlockMinecartPacket.class);
this.registerOutgoing(0x24, ClientCreativeInventoryActionPacket.class);
// FIXME: 25
this.registerOutgoing(0x25, ClientUpdateStructureBlockPacket.class);
this.registerOutgoing(0x26, ClientUpdateSignPacket.class);
this.registerOutgoing(0x27, ClientPlayerSwingArmPacket.class);
this.registerOutgoing(0x28, ClientSpectatePacket.class);

23
src/main/java/com/github/steveice10/mc/protocol/data/MagicValues.java
View file

@ -54,12 +54,16 @@ import com.github.steveice10.mc.protocol.data.game.window.FillStackParam;
import com.github.steveice10.mc.protocol.data.game.window.MoveToHotbarParam;
import com.github.steveice10.mc.protocol.data.game.window.ShiftClickItemParam;
import com.github.steveice10.mc.protocol.data.game.window.SpreadItemParam;
import com.github.steveice10.mc.protocol.data.game.window.UpdateStructureBlockAction;
import com.github.steveice10.mc.protocol.data.game.window.UpdateStructureBlockMode;
import com.github.steveice10.mc.protocol.data.game.window.WindowAction;
import com.github.steveice10.mc.protocol.data.game.window.WindowType;
import com.github.steveice10.mc.protocol.data.game.window.property.AnvilProperty;
import com.github.steveice10.mc.protocol.data.game.window.property.BrewingStandProperty;
import com.github.steveice10.mc.protocol.data.game.window.property.EnchantmentTableProperty;
import com.github.steveice10.mc.protocol.data.game.window.property.FurnaceProperty;
import com.github.steveice10.mc.protocol.data.game.world.block.StructureMirror;
import com.github.steveice10.mc.protocol.data.game.world.block.StructureRotation;
import com.github.steveice10.mc.protocol.data.game.world.block.CommandBlockMode;
import com.github.steveice10.mc.protocol.data.game.world.particle.ParticleType;
import com.github.steveice10.mc.protocol.data.game.world.WorldBorderAction;
@ -582,6 +586,25 @@ public class MagicValues {
register(CommandBlockMode.AUTO, 1);
register(CommandBlockMode.REDSTONE, 2);
register(UpdateStructureBlockAction.UPDATE_DATA, 0);
register(UpdateStructureBlockAction.SAVE_STRUCTURE, 1);
register(UpdateStructureBlockAction.LOAD_STRUCTURE, 2);
register(UpdateStructureBlockAction.DETECT_SIZE, 3);
register(UpdateStructureBlockMode.SAVE, 0);
register(UpdateStructureBlockMode.LOAD, 1);
register(UpdateStructureBlockMode.CORNER, 2);
register(UpdateStructureBlockMode.DATA, 3);
register(StructureRotation.NONE, 0);
register(StructureRotation.CLOCKWISE_90, 1);
register(StructureRotation.CLOCKWISE_180, 2);
register(StructureRotation.COUNTERCLOCKWISE_90, 3);
register(StructureMirror.NONE, 0);
register(StructureMirror.LEFT_RIGHT, 1);
register(StructureMirror.FRONT_BACK, 2);
register(DemoMessageValue.WELCOME, 0);
register(DemoMessageValue.MOVEMENT_CONTROLS, 101);
register(DemoMessageValue.JUMP_CONTROL, 102);

8
src/main/java/com/github/steveice10/mc/protocol/data/game/window/UpdateStructureBlockAction.java Normal file
View file

@ -0,0 +1,8 @@
package com.github.steveice10.mc.protocol.data.game.window;
public enum UpdateStructureBlockAction {
UPDATE_DATA,
SAVE_STRUCTURE,
LOAD_STRUCTURE,
DETECT_SIZE;
}

8
src/main/java/com/github/steveice10/mc/protocol/data/game/window/UpdateStructureBlockMode.java Normal file
View file

@ -0,0 +1,8 @@
package com.github.steveice10.mc.protocol.data.game.window;
public enum UpdateStructureBlockMode {
SAVE,
LOAD,
CORNER,
DATA;
}

7
src/main/java/com/github/steveice10/mc/protocol/data/game/world/block/StructureMirror.java Normal file
View file

@ -0,0 +1,7 @@
package com.github.steveice10.mc.protocol.data.game.world.block;
public enum StructureMirror {
NONE,
LEFT_RIGHT,
FRONT_BACK;
}

8
src/main/java/com/github/steveice10/mc/protocol/data/game/world/block/StructureRotation.java Normal file
View file

@ -0,0 +1,8 @@
package com.github.steveice10.mc.protocol.data.game.world.block;
public enum StructureRotation {
NONE,
CLOCKWISE_90,
CLOCKWISE_180,
COUNTERCLOCKWISE_90;
}

156
src/main/java/com/github/steveice10/mc/protocol/packet/ingame/client/window/ClientUpdateStructureBlockPacket.java Normal file
View file

@ -0,0 +1,156 @@
package com.github.steveice10.mc.protocol.packet.ingame.client.window;
import com.github.steveice10.mc.protocol.data.MagicValues;
import com.github.steveice10.mc.protocol.data.game.entity.metadata.Position;
import com.github.steveice10.mc.protocol.data.game.window.UpdateStructureBlockAction;
import com.github.steveice10.mc.protocol.data.game.window.UpdateStructureBlockMode;
import com.github.steveice10.mc.protocol.data.game.world.block.StructureMirror;
import com.github.steveice10.mc.protocol.data.game.world.block.StructureRotation;
import com.github.steveice10.mc.protocol.packet.MinecraftPacket;
import com.github.steveice10.mc.protocol.util.NetUtil;
import com.github.steveice10.packetlib.io.NetInput;
import com.github.steveice10.packetlib.io.NetOutput;
import java.io.IOException;
public class ClientUpdateStructureBlockPacket extends MinecraftPacket {
private Position position;
private UpdateStructureBlockAction action;
private UpdateStructureBlockMode mode;
private String name;
private Position offset;
private Position size;
private StructureMirror mirror;
private StructureRotation rotation;
private String metadata;
private float integrity;
private long seed;
private boolean ignoreEntities;
private boolean showAir;
private boolean showBoundingBox;
@SuppressWarnings("unused")
private ClientUpdateStructureBlockPacket() {
}
public ClientUpdateStructureBlockPacket(Position position,
UpdateStructureBlockAction action, UpdateStructureBlockMode mode,
String name, Position offset, Position size,
StructureMirror mirror, StructureRotation rotation,
String metadata, float integrity, long seed,
boolean ignoreEntities, boolean showAir, boolean showBoundingBox) {
this.position = position;
this.action = action;
this.mode = mode;
this.name = name;
this.offset = offset;
this.size = size;
this.mirror = mirror;
this.rotation = rotation;
this.metadata = metadata;
this.integrity = integrity;
this.seed = seed;
this.ignoreEntities = ignoreEntities;
this.showAir = showAir;
this.showBoundingBox = showBoundingBox;
}
public Position getPosition() {
return this.position;
}
public UpdateStructureBlockAction getAction() {
return this.action;
}
public UpdateStructureBlockMode getMode() {
return this.mode;
}
public String getName() {
return this.name;
}
public Position getOffset() {
return this.offset;
}
public Position getSize() {
return this.size;
}
public StructureMirror getMirror() {
return this.mirror;
}
public StructureRotation getRotation() {
return this.rotation;
}
public String getMetadata() {
return this.metadata;
}
public float getIntegrity() {
return this.integrity;
}
public long getSeed() {
return this.seed;
}
public boolean isIgnoreEntities() {
return this.ignoreEntities;
}
public boolean isShowAir() {
return this.showAir;
}
public boolean isShowBoundingBox() {
return this.showBoundingBox;
}
@Override
public void read(NetInput in) throws IOException {
this.position = NetUtil.readPosition(in);
this.action = MagicValues.key(UpdateStructureBlockAction.class, in.readVarInt());
this.mode = MagicValues.key(UpdateStructureBlockMode.class, in.readVarInt());
this.name = in.readString();
this.offset = new Position(in.readByte(), in.readByte(), in.readByte());
this.size = new Position(in.readUnsignedByte(), in.readUnsignedByte(), in.readUnsignedByte());
this.mirror = MagicValues.key(StructureMirror.class, in.readVarInt());
this.rotation = MagicValues.key(StructureRotation.class, in.readVarInt());
this.metadata = in.readString();
this.integrity = in.readFloat();
this.seed = in.readVarLong();
int flags = in.readUnsignedByte();
this.ignoreEntities = (flags & 0x01) != 0;
this.showAir = (flags & 0x02) != 0;
this.showBoundingBox = (flags & 0x04) != 0;
}
@Override
public void write(NetOutput out) throws IOException {
NetUtil.writePosition(out, this.position);
out.writeVarInt(MagicValues.value(Integer.class, this.action));
out.writeVarInt(MagicValues.value(Integer.class, this.mode));
out.writeString(this.name);
out.writeByte(this.offset.getX());
out.writeByte(this.offset.getY());
out.writeByte(this.offset.getZ());
out.writeByte(this.size.getX());
out.writeByte(this.size.getY());
out.writeByte(this.size.getZ());
out.writeVarInt(MagicValues.value(Integer.class, this.mirror));
out.writeVarInt(MagicValues.value(Integer.class, this.rotation));
out.writeString(this.metadata);
out.writeFloat(this.integrity);
out.writeVarLong(this.seed);
int flags = 0;
if (this.ignoreEntities) flags |= 0x01;
if (this.showAir) flags |= 0x02;
if (this.showBoundingBox) flags |= 0x04;
out.writeByte(flags);
}
}