Parker2991/MCProtocolLib
1
0
Fork 0
mirror of https://github.com/GeyserMC/MCProtocolLib.git synced 2025-03-13 22:49:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Split window properties into separate enums for separate window types

Browse source
This commit is contained in:
johni0702 2015-04-05 13:10:19 +02:00 committed by Steven Smith
parent 997d129d6d
commit 2aef90aaaf
8 changed files with 168 additions and 18 deletions

23
src/main/java/org/spacehq/mc/protocol/data/game/values/MagicValues.java
View file

@ -8,6 +8,10 @@ import org.spacehq.mc.protocol.data.game.values.setting.Difficulty;
import org.spacehq.mc.protocol.data.game.values.statistic.Achievement;
import org.spacehq.mc.protocol.data.game.values.statistic.GenericStatistic;
import org.spacehq.mc.protocol.data.game.values.window.*;
import org.spacehq.mc.protocol.data.game.values.window.property.AnvilProperty;
import org.spacehq.mc.protocol.data.game.values.window.property.BrewingStandProperty;
import org.spacehq.mc.protocol.data.game.values.window.property.EnchantmentTableProperty;
import org.spacehq.mc.protocol.data.game.values.window.property.FurnaceProperty;
import org.spacehq.mc.protocol.data.game.values.world.GenericSound;
import org.spacehq.mc.protocol.data.game.values.world.Particle;
import org.spacehq.mc.protocol.data.game.values.world.WorldBorderAction;
@ -373,9 +377,22 @@ public class MagicValues {
register(WindowType.VILLAGER, "minecraft:villager");
register(WindowType.HORSE, "EntityHorse");
register(WindowProperty.FURNACE_PROGRESS_OR_ENCHANT_1, 0);
register(WindowProperty.FURNACE_FUEL_OR_ENCHANT_2, 1);
register(WindowProperty.ENCHANT_3, 2);
register(BrewingStandProperty.BREW_TIME, 0);
register(EnchantmentTableProperty.LEVEL_SLOT_1, 0);
register(EnchantmentTableProperty.LEVEL_SLOT_2, 1);
register(EnchantmentTableProperty.LEVEL_SLOT_3, 2);
register(EnchantmentTableProperty.XP_SEED, 3);
register(EnchantmentTableProperty.ENCHANTMENT_SLOT_1, 4);
register(EnchantmentTableProperty.ENCHANTMENT_SLOT_2, 5);
register(EnchantmentTableProperty.ENCHANTMENT_SLOT_3, 6);
register(FurnaceProperty.BURN_TIME, 0);
register(FurnaceProperty.CURRENT_ITEM_BURN_TIME, 1);
register(FurnaceProperty.COOK_TIME, 2);
register(FurnaceProperty.TOTAL_COOK_TIME, 3);
register(AnvilProperty.MAXIMUM_COST, 0);
register(BlockBreakStage.RESET, -1);
register(BlockBreakStage.STAGE_1, 0);

9
src/main/java/org/spacehq/mc/protocol/data/game/values/window/WindowProperty.java
View file

@ -1,9 +0,0 @@
package org.spacehq.mc.protocol.data.game.values.window;
public enum WindowProperty {
FURNACE_PROGRESS_OR_ENCHANT_1,
FURNACE_FUEL_OR_ENCHANT_2,
ENCHANT_3;
}

11
src/main/java/org/spacehq/mc/protocol/data/game/values/window/property/AnvilProperty.java Normal file
View file

@ -0,0 +1,11 @@
package org.spacehq.mc.protocol.data.game.values.window.property;
/**
* Window properties of an anvil.
*/
public enum AnvilProperty {
/**
* The maximum cost of renaming or repairing in the anvil.
*/
MAXIMUM_COST,
}

12
src/main/java/org/spacehq/mc/protocol/data/game/values/window/property/BrewingStandProperty.java Normal file
View file

@ -0,0 +1,12 @@
package org.spacehq.mc.protocol.data.game.values.window.property;
/**
* Window properties of a brewing stand.
*/
public enum BrewingStandProperty implements WindowProperty {
/**
* Time remaining for potions to finish brewing.
* Usually a value between 0 (done) and 400 (just started).
*/
BREW_TIME,
}

77
src/main/java/org/spacehq/mc/protocol/data/game/values/window/property/EnchantmentTableProperty.java Normal file
View file

@ -0,0 +1,77 @@
package org.spacehq.mc.protocol.data.game.values.window.property;
/**
* Window properties of an enchantment table.
*/
public enum EnchantmentTableProperty implements WindowProperty {
/**
* Level of the enchantment in slot 1.
*/
LEVEL_SLOT_1,
/**
* Level of the enchantment in slot 2.
*/
LEVEL_SLOT_2,
/**
* Level of the enchantment in slot 3.
*/
LEVEL_SLOT_3,
/**
* The seed used for the next enchantment.
*/
XP_SEED,
/**
* The enchantment for slot 1.
* @see #getEnchantment(int, int)
*/
ENCHANTMENT_SLOT_1,
/**
* The enchantment for slot 2.
* @see #getEnchantment(int, int)
*/
ENCHANTMENT_SLOT_2,
/**
* The enchantment for slot 3.
* @see #getEnchantment(int, int)
*/
ENCHANTMENT_SLOT_3;
/**
* Packs enchantment type and level into one integer as used for the ENCHANTMENT_SLOT_X properties.
* @param type Id of the enchantment
* @param level Level of the enchantment
* @return Packed value
* @see #getEnchantmentType(int)
* @see #getEnchantmentLevel(int)
*/
public static int getEnchantment(int type, int level) {
return type | level << 8;
}
/**
* Unpacks the enchantment type from one integer as used for the ENCHANTMENT_SLOT_X properties.
* @param enchantmentInfo Packed value
* @return Id of the enchantment
* @see #getEnchantment(int, int)
*/
public static int getEnchantmentType(int enchantmentInfo) {
return enchantmentInfo & 0xff;
}
/**
* Unpacks the enchantment level from one integer as used for the ENCHANTMENT_SLOT_X properties.
* @param enchantmentInfo Packed value
* @return Level of the enchantment
* @see #getEnchantment(int, int)
*/
public static int getEnchantmentLevel(int enchantmentInfo) {
return enchantmentInfo >> 8;
}
}

27
src/main/java/org/spacehq/mc/protocol/data/game/values/window/property/FurnaceProperty.java Normal file
View file

@ -0,0 +1,27 @@
package org.spacehq.mc.protocol.data.game.values.window.property;
/**
* Window properties of a furnace.
*/
public enum FurnaceProperty {
/**
* Number of ticks left before the current fuel runs out.
*/
BURN_TIME,
/**
* Number of ticks that the current item can keep the furnace burning.
*/
CURRENT_ITEM_BURN_TIME,
/**
* Number of ticks the item has been smelting for.
*/
COOK_TIME,
/**
* Number of ticks that the current item needs to be smelted.
*/
TOTAL_COOK_TIME,
}

5
src/main/java/org/spacehq/mc/protocol/data/game/values/window/property/WindowProperty.java Normal file
View file

@ -0,0 +1,5 @@
package org.spacehq.mc.protocol.data.game.values.window.property;
public interface WindowProperty {
}

22
src/main/java/org/spacehq/mc/protocol/packet/ingame/server/window/ServerWindowPropertyPacket.java
View file

@ -1,7 +1,7 @@
package org.spacehq.mc.protocol.packet.ingame.server.window;
import org.spacehq.mc.protocol.data.game.values.MagicValues;
import org.spacehq.mc.protocol.data.game.values.window.WindowProperty;
import org.spacehq.mc.protocol.data.game.values.window.property.WindowProperty;
import org.spacehq.packetlib.io.NetInput;
import org.spacehq.packetlib.io.NetOutput;
import org.spacehq.packetlib.packet.Packet;
@ -11,27 +11,37 @@ import java.io.IOException;
public class ServerWindowPropertyPacket implements Packet {
private int windowId;
private WindowProperty property;
private int property;
private int value;
@SuppressWarnings("unused")
private ServerWindowPropertyPacket() {
}
public ServerWindowPropertyPacket(int windowId, WindowProperty property, int value) {
public ServerWindowPropertyPacket(int windowId, int property, int value) {
this.windowId = windowId;
this.property = property;
this.value = value;
}
public <T extends Enum<T> & WindowProperty> ServerWindowPropertyPacket(int windowId, T property, int value) {
this.windowId = windowId;
this.property = MagicValues.value(Integer.class, property);
this.value = value;
}
public int getWindowId() {
return this.windowId;
}
public WindowProperty getProperty() {
public int getRawProperty() {
return this.property;
}
public <T extends Enum<T> & WindowProperty> T getProperty(Class<T> type) {
return MagicValues.key(type, value);
}
public int getValue() {
return this.value;
}
@ -39,14 +49,14 @@ public class ServerWindowPropertyPacket implements Packet {
@Override
public void read(NetInput in) throws IOException {
this.windowId = in.readUnsignedByte();
this.property = MagicValues.key(WindowProperty.class, in.readShort());
this.property = in.readShort();
this.value = in.readShort();
}
@Override
public void write(NetOutput out) throws IOException {
out.writeByte(this.windowId);
out.writeShort(MagicValues.value(Integer.class, this.property));
out.writeShort(this.property);
out.writeShort(this.value);
}