twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-14 11:45:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2018-07-15 10:00:00 +10:00
parent debc7172fd
commit 767e4f6ccf
199 changed files with 8301 additions and 3637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
paper-api/src/main/java/org/bukkit/material/Banner.java
View File

@@ -6,22 +6,13 @@ import org.bukkit.block.BlockFace;
public class Banner extends MaterialData implements Attachable {
public Banner() {
super(Material.BANNER);
super(Material.LEGACY_BANNER);
}
public Banner(Material type) {
super(type);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Banner(int type) {
super(type);
}
/**
*
* @param type the type
@@ -33,18 +24,8 @@ public class Banner extends MaterialData implements Attachable {
super(type, data);
}
/** *
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Banner(int type, byte data) {
super(type, data);
}
public boolean isWallBanner() {
return getItemType() == Material.WALL_BANNER;
return getItemType() == Material.LEGACY_WALL_BANNER;
}
public BlockFace getAttachedFace() {

22
paper-api/src/main/java/org/bukkit/material/Bed.java
View File

@@ -12,7 +12,7 @@ public class Bed extends MaterialData implements Directional {
* Default constructor for a bed.
*/
public Bed() {
super(Material.BED_BLOCK);
super(Material.LEGACY_BED_BLOCK);
}
/**
@@ -25,30 +25,10 @@ public class Bed extends MaterialData implements Directional {
setFacingDirection(direction);
}
/**
*
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Bed(final int type) {
super(type);
}
public Bed(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Bed(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Button.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Button extends SimpleAttachableMaterialData implements Redstone {
public Button() {
super(Material.STONE_BUTTON);
}
/**
* @param type the type
* @deprecated Magic value
*/
@Deprecated
public Button(final int type) {
super(type);
super(Material.LEGACY_STONE_BUTTON);
}
public Button(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Button(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Cake.java
View File

@@ -4,32 +4,13 @@ import org.bukkit.Material;
public class Cake extends MaterialData {
public Cake() {
super(Material.CAKE_BLOCK);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Cake(int type) {
super(type);
super(Material.LEGACY_CAKE_BLOCK);
}
public Cake(Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Cake(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

8
paper-api/src/main/java/org/bukkit/material/Cauldron.java
View File

@@ -10,17 +10,17 @@ public class Cauldron extends MaterialData {
private static final int CAULDRON_EMPTY = 0;
public Cauldron() {
super(Material.CAULDRON);
super(Material.LEGACY_CAULDRON);
}
/**
*
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Cauldron(int type, byte data) {
public Cauldron(final Material type, final byte data) {
super(type, data);
}
@@ -31,7 +31,7 @@ public class Cauldron extends MaterialData {
*/
@Deprecated
public Cauldron(byte data) {
super(Material.CAULDRON, data);
super(Material.LEGACY_CAULDRON, data);
}
/**

21
paper-api/src/main/java/org/bukkit/material/Chest.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class Chest extends DirectionalContainer {
public Chest() {
super(Material.CHEST);
super(Material.LEGACY_CHEST);
}
/**
@@ -22,29 +22,10 @@ public class Chest extends DirectionalContainer {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Chest(final int type) {
super(type);
}
public Chest(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Chest(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Coal.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.Material;
*/
public class Coal extends MaterialData {
public Coal() {
super(Material.COAL);
super(Material.LEGACY_COAL);
}
public Coal(CoalType type) {
@@ -16,29 +16,10 @@ public class Coal extends MaterialData {
setType(type);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Coal(final int type) {
super(type);
}
public Coal(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Coal(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

15
paper-api/src/main/java/org/bukkit/material/CocoaPlant.java
View File

@@ -15,25 +15,16 @@ public class CocoaPlant extends MaterialData implements Directional, Attachable
}
public CocoaPlant() {
super(Material.COCOA);
super(Material.LEGACY_COCOA);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public CocoaPlant(final int type) {
super(type);
}
/**
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public CocoaPlant(final int type, final byte data) {
public CocoaPlant(final Material type, final byte data) {
super(type, data);
}

21
paper-api/src/main/java/org/bukkit/material/Command.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class Command extends MaterialData implements Redstone {
public Command() {
super(Material.COMMAND);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Command(final int type) {
super(type);
super(Material.LEGACY_COMMAND);
}
public Command(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Command(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

27
paper-api/src/main/java/org/bukkit/material/Comparator.java
View File

@@ -6,8 +6,8 @@ import org.bukkit.block.BlockFace;
/**
* Represents a comparator in the on or off state, in normal or subtraction mode and facing in a specific direction.
*
* @see Material#REDSTONE_COMPARATOR_OFF
* @see Material#REDSTONE_COMPARATOR_ON
* @see Material#LEGACY_REDSTONE_COMPARATOR_OFF
* @see Material#LEGACY_REDSTONE_COMPARATOR_ON
*/
public class Comparator extends MaterialData implements Directional, Redstone {
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.NORTH;
@@ -54,34 +54,15 @@ public class Comparator extends MaterialData implements Directional, Redstone {
* @see BlockFace
*/
public Comparator(BlockFace facingDirection, boolean isSubtraction, boolean state) {
super(state ? Material.REDSTONE_COMPARATOR_ON : Material.REDSTONE_COMPARATOR_OFF);
super(state ? Material.LEGACY_REDSTONE_COMPARATOR_ON : Material.LEGACY_REDSTONE_COMPARATOR_OFF);
setFacingDirection(facingDirection);
setSubtractionMode(isSubtraction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Comparator(int type) {
super(type);
}
public Comparator(Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Comparator(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -186,7 +167,7 @@ public class Comparator extends MaterialData implements Directional, Redstone {
*/
@Override
public boolean isPowered() {
return getItemType() == Material.REDSTONE_COMPARATOR_ON;
return getItemType() == Material.LEGACY_REDSTONE_COMPARATOR_ON;
}
/**

51
paper-api/src/main/java/org/bukkit/material/Crops.java
View File

@@ -6,14 +6,14 @@ import org.bukkit.Material;
/**
* Represents the different types of crops in different states of growth.
*
* @see Material#CROPS
* @see Material#CARROT
* @see Material#POTATO
* @see Material#BEETROOT_BLOCK
* @see Material#NETHER_WARTS
* @see Material#LEGACY_CROPS
* @see Material#LEGACY_CARROT
* @see Material#LEGACY_POTATO
* @see Material#LEGACY_BEETROOT_BLOCK
* @see Material#LEGACY_NETHER_WARTS
*/
public class Crops extends MaterialData {
protected static final Material DEFAULT_TYPE = Material.CROPS;
protected static final Material DEFAULT_TYPE = Material.LEGACY_CROPS;
protected static final CropState DEFAULT_STATE = CropState.SEEDED;
/**
@@ -44,15 +44,6 @@ public class Crops extends MaterialData {
setState(state);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Crops(final int type) {
super(type);
}
/**
* Constructs a crop block of the given type and in the seeded state
*
@@ -62,16 +53,6 @@ public class Crops extends MaterialData {
this(type, DEFAULT_STATE);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Crops(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -92,13 +73,13 @@ public class Crops extends MaterialData {
*/
public CropState getState() {
switch (getItemType()) {
case CROPS:
case CARROT:
case POTATO:
case LEGACY_CROPS:
case LEGACY_CARROT:
case LEGACY_POTATO:
// Mask the data just in case top bit set
return CropState.getByData((byte) (getData() & 0x7));
case BEETROOT_BLOCK:
case NETHER_WARTS:
case LEGACY_BEETROOT_BLOCK:
case LEGACY_NETHER_WARTS:
// Mask the data just in case top bits are set
// Will return SEEDED, SMALL, TALL, RIPE for the three growth data values
return CropState.getByData((byte) (((getData() & 0x3) * 7 + 2) / 3));
@@ -123,14 +104,14 @@ public class Crops extends MaterialData {
*/
public void setState(CropState state) {
switch (getItemType()) {
case CROPS:
case CARROT:
case POTATO:
case LEGACY_CROPS:
case LEGACY_CARROT:
case LEGACY_POTATO:
// Preserve the top bit in case it is set
setData((byte) ((getData() & 0x8) | state.getData()));
break;
case NETHER_WARTS:
case BEETROOT_BLOCK:
case LEGACY_NETHER_WARTS:
case LEGACY_BEETROOT_BLOCK:
// Preserve the top bits in case they are set
setData((byte) ((getData() & 0xC) | (state.getData() >> 1)));
break;

21
paper-api/src/main/java/org/bukkit/material/DetectorRail.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class DetectorRail extends ExtendedRails implements PressureSensor {
public DetectorRail() {
super(Material.DETECTOR_RAIL);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public DetectorRail(final int type) {
super(type);
super(Material.LEGACY_DETECTOR_RAIL);
}
public DetectorRail(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public DetectorRail(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

27
paper-api/src/main/java/org/bukkit/material/Diode.java
View File

@@ -7,8 +7,8 @@ import org.bukkit.block.BlockFace;
* Represents a diode/repeater in the on or off state, with a delay and facing
* in a specific direction.
*
* @see Material#DIODE_BLOCK_OFF
* @see Material#DIODE_BLOCK_ON
* @see Material#LEGACY_DIODE_BLOCK_OFF
* @see Material#LEGACY_DIODE_BLOCK_ON
*/
public class Diode extends MaterialData implements Directional, Redstone {
@@ -65,34 +65,15 @@ public class Diode extends MaterialData implements Directional, Redstone {
* @see BlockFace
*/
public Diode(BlockFace facingDirection, int delay, boolean state) {
super(state ? Material.DIODE_BLOCK_ON : Material.DIODE_BLOCK_OFF);
super(state ? Material.LEGACY_DIODE_BLOCK_ON : Material.LEGACY_DIODE_BLOCK_OFF);
setFacingDirection(facingDirection);
setDelay(delay);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Diode(int type) {
super(type);
}
public Diode(Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Diode(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -204,6 +185,6 @@ public class Diode extends MaterialData implements Directional, Redstone {
*/
@Override
public boolean isPowered() {
return getItemType() == Material.DIODE_BLOCK_ON;
return getItemType() == Material.LEGACY_DIODE_BLOCK_ON;
}
}

18
paper-api/src/main/java/org/bukkit/material/DirectionalContainer.java
View File

@@ -7,29 +7,11 @@ import org.bukkit.block.BlockFace;
* Represents a furnace or a dispenser.
*/
public class DirectionalContainer extends MaterialData implements Directional {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public DirectionalContainer(final int type) {
super(type);
}
public DirectionalContainer(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public DirectionalContainer(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Dispenser.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class Dispenser extends FurnaceAndDispenser {
public Dispenser() {
super(Material.DISPENSER);
super(Material.LEGACY_DISPENSER);
}
public Dispenser(BlockFace direction) {
@@ -17,29 +17,10 @@ public class Dispenser extends FurnaceAndDispenser {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Dispenser(final int type) {
super(type);
}
public Dispenser(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Dispenser(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

103
paper-api/src/main/java/org/bukkit/material/Door.java
View File

@@ -11,13 +11,13 @@ import org.bukkit.block.BlockFace;
* work with modern doors. Some methods are undefined dependant on <code>isTopHalf()</code>
* due to Minecraft's internal representation of doors.
*
* @see Material#WOODEN_DOOR
* @see Material#IRON_DOOR_BLOCK
* @see Material#SPRUCE_DOOR
* @see Material#BIRCH_DOOR
* @see Material#JUNGLE_DOOR
* @see Material#ACACIA_DOOR
* @see Material#DARK_OAK_DOOR
* @see Material#LEGACY_WOODEN_DOOR
* @see Material#LEGACY_IRON_DOOR_BLOCK
* @see Material#LEGACY_SPRUCE_DOOR
* @see Material#LEGACY_BIRCH_DOOR
* @see Material#LEGACY_JUNGLE_DOOR
* @see Material#LEGACY_ACACIA_DOOR
* @see Material#LEGACY_DARK_OAK_DOOR
*/
public class Door extends MaterialData implements Directional, Openable {
@@ -25,20 +25,11 @@ public class Door extends MaterialData implements Directional, Openable {
// of the way doors are currently implemented. Beware!
/**
* @deprecated Artifact of old API, equivalent to new <code>Door(Material.WOODEN_DOOR);</code>
* @deprecated Artifact of old API, equivalent to new <code>Door(Material.LEGACY_WOODEN_DOOR);</code>
*/
@Deprecated
public Door() {
super(Material.WOODEN_DOOR);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Door(final int type) {
super(type);
super(Material.LEGACY_WOODEN_DOOR);
}
public Door(final Material type) {
@@ -51,13 +42,13 @@ public class Door extends MaterialData implements Directional, Openable {
* @param type The type of material this door is made of. This must match the type of the block above.
* @param face The direction the door is facing.
*
* @see Material#WOODEN_DOOR
* @see Material#IRON_DOOR_BLOCK
* @see Material#SPRUCE_DOOR
* @see Material#BIRCH_DOOR
* @see Material#JUNGLE_DOOR
* @see Material#ACACIA_DOOR
* @see Material#DARK_OAK_DOOR
* @see Material#LEGACY_WOODEN_DOOR
* @see Material#LEGACY_IRON_DOOR_BLOCK
* @see Material#LEGACY_SPRUCE_DOOR
* @see Material#LEGACY_BIRCH_DOOR
* @see Material#LEGACY_JUNGLE_DOOR
* @see Material#LEGACY_ACACIA_DOOR
* @see Material#LEGACY_DARK_OAK_DOOR
*
* @see BlockFace#WEST
* @see BlockFace#NORTH
@@ -76,13 +67,13 @@ public class Door extends MaterialData implements Directional, Openable {
* @param face The direction the door is facing.
* @param isOpen Whether the door is currently opened.
*
* @see Material#WOODEN_DOOR
* @see Material#IRON_DOOR_BLOCK
* @see Material#SPRUCE_DOOR
* @see Material#BIRCH_DOOR
* @see Material#JUNGLE_DOOR
* @see Material#ACACIA_DOOR
* @see Material#DARK_OAK_DOOR
* @see Material#LEGACY_WOODEN_DOOR
* @see Material#LEGACY_IRON_DOOR_BLOCK
* @see Material#LEGACY_SPRUCE_DOOR
* @see Material#LEGACY_BIRCH_DOOR
* @see Material#LEGACY_JUNGLE_DOOR
* @see Material#LEGACY_ACACIA_DOOR
* @see Material#LEGACY_DARK_OAK_DOOR
*
* @see BlockFace#WEST
* @see BlockFace#NORTH
@@ -102,13 +93,13 @@ public class Door extends MaterialData implements Directional, Openable {
* @param type The type of material this door is made of. This must match the type of the block below.
* @param isHingeRight True if the hinge is on the right hand side, false if the hinge is on the left hand side.
*
* @see Material#WOODEN_DOOR
* @see Material#IRON_DOOR_BLOCK
* @see Material#SPRUCE_DOOR
* @see Material#BIRCH_DOOR
* @see Material#JUNGLE_DOOR
* @see Material#ACACIA_DOOR
* @see Material#DARK_OAK_DOOR
* @see Material#LEGACY_WOODEN_DOOR
* @see Material#LEGACY_IRON_DOOR_BLOCK
* @see Material#LEGACY_SPRUCE_DOOR
* @see Material#LEGACY_BIRCH_DOOR
* @see Material#LEGACY_JUNGLE_DOOR
* @see Material#LEGACY_ACACIA_DOOR
* @see Material#LEGACY_DARK_OAK_DOOR
*/
public Door(final Material type, boolean isHingeRight) {
super(type);
@@ -165,16 +156,6 @@ public class Door extends MaterialData implements Directional, Openable {
this(getWoodDoorOfSpecies(species), isHingeRight);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Door(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -191,28 +172,28 @@ public class Door extends MaterialData implements Directional, Openable {
* @param species The species of wood door required.
* @return The item type for the given species.
*
* @see Material#WOODEN_DOOR
* @see Material#SPRUCE_DOOR
* @see Material#BIRCH_DOOR
* @see Material#JUNGLE_DOOR
* @see Material#ACACIA_DOOR
* @see Material#DARK_OAK_DOOR
* @see Material#LEGACY_WOODEN_DOOR
* @see Material#LEGACY_SPRUCE_DOOR
* @see Material#LEGACY_BIRCH_DOOR
* @see Material#LEGACY_JUNGLE_DOOR
* @see Material#LEGACY_ACACIA_DOOR
* @see Material#LEGACY_DARK_OAK_DOOR
*/
public static Material getWoodDoorOfSpecies(TreeSpecies species) {
switch (species) {
default:
case GENERIC:
return Material.WOODEN_DOOR;
return Material.LEGACY_WOODEN_DOOR;
case BIRCH:
return Material.BIRCH_DOOR;
return Material.LEGACY_BIRCH_DOOR;
case REDWOOD:
return Material.SPRUCE_DOOR;
return Material.LEGACY_SPRUCE_DOOR;
case JUNGLE:
return Material.JUNGLE_DOOR;
return Material.LEGACY_JUNGLE_DOOR;
case ACACIA:
return Material.ACACIA_DOOR;
return Material.LEGACY_ACACIA_DOOR;
case DARK_OAK:
return Material.DARK_OAK_DOOR;
return Material.LEGACY_DARK_OAK_DOOR;
}
}

23
paper-api/src/main/java/org/bukkit/material/Dye.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Dye extends MaterialData implements Colorable {
public Dye() {
super(Material.INK_SACK);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Dye(final int type) {
super(type);
super(Material.LEGACY_INK_SACK);
}
public Dye(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Dye(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -48,7 +29,7 @@ public class Dye extends MaterialData implements Colorable {
* @param color color of the dye
*/
public Dye(final DyeColor color) {
super(Material.INK_SACK, color.getDyeData());
super(Material.LEGACY_INK_SACK, color.getDyeData());
}
/**

21
paper-api/src/main/java/org/bukkit/material/EnderChest.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class EnderChest extends DirectionalContainer {
public EnderChest() {
super(Material.ENDER_CHEST);
super(Material.LEGACY_ENDER_CHEST);
}
/**
@@ -22,29 +22,10 @@ public class EnderChest extends DirectionalContainer {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public EnderChest(final int type) {
super(type);
}
public EnderChest(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public EnderChest(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

18
paper-api/src/main/java/org/bukkit/material/ExtendedRails.java
View File

@@ -8,29 +8,11 @@ import org.bukkit.block.BlockFace;
* classes
*/
public class ExtendedRails extends Rails {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public ExtendedRails(final int type) {
super(type);
}
public ExtendedRails(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public ExtendedRails(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

49
paper-api/src/main/java/org/bukkit/material/FlowerPot.java
View File

@@ -17,32 +17,13 @@ public class FlowerPot extends MaterialData {
* Default constructor for a flower pot.
*/
public FlowerPot() {
super(Material.FLOWER_POT);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public FlowerPot(final int type) {
super(type);
super(Material.LEGACY_FLOWER_POT);
}
public FlowerPot(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public FlowerPot(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -62,9 +43,9 @@ public class FlowerPot extends MaterialData {
public MaterialData getContents() {
switch (getData()) {
case 1:
return new MaterialData(Material.RED_ROSE);
return new MaterialData(Material.LEGACY_RED_ROSE);
case 2:
return new MaterialData(Material.YELLOW_FLOWER);
return new MaterialData(Material.LEGACY_YELLOW_FLOWER);
case 3:
return new Tree(TreeSpecies.GENERIC);
case 4:
@@ -74,13 +55,13 @@ public class FlowerPot extends MaterialData {
case 6:
return new Tree(TreeSpecies.JUNGLE);
case 7:
return new MaterialData(Material.RED_MUSHROOM);
return new MaterialData(Material.LEGACY_RED_MUSHROOM);
case 8:
return new MaterialData(Material.BROWN_MUSHROOM);
return new MaterialData(Material.LEGACY_BROWN_MUSHROOM);
case 9:
return new MaterialData(Material.CACTUS);
return new MaterialData(Material.LEGACY_CACTUS);
case 10:
return new MaterialData(Material.DEAD_BUSH);
return new MaterialData(Material.LEGACY_DEAD_BUSH);
case 11:
return new LongGrass(GrassSpecies.FERN_LIKE);
default:
@@ -96,19 +77,19 @@ public class FlowerPot extends MaterialData {
public void setContents(MaterialData materialData) {
Material mat = materialData.getItemType();
if (mat == Material.RED_ROSE) {
if (mat == Material.LEGACY_RED_ROSE) {
setData((byte) 1);
} else if (mat == Material.YELLOW_FLOWER) {
} else if (mat == Material.LEGACY_YELLOW_FLOWER) {
setData((byte) 2);
} else if (mat == Material.RED_MUSHROOM) {
} else if (mat == Material.LEGACY_RED_MUSHROOM) {
setData((byte) 7);
} else if (mat == Material.BROWN_MUSHROOM) {
} else if (mat == Material.LEGACY_BROWN_MUSHROOM) {
setData((byte) 8);
} else if (mat == Material.CACTUS) {
} else if (mat == Material.LEGACY_CACTUS) {
setData((byte) 9);
} else if (mat == Material.DEAD_BUSH) {
} else if (mat == Material.LEGACY_DEAD_BUSH) {
setData((byte) 10);
} else if (mat == Material.SAPLING) {
} else if (mat == Material.LEGACY_SAPLING) {
TreeSpecies species = ((Tree) materialData).getSpecies();
if (species == TreeSpecies.GENERIC) {
@@ -120,7 +101,7 @@ public class FlowerPot extends MaterialData {
} else {
setData((byte) 6);
}
} else if (mat == Material.LONG_GRASS) {
} else if (mat == Material.LEGACY_LONG_GRASS) {
GrassSpecies species = ((LongGrass) materialData).getSpecies();
if (species == GrassSpecies.FERN_LIKE) {

21
paper-api/src/main/java/org/bukkit/material/Furnace.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class Furnace extends FurnaceAndDispenser {
public Furnace() {
super(Material.FURNACE);
super(Material.LEGACY_FURNACE);
}
/**
@@ -22,29 +22,10 @@ public class Furnace extends FurnaceAndDispenser {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Furnace(final int type) {
super(type);
}
public Furnace(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Furnace(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

19
paper-api/src/main/java/org/bukkit/material/FurnaceAndDispenser.java
View File

@@ -7,29 +7,10 @@ import org.bukkit.Material;
*/
public class FurnaceAndDispenser extends DirectionalContainer {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public FurnaceAndDispenser(final int type) {
super(type);
}
public FurnaceAndDispenser(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public FurnaceAndDispenser(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

12
paper-api/src/main/java/org/bukkit/material/Gate.java
View File

@@ -15,15 +15,21 @@ public class Gate extends MaterialData implements Directional, Openable {
private static final byte GATE_EAST = 0x3;
public Gate() {
super(Material.FENCE_GATE);
super(Material.LEGACY_FENCE_GATE);
}
public Gate(int type, byte data) {
/**
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Gate(final Material type, final byte data) {
super(type, data);
}
public Gate(byte data) {
super(Material.FENCE_GATE, data);
super(Material.LEGACY_FENCE_GATE, data);
}
public void setFacingDirection(BlockFace face) {

21
paper-api/src/main/java/org/bukkit/material/Hopper.java
View File

@@ -44,34 +44,15 @@ public class Hopper extends MaterialData implements Directional, Redstone {
* @see BlockFace
*/
public Hopper(BlockFace facingDirection, boolean isActive) {
super(Material.HOPPER);
super(Material.LEGACY_HOPPER);
setFacingDirection(facingDirection);
setActive(isActive);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Hopper(int type) {
super(type);
}
public Hopper(Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Hopper(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Ladder.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Ladder extends SimpleAttachableMaterialData {
public Ladder() {
super(Material.LADDER);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Ladder(final int type) {
super(type);
super(Material.LEGACY_LADDER);
}
public Ladder(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Ladder(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

25
paper-api/src/main/java/org/bukkit/material/Leaves.java
View File

@@ -7,11 +7,11 @@ import org.bukkit.TreeSpecies;
* Represents the different types of leaf block that may be permanent or can
* decay when too far from a log.
*
* @see Material#LEAVES
* @see Material#LEAVES_2
* @see Material#LEGACY_LEAVES
* @see Material#LEGACY_LEAVES_2
*/
public class Leaves extends Wood {
protected static final Material DEFAULT_TYPE = Material.LEAVES;
protected static final Material DEFAULT_TYPE = Material.LEGACY_LEAVES;
protected static final boolean DEFAULT_DECAYABLE = true;
/**
@@ -41,15 +41,6 @@ public class Leaves extends Wood {
this(DEFAULT_TYPE, species, isDecayable);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Leaves(final int type) {
super(type);
}
/**
* Constructs a leaf block of the given type.
*
@@ -82,16 +73,6 @@ public class Leaves extends Wood {
setDecayable(isDecayable);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Leaves(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Lever.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Lever extends SimpleAttachableMaterialData implements Redstone {
public Lever() {
super(Material.LEVER);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Lever(final int type) {
super(type);
super(Material.LEGACY_LEVER);
}
public Lever(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Lever(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/LongGrass.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.Material;
*/
public class LongGrass extends MaterialData {
public LongGrass() {
super(Material.LONG_GRASS);
super(Material.LEGACY_LONG_GRASS);
}
public LongGrass(GrassSpecies species) {
@@ -16,29 +16,10 @@ public class LongGrass extends MaterialData {
setSpecies(species);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public LongGrass(final int type) {
super(type);
}
public LongGrass(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public LongGrass(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

45
paper-api/src/main/java/org/bukkit/material/MaterialData.java
View File

@@ -2,38 +2,23 @@ package org.bukkit.material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.Material;
import org.bukkit.block.data.BlockData;
/**
* Handles specific metadata for certain items or blocks
*
* @deprecated all usage of MaterialData is deprecated and subject to removal.
* Use {@link BlockData}.
*/
@Deprecated
public class MaterialData implements Cloneable {
private final int type;
private final Material type;
private byte data = 0;
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public MaterialData(final int type) {
this(type, (byte) 0);
}
public MaterialData(final Material type) {
this(type, (byte) 0);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public MaterialData(final int type, final byte data) {
this.type = type;
this.data = data;
}
/**
* @param type the type
* @param data the raw data value
@@ -41,7 +26,8 @@ public class MaterialData implements Cloneable {
*/
@Deprecated
public MaterialData(final Material type, final byte data) {
this(type.getId(), data);
this.type = type;
this.data = data;
}
/**
@@ -72,17 +58,6 @@ public class MaterialData implements Cloneable {
* @return Material represented by this MaterialData
*/
public Material getItemType() {
return Material.getMaterial(type);
}
/**
* Gets the Material Id that this MaterialData represents
*
* @return Material Id represented by this MaterialData
* @deprecated Magic value
*/
@Deprecated
public int getItemTypeId() {
return type;
}
@@ -115,7 +90,7 @@ public class MaterialData implements Cloneable {
@Override
public int hashCode() {
return ((getItemTypeId() << 8) ^ getData());
return ((getItemType().hashCode() << 8) ^ getData());
}
@Override
@@ -123,7 +98,7 @@ public class MaterialData implements Cloneable {
if (obj != null && obj instanceof MaterialData) {
MaterialData md = (MaterialData) obj;
return (md.getItemTypeId() == getItemTypeId() && md.getData() == getData());
return (md.getItemType() == getItemType() && md.getData() == getData());
} else {
return false;
}

29
paper-api/src/main/java/org/bukkit/material/MonsterEggs.java
View File

@@ -12,41 +12,22 @@ public class MonsterEggs extends TexturedMaterial {
private static final List<Material> textures = new ArrayList<Material>();
static {
textures.add(Material.STONE);
textures.add(Material.COBBLESTONE);
textures.add(Material.SMOOTH_BRICK);
textures.add(Material.LEGACY_STONE);
textures.add(Material.LEGACY_COBBLESTONE);
textures.add(Material.LEGACY_SMOOTH_BRICK);
}
public MonsterEggs() {
super(Material.MONSTER_EGGS);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public MonsterEggs(final int type) {
super(type);
super(Material.LEGACY_MONSTER_EGGS);
}
public MonsterEggs(final Material type) {
super((textures.contains(type)) ? Material.MONSTER_EGGS : type);
super((textures.contains(type)) ? Material.LEGACY_MONSTER_EGGS : type);
if (textures.contains(type)) {
setMaterial(type);
}
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public MonsterEggs(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

33
paper-api/src/main/java/org/bukkit/material/Mushroom.java
View File

@@ -12,8 +12,8 @@ import org.bukkit.material.types.MushroomBlockTexture;
* Represents a huge mushroom block with certain combinations of faces set to
* cap, pores or stem.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public class Mushroom extends MaterialData {
private static final byte NORTH_LIMIT = 4;
@@ -29,12 +29,12 @@ public class Mushroom extends MaterialData {
*
* @param shroom A brown or red mushroom material type.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public Mushroom(Material shroom) {
super(shroom);
Validate.isTrue(shroom == Material.HUGE_MUSHROOM_1 || shroom == Material.HUGE_MUSHROOM_2, "Not a mushroom!");
Validate.isTrue(shroom == Material.LEGACY_HUGE_MUSHROOM_1 || shroom == Material.LEGACY_HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
@@ -50,8 +50,8 @@ public class Mushroom extends MaterialData {
* @param shroom A brown or red mushroom material type.
* @param capFace The face or faces to set to mushroom cap texture.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
* @see BlockFace
*/
public Mushroom(Material shroom, BlockFace capFace) {
@@ -64,8 +64,8 @@ public class Mushroom extends MaterialData {
* @param shroom A brown or red mushroom material type.
* @param texture The textured mushroom faces.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public Mushroom(Material shroom, MushroomBlockTexture texture) {
this(shroom, texture.getData());
@@ -79,18 +79,7 @@ public class Mushroom extends MaterialData {
@Deprecated
public Mushroom(Material shroom, byte data) {
super(shroom, data);
Validate.isTrue(shroom == Material.HUGE_MUSHROOM_1 || shroom == Material.HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Mushroom(int type, byte data) {
super(type, data);
Validate.isTrue(type == Material.HUGE_MUSHROOM_1.getId() || type == Material.HUGE_MUSHROOM_2.getId(), "Not a mushroom!");
Validate.isTrue(shroom == Material.LEGACY_HUGE_MUSHROOM_1 || shroom == Material.LEGACY_HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
@@ -284,7 +273,7 @@ public class Mushroom extends MaterialData {
@Override
public String toString() {
return Material.getMaterial(getItemTypeId()).toString() + (isStem() ? " STEM " : " CAP ") + getPaintedFaces();
return getItemType() + (isStem() ? " STEM " : " CAP ") + getPaintedFaces();
}
@Override

21
paper-api/src/main/java/org/bukkit/material/NetherWarts.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.NetherWartsState;
*/
public class NetherWarts extends MaterialData {
public NetherWarts() {
super(Material.NETHER_WARTS);
super(Material.LEGACY_NETHER_WARTS);
}
public NetherWarts(NetherWartsState state) {
@@ -16,29 +16,10 @@ public class NetherWarts extends MaterialData {
setState(state);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public NetherWarts(final int type) {
super(type);
}
public NetherWarts(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public NetherWarts(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Observer.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class Observer extends MaterialData implements Directional, Redstone {
public Observer() {
super(Material.OBSERVER);
super(Material.LEGACY_OBSERVER);
}
public Observer(BlockFace direction) {
@@ -17,29 +17,10 @@ public class Observer extends MaterialData implements Directional, Redstone {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Observer(final int type) {
super(type);
}
public Observer(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Observer(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

25
paper-api/src/main/java/org/bukkit/material/PistonBaseMaterial.java
View File

@@ -8,33 +8,10 @@ import org.bukkit.block.BlockFace;
*/
public class PistonBaseMaterial extends MaterialData implements Directional, Redstone {
/**
* Constructs a PistonBaseMaterial
*
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public PistonBaseMaterial(final int type) {
super(type);
}
public PistonBaseMaterial(final Material type) {
super(type);
}
/**
* Constructs a PistonBaseMaterial.
*
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public PistonBaseMaterial(final int type, final byte data) {
super(type, data);
}
/**
* Constructs a PistonBaseMaterial.
*
@@ -113,7 +90,7 @@ public class PistonBaseMaterial extends MaterialData implements Directional, Red
* @return true if this piston is "sticky", or false
*/
public boolean isSticky() {
return this.getItemType() == Material.PISTON_STICKY_BASE;
return this.getItemType() == Material.LEGACY_PISTON_STICKY_BASE;
}
@Override

18
paper-api/src/main/java/org/bukkit/material/PistonExtensionMaterial.java
View File

@@ -7,29 +7,11 @@ import org.bukkit.block.BlockFace;
* Material data for the piston extension block
*/
public class PistonExtensionMaterial extends MaterialData implements Attachable {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public PistonExtensionMaterial(final int type) {
super(type);
}
public PistonExtensionMaterial(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public PistonExtensionMaterial(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/PoweredRail.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class PoweredRail extends ExtendedRails implements Redstone {
public PoweredRail() {
super(Material.POWERED_RAIL);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public PoweredRail(final int type) {
super(type);
super(Material.LEGACY_POWERED_RAIL);
}
public PoweredRail(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public PoweredRail(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/PressurePlate.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class PressurePlate extends MaterialData implements PressureSensor {
public PressurePlate() {
super(Material.WOOD_PLATE);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public PressurePlate(int type) {
super(type);
super(Material.LEGACY_WOOD_PLATE);
}
public PressurePlate(Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public PressurePlate(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

23
paper-api/src/main/java/org/bukkit/material/Pumpkin.java
View File

@@ -9,7 +9,7 @@ import org.bukkit.block.BlockFace;
public class Pumpkin extends MaterialData implements Directional {
public Pumpkin() {
super(Material.PUMPKIN);
super(Material.LEGACY_PUMPKIN);
}
/**
@@ -22,29 +22,10 @@ public class Pumpkin extends MaterialData implements Directional {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Pumpkin(final int type) {
super(type);
}
public Pumpkin(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Pumpkin(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -56,7 +37,7 @@ public class Pumpkin extends MaterialData implements Directional {
}
public boolean isLit() {
return getItemType() == Material.JACK_O_LANTERN;
return getItemType() == Material.LEGACY_JACK_O_LANTERN;
}
public void setFacingDirection(BlockFace face) {

21
paper-api/src/main/java/org/bukkit/material/Rails.java
View File

@@ -9,32 +9,13 @@ import org.bukkit.block.BlockFace;
public class Rails extends MaterialData {
public Rails() {
super(Material.RAILS);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Rails(final int type) {
super(type);
super(Material.LEGACY_RAILS);
}
public Rails(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Rails(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

23
paper-api/src/main/java/org/bukkit/material/RedstoneTorch.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class RedstoneTorch extends Torch implements Redstone {
public RedstoneTorch() {
super(Material.REDSTONE_TORCH_ON);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public RedstoneTorch(final int type) {
super(type);
super(Material.LEGACY_REDSTONE_TORCH_ON);
}
public RedstoneTorch(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public RedstoneTorch(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -50,7 +31,7 @@ public class RedstoneTorch extends Torch implements Redstone {
* @return true if powered, otherwise false
*/
public boolean isPowered() {
return getItemType() == Material.REDSTONE_TORCH_ON;
return getItemType() == Material.LEGACY_REDSTONE_TORCH_ON;
}
@Override

21
paper-api/src/main/java/org/bukkit/material/RedstoneWire.java
View File

@@ -7,32 +7,13 @@ import org.bukkit.Material;
*/
public class RedstoneWire extends MaterialData implements Redstone {
public RedstoneWire() {
super(Material.REDSTONE_WIRE);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public RedstoneWire(final int type) {
super(type);
super(Material.LEGACY_REDSTONE_WIRE);
}
public RedstoneWire(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public RedstoneWire(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Sandstone.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.SandstoneType;
*/
public class Sandstone extends MaterialData {
public Sandstone() {
super(Material.SANDSTONE);
super(Material.LEGACY_SANDSTONE);
}
public Sandstone(SandstoneType type) {
@@ -16,29 +16,10 @@ public class Sandstone extends MaterialData {
setType(type);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Sandstone(final int type) {
super(type);
}
public Sandstone(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Sandstone(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

14
paper-api/src/main/java/org/bukkit/material/Sapling.java
View File

@@ -6,7 +6,7 @@ import org.bukkit.TreeSpecies;
/**
* Represents the different types of Tree block that face a direction.
*
* @see Material#SAPLING
* @see Material#LEGACY_SAPLING
*/
public class Sapling extends Wood {
@@ -34,7 +34,7 @@ public class Sapling extends Wood {
* @param isInstantGrowable true if the Sapling should grow when next ticked with bonemeal
*/
public Sapling(TreeSpecies species, boolean isInstantGrowable) {
this(Material.SAPLING, species, isInstantGrowable);
this(Material.LEGACY_SAPLING, species, isInstantGrowable);
}
/**
@@ -70,16 +70,6 @@ public class Sapling extends Wood {
setIsInstantGrowable(isInstantGrowable);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Sapling(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

23
paper-api/src/main/java/org/bukkit/material/Sign.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Sign extends MaterialData implements Attachable {
public Sign() {
super(Material.SIGN_POST);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Sign(final int type) {
super(type);
super(Material.LEGACY_SIGN_POST);
}
public Sign(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Sign(final int type, final byte data) {
super(type, data);
}
/**
* @param type the raw type id
* @param data the raw data value
@@ -51,7 +32,7 @@ public class Sign extends MaterialData implements Attachable {
* a block
*/
public boolean isWallSign() {
return getItemType() == Material.WALL_SIGN;
return getItemType() == Material.LEGACY_WALL_SIGN;
}
/**

24
paper-api/src/main/java/org/bukkit/material/SimpleAttachableMaterialData.java
View File

@@ -8,20 +8,6 @@ import org.bukkit.block.BlockFace;
*/
public abstract class SimpleAttachableMaterialData extends MaterialData implements Attachable {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public SimpleAttachableMaterialData(int type) {
super(type);
}
public SimpleAttachableMaterialData(int type, BlockFace direction) {
this(type);
setFacingDirection(direction);
}
public SimpleAttachableMaterialData(Material type, BlockFace direction) {
this(type);
setFacingDirection(direction);
@@ -31,16 +17,6 @@ public abstract class SimpleAttachableMaterialData extends MaterialData implemen
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public SimpleAttachableMaterialData(int type, byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Skull.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.block.BlockFace;
*/
public class Skull extends MaterialData implements Directional {
public Skull() {
super(Material.SKULL);
super(Material.LEGACY_SKULL);
}
/**
@@ -21,29 +21,10 @@ public class Skull extends MaterialData implements Directional {
setFacingDirection(direction);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Skull(final int type) {
super(type);
}
public Skull(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Skull(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

31
paper-api/src/main/java/org/bukkit/material/SmoothBrick.java
View File

@@ -12,42 +12,23 @@ public class SmoothBrick extends TexturedMaterial {
private static final List<Material> textures = new ArrayList<Material>();
static {
textures.add(Material.STONE);
textures.add(Material.MOSSY_COBBLESTONE);
textures.add(Material.COBBLESTONE);
textures.add(Material.SMOOTH_BRICK);
textures.add(Material.LEGACY_STONE);
textures.add(Material.LEGACY_MOSSY_COBBLESTONE);
textures.add(Material.LEGACY_COBBLESTONE);
textures.add(Material.LEGACY_SMOOTH_BRICK);
}
public SmoothBrick() {
super(Material.SMOOTH_BRICK);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public SmoothBrick(final int type) {
super(type);
super(Material.LEGACY_SMOOTH_BRICK);
}
public SmoothBrick(final Material type) {
super((textures.contains(type)) ? Material.SMOOTH_BRICK : type);
super((textures.contains(type)) ? Material.LEGACY_SMOOTH_BRICK : type);
if (textures.contains(type)) {
setMaterial(type);
}
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public SmoothBrick(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

8
paper-api/src/main/java/org/bukkit/material/SpawnEgg.java
View File

@@ -12,16 +12,16 @@ import org.bukkit.inventory.meta.SpawnEggMeta;
public class SpawnEgg extends MaterialData {
public SpawnEgg() {
super(Material.MONSTER_EGG);
super(Material.LEGACY_MONSTER_EGG);
}
/**
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public SpawnEgg(int type, byte data) {
public SpawnEgg(final Material type, final byte data) {
super(type, data);
}
@@ -31,7 +31,7 @@ public class SpawnEgg extends MaterialData {
*/
@Deprecated
public SpawnEgg(byte data) {
super(Material.MONSTER_EGG, data);
super(Material.LEGACY_MONSTER_EGG, data);
}
public SpawnEgg(EntityType type) {

19
paper-api/src/main/java/org/bukkit/material/Stairs.java
View File

@@ -8,29 +8,10 @@ import org.bukkit.block.BlockFace;
*/
public class Stairs extends MaterialData implements Directional {
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Stairs(final int type) {
super(type);
}
public Stairs(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Stairs(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

39
paper-api/src/main/java/org/bukkit/material/Step.java
View File

@@ -11,46 +11,27 @@ import org.bukkit.Material;
public class Step extends TexturedMaterial {
private static final List<Material> textures = new ArrayList<Material>();
static {
textures.add(Material.STONE);
textures.add(Material.SANDSTONE);
textures.add(Material.WOOD);
textures.add(Material.COBBLESTONE);
textures.add(Material.BRICK);
textures.add(Material.SMOOTH_BRICK);
textures.add(Material.NETHER_BRICK);
textures.add(Material.QUARTZ_BLOCK);
textures.add(Material.LEGACY_STONE);
textures.add(Material.LEGACY_SANDSTONE);
textures.add(Material.LEGACY_WOOD);
textures.add(Material.LEGACY_COBBLESTONE);
textures.add(Material.LEGACY_BRICK);
textures.add(Material.LEGACY_SMOOTH_BRICK);
textures.add(Material.LEGACY_NETHER_BRICK);
textures.add(Material.LEGACY_QUARTZ_BLOCK);
}
public Step() {
super(Material.STEP);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Step(final int type) {
super(type);
super(Material.LEGACY_STEP);
}
public Step(final Material type) {
super((textures.contains(type)) ? Material.STEP : type);
super((textures.contains(type)) ? Material.LEGACY_STEP : type);
if (textures.contains(type)) {
setMaterial(type);
}
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Step(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

19
paper-api/src/main/java/org/bukkit/material/TexturedMaterial.java
View File

@@ -13,25 +13,6 @@ public abstract class TexturedMaterial extends MaterialData {
super(m);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public TexturedMaterial(int type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public TexturedMaterial(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Torch.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.Material;
*/
public class Torch extends SimpleAttachableMaterialData {
public Torch() {
super(Material.TORCH);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Torch(final int type) {
super(type);
super(Material.LEGACY_TORCH);
}
public Torch(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Torch(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/TrapDoor.java
View File

@@ -8,32 +8,13 @@ import org.bukkit.block.BlockFace;
*/
public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
public TrapDoor() {
super(Material.TRAP_DOOR);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public TrapDoor(final int type) {
super(type);
super(Material.LEGACY_TRAP_DOOR);
}
public TrapDoor(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public TrapDoor(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

25
paper-api/src/main/java/org/bukkit/material/Tree.java
View File

@@ -7,11 +7,11 @@ import org.bukkit.block.BlockFace;
/**
* Represents the different types of Tree block that face a direction.
*
* @see Material#LOG
* @see Material#LOG_2
* @see Material#LEGACY_LOG
* @see Material#LEGACY_LOG_2
*/
public class Tree extends Wood {
protected static final Material DEFAULT_TYPE = Material.LOG;
protected static final Material DEFAULT_TYPE = Material.LEGACY_LOG;
protected static final BlockFace DEFAULT_DIRECTION = BlockFace.UP;
/**
@@ -41,15 +41,6 @@ public class Tree extends Wood {
this(DEFAULT_TYPE, species, dir);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Tree(final int type) {
super(type);
}
/**
* Constructs a tree block of the given type.
*
@@ -82,16 +73,6 @@ public class Tree extends Wood {
setDirection(dir);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Tree(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

15
paper-api/src/main/java/org/bukkit/material/Tripwire.java
View File

@@ -8,25 +8,16 @@ import org.bukkit.Material;
public class Tripwire extends MaterialData {
public Tripwire() {
super(Material.TRIPWIRE);
super(Material.LEGACY_TRIPWIRE);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Tripwire(final int type) {
super(type);
}
/**
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Tripwire(final int type, final byte data) {
public Tripwire(final Material type, final byte data) {
super(type, data);
}

15
paper-api/src/main/java/org/bukkit/material/TripwireHook.java
View File

@@ -9,25 +9,16 @@ import org.bukkit.block.BlockFace;
public class TripwireHook extends SimpleAttachableMaterialData implements Redstone {
public TripwireHook() {
super(Material.TRIPWIRE_HOOK);
super(Material.LEGACY_TRIPWIRE_HOOK);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public TripwireHook(final int type) {
super(type);
}
/**
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public TripwireHook(final int type, final byte data) {
public TripwireHook(final Material type, final byte data) {
super(type, data);
}

8
paper-api/src/main/java/org/bukkit/material/Vine.java
View File

@@ -17,16 +17,16 @@ public class Vine extends MaterialData {
private static final EnumSet<BlockFace> possibleFaces = EnumSet.of(BlockFace.WEST, BlockFace.NORTH, BlockFace.SOUTH, BlockFace.EAST);
public Vine() {
super(Material.VINE);
super(Material.LEGACY_VINE);
}
/**
* @param type the raw type id
* @param type the type
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Vine(int type, byte data) {
public Vine(final Material type, final byte data) {
super(type, data);
}
@@ -36,7 +36,7 @@ public class Vine extends MaterialData {
*/
@Deprecated
public Vine(byte data) {
super(Material.VINE, data);
super(Material.LEGACY_VINE, data);
}
public Vine(BlockFace... faces) {

75
paper-api/src/main/java/org/bukkit/material/Wood.java
View File

@@ -6,12 +6,12 @@ import org.bukkit.TreeSpecies;
/**
* Represents wood blocks of different species.
*
* @see Material#WOOD
* @see Material#SAPLING
* @see Material#WOOD_DOUBLE_STEP
* @see Material#LEGACY_WOOD
* @see Material#LEGACY_SAPLING
* @see Material#LEGACY_WOOD_DOUBLE_STEP
*/
public class Wood extends MaterialData {
protected static final Material DEFAULT_TYPE = Material.WOOD;
protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD;
protected static final TreeSpecies DEFAULT_SPECIES = TreeSpecies.GENERIC;
/**
@@ -30,15 +30,6 @@ public class Wood extends MaterialData {
this(DEFAULT_TYPE, species);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Wood(final int type) {
super(type);
}
/**
* Constructs a wood block of the given type.
*
@@ -60,16 +51,6 @@ public class Wood extends MaterialData {
setSpecies(species);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Wood(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value
@@ -87,17 +68,17 @@ public class Wood extends MaterialData {
*/
public TreeSpecies getSpecies() {
switch (getItemType()) {
case WOOD:
case WOOD_DOUBLE_STEP:
case LEGACY_WOOD:
case LEGACY_WOOD_DOUBLE_STEP:
return TreeSpecies.getByData((byte) getData());
case LOG:
case LEAVES:
case LEGACY_LOG:
case LEGACY_LEAVES:
return TreeSpecies.getByData((byte) (getData() & 0x3));
case LOG_2:
case LEAVES_2:
case LEGACY_LOG_2:
case LEGACY_LEAVES_2:
return TreeSpecies.getByData((byte) ((getData() & 0x3) | 0x4));
case SAPLING:
case WOOD_STEP:
case LEGACY_SAPLING:
case LEGACY_WOOD_STEP:
return TreeSpecies.getByData((byte) (getData() & 0x7));
default:
throw new IllegalArgumentException("Invalid block type for tree species");
@@ -118,20 +99,20 @@ public class Wood extends MaterialData {
case BIRCH:
case JUNGLE:
switch (type) {
case LOG_2:
return Material.LOG;
case LEAVES_2:
return Material.LEAVES;
case LEGACY_LOG_2:
return Material.LEGACY_LOG;
case LEGACY_LEAVES_2:
return Material.LEGACY_LEAVES;
default:
}
break;
case ACACIA:
case DARK_OAK:
switch (type) {
case LOG:
return Material.LOG_2;
case LEAVES:
return Material.LEAVES_2;
case LEGACY_LOG:
return Material.LEGACY_LOG_2;
case LEGACY_LEAVES:
return Material.LEGACY_LEAVES_2;
default:
}
break;
@@ -147,16 +128,16 @@ public class Wood extends MaterialData {
public void setSpecies(final TreeSpecies species) {
boolean firstType = false;
switch (getItemType()) {
case WOOD:
case WOOD_DOUBLE_STEP:
case LEGACY_WOOD:
case LEGACY_WOOD_DOUBLE_STEP:
setData(species.getData());
break;
case LOG:
case LEAVES:
case LEGACY_LOG:
case LEGACY_LEAVES:
firstType = true;
// fall through to next switch statement below
case LOG_2:
case LEAVES_2:
case LEGACY_LOG_2:
case LEGACY_LEAVES_2:
switch (species) {
case GENERIC:
case REDWOOD:
@@ -175,8 +156,8 @@ public class Wood extends MaterialData {
}
setData((byte) ((getData() & 0xC) | (species.getData() & 0x3)));
break;
case SAPLING:
case WOOD_STEP:
case LEGACY_SAPLING:
case LEGACY_WOOD_STEP:
setData((byte) ((getData() & 0x8) | species.getData()));
break;
default:

23
paper-api/src/main/java/org/bukkit/material/WoodenStep.java
View File

@@ -6,10 +6,10 @@ import org.bukkit.TreeSpecies;
/**
* Represents the different types of wooden steps.
*
* @see Material#WOOD_STEP
* @see Material#LEGACY_WOOD_STEP
*/
public class WoodenStep extends Wood {
protected static final Material DEFAULT_TYPE = Material.WOOD_STEP;
protected static final Material DEFAULT_TYPE = Material.LEGACY_WOOD_STEP;
protected static final boolean DEFAULT_INVERTED = false;
/**
@@ -40,25 +40,6 @@ public class WoodenStep extends Wood {
setInverted(inv);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public WoodenStep(final int type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public WoodenStep(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value

21
paper-api/src/main/java/org/bukkit/material/Wool.java
View File

@@ -8,7 +8,7 @@ import org.bukkit.Material;
*/
public class Wool extends MaterialData implements Colorable {
public Wool() {
super(Material.WOOL);
super(Material.LEGACY_WOOL);
}
public Wool(DyeColor color) {
@@ -16,29 +16,10 @@ public class Wool extends MaterialData implements Colorable {
setColor(color);
}
/**
* @param type the raw type id
* @deprecated Magic value
*/
@Deprecated
public Wool(final int type) {
super(type);
}
public Wool(final Material type) {
super(type);
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Wool(final int type, final byte data) {
super(type, data);
}
/**
* @param type the type
* @param data the raw data value