From 7bc218d1e2abe2d9c99eb0bac639c0cf50c949e3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 16 Dec 2014 10:11:06 +1100 Subject: [PATCH] Use SpecialSource Maven pluging for compile time remapping. --- deprecation-mappings.csrg | 27 ++++++++++++++ maps.yml | 46 ------------------------ pom.xml | 75 ++++++++++----------------------------- 3 files changed, 45 insertions(+), 103 deletions(-) create mode 100644 deprecation-mappings.csrg delete mode 100644 maps.yml diff --git a/deprecation-mappings.csrg b/deprecation-mappings.csrg new file mode 100644 index 0000000000..48bc504954 --- /dev/null +++ b/deprecation-mappings.csrg @@ -0,0 +1,27 @@ +org/bukkit/Bukkit _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player; getOnlinePlayers +org/bukkit/Server _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player; getOnlinePlayers + +org/bukkit/entity/Damageable _INVALID_damage (I)V damage +org/bukkit/entity/Damageable _INVALID_damage (ILorg/bukkit/entity/Entity;)V damage +org/bukkit/entity/Damageable _INVALID_getHealth ()I getHealth +org/bukkit/entity/Damageable _INVALID_getMaxHealth ()I getMaxHealth +org/bukkit/entity/Damageable _INVALID_setHealth (I)V setHealth +org/bukkit/entity/Damageable _INVALID_setMaxHealth (I)V setMaxHealth + +org/bukkit/entity/LivingEntity _INVALID_getLastDamage ()I getLastDamage +org/bukkit/entity/LivingEntity _INVALID_setLastDamage (I)V setLastDamage + +org/bukkit/entity/Minecart _INVALID_getDamage ()I getDamage +org/bukkit/entity/Minecart _INVALID_setDamage (I)V setDamage + +org/bukkit/entity/Projectile _INVALID_getShooter ()Lorg/bukkit/entity/LivingEntity; getShooter +org/bukkit/entity/Projectile _INVALID_setShooter (Lorg/bukkit/entity/LivingEntity;)V setShooter + +org/bukkit/event/entity/EntityDamageEvent _INVALID_getDamage ()I getDamage +org/bukkit/event/entity/EntityDamageEvent _INVALID_setDamage (I)V setDamage + +org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_getAmount ()I getAmount +org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_setAmount (I)V setAmount + +org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_getDamage ()I getDamage +org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_setDamage (I)V setDamage diff --git a/maps.yml b/maps.yml deleted file mode 100644 index 5384024cfb..0000000000 --- a/maps.yml +++ /dev/null @@ -1,46 +0,0 @@ -members: - "org/bukkit/entity/Damageable _INVALID_damage (I)V": damage - "org/bukkit/entity/Damageable _INVALID_damage (ILorg/bukkit/entity/Entity;)V": damage - "org/bukkit/entity/Damageable _INVALID_getHealth ()I": getHealth - "org/bukkit/entity/Damageable _INVALID_setHealth (I)V": setHealth - "org/bukkit/entity/Damageable _INVALID_getMaxHealth ()I": getMaxHealth - "org/bukkit/entity/Damageable _INVALID_setMaxHealth (I)V": setMaxHealth - "org/bukkit/entity/LivingEntity _INVALID_getLastDamage ()I": getLastDamage - "org/bukkit/entity/LivingEntity _INVALID_setLastDamage (I)V": setLastDamage - "org/bukkit/event/entity/EntityDamageEvent _INVALID_getDamage ()I": getDamage - "org/bukkit/event/entity/EntityDamageEvent _INVALID_setDamage (I)V": setDamage - "org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_getDamage ()I": getDamage - "org/bukkit/event/vehicle/VehicleDamageEvent _INVALID_setDamage (I)V": setDamage - "org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_getAmount ()I": getAmount - "org/bukkit/event/entity/EntityRegainHealthEvent _INVALID_setAmount (I)V": setAmount - "org/bukkit/entity/Minecart _INVALID_getDamage ()I": getDamage - "org/bukkit/entity/Minecart _INVALID_setDamage (I)V": setDamage - "org/bukkit/entity/Projectile _INVALID_getShooter ()Lorg/bukkit/entity/LivingEntity;": getShooter - "org/bukkit/entity/Projectile _INVALID_setShooter (Lorg/bukkit/entity/LivingEntity;)V": setShooter - "org/bukkit/Bukkit _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player;": getOnlinePlayers - "org/bukkit/Server _INVALID_getOnlinePlayers ()[Lorg/bukkit/entity/Player;": getOnlinePlayers -flags: - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity getHealth ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart getHealth ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity getMaxHealth ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart getMaxHealth ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity setHealth (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart setHealth (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity setMaxHealth (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart setMaxHealth (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity damage (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart damage (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity damage (ILorg/bukkit/entity/Entity;)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftEnderDragonPart damage (ILorg/bukkit/entity/Entity;)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity getLastDamage ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftLivingEntity setLastDamage (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftMinecart setDamage (I)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftMinecart getDamage ()I": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftProjectile getShooter ()Lorg/bukkit/entity/LivingEntity;": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftProjectile setShooter (Lorg/bukkit/entity/LivingEntity;)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftArrow getShooter ()Lorg/bukkit/entity/LivingEntity;": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftArrow setShooter (Lorg/bukkit/entity/LivingEntity;)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftFireball getShooter ()Lorg/bukkit/entity/LivingEntity;": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftFireball setShooter (Lorg/bukkit/entity/LivingEntity;)V": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftFish getShooter ()Lorg/bukkit/entity/LivingEntity;": 0x1001 - "org/bukkit/craftbukkit/v${minecraft_version}/entity/CraftFish setShooter (Lorg/bukkit/entity/LivingEntity;)V": 0x1001 diff --git a/pom.xml b/pom.xml index 49f802803d..29c327f8ff 100644 --- a/pom.xml +++ b/pom.xml @@ -18,20 +18,6 @@ - - - repobo-snap - http://repo.bukkit.org/content/groups/public - - - - - - bukkit-plugins - http://repo.bukkit.org/content/groups/public - - - org.bukkit @@ -251,6 +237,24 @@ + + + net.md-5 + specialsource-maven-plugin + 1.0 + + + package + + remap + + + ${project.basedir}/deprecation-mappings.csrg + + + + + org.apache.maven.plugins maven-compiler-plugin @@ -272,49 +276,6 @@ - - maven-resources-plugin - 2.4.3 - - - maps-file - package - - copy-resources - - - ${basedir}/target - - - ${basedir} - true - - maps.yml - - - - - - - - - com.wolvereness - overmapped - 0.0.2 - - - package - - map - - - ${basedir}/target/maps.yml - ${basedir}/target/${project.artifactId}-${project.version}.jar - ${basedir}/target/unmapped-${project.artifactId}-${project.version}.jar - - - -