SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Update to Minecraft 1.10

Quellcode durchsuchen 
By: md_5 <git@md-5.net>
Dieser Commit ist enthalten in:
Bukkit/Spigot 2016-06-09 11:43:40 +10:00
Ursprung 44956ed250
Commit 7d3852dda8
10 geänderte Dateien mit 91 neuen und 89 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
paper-api/pom.xml
Datei anzeigen

@ -11,7 +11,7 @@
<groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId>
<version>1.9.4-R0.1-SNAPSHOT</version>
<version>1.10-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Bukkit</name>

14
paper-api/src/main/java/org/bukkit/Material.java
Datei anzeigen

@ -282,6 +282,11 @@ public enum Material {
COMMAND_REPEATING(210, Command.class),
COMMAND_CHAIN(211, Command.class),
FROSTED_ICE(212),
MAGMA(213),
NETHER_WART_BLOCK(214),
RED_NETHER_BRICK(215),
BONE_BLOCK(216),
STRUCTURE_VOID(217),
STRUCTURE_BLOCK(255),
// ----- Item Separator -----
IRON_SPADE(256, 1, 250),
@ -901,6 +906,10 @@ public enum Material {
case COMMAND_REPEATING:
case COMMAND_CHAIN:
case FROSTED_ICE:
case MAGMA:
case NETHER_WART_BLOCK:
case RED_NETHER_BRICK:
case BONE_BLOCK:
return true;
default:
return false;
@ -966,6 +975,7 @@ public enum Material {
case CHORUS_FLOWER:
case BEETROOT_BLOCK:
case END_GATEWAY:
case STRUCTURE_VOID:
return true;
default:
return false;
@ -1182,6 +1192,10 @@ public enum Material {
case STRUCTURE_BLOCK:
case COMMAND_REPEATING:
case COMMAND_CHAIN:
case MAGMA:
case NETHER_WART_BLOCK:
case RED_NETHER_BRICK:
case BONE_BLOCK:
return true;
default:
return false;

3
paper-api/src/main/java/org/bukkit/Particle.java
Datei anzeigen

@ -49,7 +49,8 @@ public enum Particle {
DRAGON_BREATH,
END_ROD,
DAMAGE_INDICATOR,
SWEEP_ATTACK;
SWEEP_ATTACK,
FALLING_DUST;
private final Class<?> dataType;

21
paper-api/src/main/java/org/bukkit/Sound.java
Datei anzeigen

@ -33,6 +33,7 @@ public enum Sound {
BLOCK_DISPENSER_DISPENSE,
BLOCK_DISPENSER_FAIL,
BLOCK_DISPENSER_LAUNCH,
BLOCK_ENCHANTMENT_TABLE_USE,
BLOCK_ENDERCHEST_CLOSE,
BLOCK_ENDERCHEST_OPEN,
BLOCK_END_GATEWAY_SPAWN,
@ -257,6 +258,10 @@ public enum Sound {
ENTITY_HOSTILE_SMALL_FALL,
ENTITY_HOSTILE_SPLASH,
ENTITY_HOSTILE_SWIM,
ENTITY_HUSK_AMBIENT,
ENTITY_HUSK_DEATH,
ENTITY_HUSK_HURT,
ENTITY_HUSK_STEP,
ENTITY_IRONGOLEM_ATTACK,
ENTITY_IRONGOLEM_DEATH,
ENTITY_IRONGOLEM_HURT,
@ -305,6 +310,12 @@ public enum Sound {
ENTITY_PLAYER_SMALL_FALL,
ENTITY_PLAYER_SPLASH,
ENTITY_PLAYER_SWIM,
ENTITY_POLAR_BEAR_AMBIENT,
ENTITY_POLAR_BEAR_BABY_AMBIENT,
ENTITY_POLAR_BEAR_DEATH,
ENTITY_POLAR_BEAR_HURT,
ENTITY_POLAR_BEAR_STEP,
ENTITY_POLAR_BEAR_WARNING,
ENTITY_RABBIT_AMBIENT,
ENTITY_RABBIT_ATTACK,
ENTITY_RABBIT_DEATH,
@ -363,6 +374,10 @@ public enum Sound {
ENTITY_SQUID_AMBIENT,
ENTITY_SQUID_DEATH,
ENTITY_SQUID_HURT,
ENTITY_STRAY_AMBIENT,
ENTITY_STRAY_DEATH,
ENTITY_STRAY_HURT,
ENTITY_STRAY_STEP,
ENTITY_TNT_PRIMED,
ENTITY_VILLAGER_AMBIENT,
ENTITY_VILLAGER_DEATH,
@ -380,6 +395,10 @@ public enum Sound {
ENTITY_WITHER_DEATH,
ENTITY_WITHER_HURT,
ENTITY_WITHER_SHOOT,
ENTITY_WITHER_SKELETON_AMBIENT,
ENTITY_WITHER_SKELETON_DEATH,
ENTITY_WITHER_SKELETON_HURT,
ENTITY_WITHER_SKELETON_STEP,
ENTITY_WITHER_SPAWN,
ENTITY_WOLF_AMBIENT,
ENTITY_WOLF_DEATH,
@ -452,5 +471,5 @@ public enum Sound {
RECORD_WARD,
UI_BUTTON_CLICK,
WEATHER_RAIN,
WEATHER_RAIN_ABOVE,
WEATHER_RAIN_ABOVE;
}

16
paper-api/src/main/java/org/bukkit/entity/ArmorStand.java
Datei anzeigen

@ -197,22 +197,6 @@ public interface ArmorStand extends LivingEntity {
*/
void setBasePlate(boolean basePlate);
/**
* Returns whether gravity applies to
* this armor stand
*
* @return whether gravity applies
*/
boolean hasGravity();
/**
* Sets whether gravity applies to
* this armor stand
*
* @param gravity whether gravity should apply
*/
void setGravity(boolean gravity);
/**
* Returns whether the armor stand should be
* visible or not

14
paper-api/src/main/java/org/bukkit/entity/Entity.java
Datei anzeigen

@ -389,4 +389,18 @@ public interface Entity extends Metadatable, CommandSender {
* @param flag if the entity is silent
*/
public void setSilent(boolean flag);
/**
* Returns whether gravity applies to this entity.
*
* @return whether gravity applies
*/
boolean hasGravity();
/**
* Sets whether gravity applies to this entity.
*
* @param gravity whether gravity should apply
*/
void setGravity(boolean gravity);
}

1
paper-api/src/main/java/org/bukkit/entity/EntityType.java
Datei anzeigen

@ -169,6 +169,7 @@ public enum EntityType {
IRON_GOLEM("VillagerGolem", IronGolem.class, 99),
HORSE("EntityHorse", Horse.class, 100),
RABBIT("Rabbit", Rabbit.class, 101),
POLAR_BEAR("PolarBear", PolarBear.class, 102),
VILLAGER("Villager", Villager.class, 120),
ENDER_CRYSTAL("EnderCrystal", EnderCrystal.class, 200),
// These don't have an entity ID in nms.EntityTypes.

6
paper-api/src/main/java/org/bukkit/entity/PolarBear.java Normale Datei
Datei anzeigen

@ -0,0 +1,6 @@
package org.bukkit.entity;
/**
* Represents a polar bear.
*/
public interface PolarBear extends Animals {}

41
paper-api/src/main/java/org/bukkit/entity/Skeleton.java
Datei anzeigen

@ -23,43 +23,18 @@ public interface Skeleton extends Monster {
* Represents the various different Skeleton types.
*/
public enum SkeletonType {
NORMAL(0),
WITHER(1);
private static final SkeletonType[] types = new SkeletonType[SkeletonType.values().length];
private final int id;
static {
for (SkeletonType type : values()) {
types[type.getId()] = type;
}
}
private SkeletonType(int id) {
this.id = id;
}
/**
* Gets the ID of this skeleton type.
*
* @return Skeleton type ID
* @deprecated Magic value
* Standard skeleton type.
*/
@Deprecated
public int getId() {
return id;
}
NORMAL,
/**
* Gets a skeleton type by its ID.
*
* @param id ID of the skeleton type to get.
* @return Resulting skeleton type, or null if not found.
* @deprecated Magic value
* Wither skeleton. Generally found in Nether fortresses.
*/
@Deprecated
public static SkeletonType getType(int id) {
return (id >= types.length) ? null : types[id];
}
WITHER,
/**
* Stray skeleton. Generally found in ice biomes. Shoots tipped arrows.
*/
STRAY;
}
}

62
paper-api/src/main/java/org/bukkit/entity/Villager.java
Datei anzeigen

@ -111,48 +111,36 @@ public interface Villager extends Ageable, NPC, InventoryHolder {
/**
* Represents the various different Villager professions there may be.
* Villagers have different trading options depending on their profession,
*/
public enum Profession {
FARMER(0),
LIBRARIAN(1),
PRIEST(2),
BLACKSMITH(3),
BUTCHER(4);
private static final Profession[] professions = new Profession[Profession.values().length];
private final int id;
static {
for (Profession type : values()) {
professions[type.getId()] = type;
}
}
private Profession(int id) {
this.id = id;
}
/**
* Gets the ID of this profession.
*
* @return Profession ID.
* @deprecated Magic value
* Villager without a profession.
*/
@Deprecated
public int getId() {
return id;
}
NORMAL,
/**
* Gets a profession by its ID.
*
* @param id ID of the profession to get.
* @return Resulting profession, or null if not found.
* @deprecated Magic value
* Farmer profession. Wears a brown robe.
*/
@Deprecated
public static Profession getProfession(int id) {
return (id >= professions.length) ? null : professions[id];
}
FARMER,
/**
* Librarian profession. Wears a white robe.
*/
LIBRARIAN,
/**
* Priest profession. Wears a purple robe.
*/
PRIEST,
/**
* Blacksmith profession. Wears a black apron.
*/
BLACKSMITH,
/**
* Butcher profession. Wears a white apron.
*/
BUTCHER,
/**
* Really a zombie.
*/
HUSK;
}
}