Fix issues of compatibility with Minecraft 1.9.

* Deprecated integer overloads of entity health APIs no longer exist in Spigot 1.9, so use the double overloads instead. * Numerous other deprecation warnings have been fixed. * Support for setting the item in the off hand has been added, denoted as the section named "shield" in the configuration. * The configuration example now illustrates setting the shield item and adjusts sounds to their new names in the 1.9 API.
totemo · Mar 10, 2016 · a00c079 · a00c079
1 parent 03fddf0
commit a00c079
Show file tree

Hide file tree

Showing 7 changed files with 190 additions and 176 deletions.
diff --git a/examples/config.yml b/examples/config.yml
@@ -139,18 +139,18 @@ shapes:
 creatures:
   SpecialBat:
     spawn: Bat
-    sound: ambience_cave
+    sound: ambient_cave
 
   SpecialCow:
     spawn: Cow
-    sound: ambience_cave
+    sound: ambient_cave
     lightning:
       min: 1
     despawns: false
 
   SpecialVillager:
     spawn: Villager
-    sound: ambience_cave
+    sound: ambient_cave
     lightning:
       min: 1
     despawns: false
@@ -176,7 +176,7 @@ creatures:
     boots:
       item: leather_boots
       rgb: [255,0,0]
-  
+
   BlueSkeleton:
     spawn: Skeleton
     lightning:
@@ -210,7 +210,7 @@ creatures:
     boots:
       item: leather_boots
       rgb: [255,0,0]
-    
+
   BlueBabyZombieVillager:
     spawn: BabyZombieVillager
     despawns: false
@@ -226,7 +226,7 @@ creatures:
     boots:
       item: leather_boots
       rgb: [0,0,255]
-      
+
   RedBabyZombie:
     spawn: BabyZombie
     despawns: false
@@ -242,7 +242,7 @@ creatures:
     boots:
       item: leather_boots
       rgb: [255,0,0]
-    
+
   BlueBabyZombie:
     spawn: BabyZombie
     despawns: false
@@ -294,12 +294,12 @@ creatures:
   BabyWolf:
     despawns: false
     spawn: Wolf
-    baby: true      
-    agelocked: true      
-    
+    baby: true
+    agelocked: true
+
   ToughWitherSkeleton:
     spawn: WitherSkeleton
-    sound: wither_spawn
+    sound: entity_wither_spawn
     lightning:
       min: 1
     despawns: false
@@ -335,7 +335,7 @@ creatures:
 
   ToughSkeleton:
     spawn: Skeleton
-    sound: wither_spawn
+    sound: entity_wither_spawn
     lightning:
       min: 1
     despawns: false
@@ -357,7 +357,7 @@ creatures:
 
   ToughPigZombie:
     spawn: PigZombie
-    sound: wither_spawn
+    sound: entity_wither_spawn
     lightning:
       min: 1
     despawns: false
@@ -380,7 +380,7 @@ creatures:
     defaultname: Minion
     keephelmet: true
     spawn: Skeleton
-    sound: ambience_cave
+    sound: ambient_cave
     helmet:
       item: melon_block
     weapon:
@@ -391,7 +391,7 @@ creatures:
     defaultname: Henchman
     keephelmet: true
     spawn: Skeleton
-    sound: ambience_cave
+    sound: ambient_cave
     helmet:
       item: melon_block
     chestplate:
@@ -409,14 +409,14 @@ creatures:
   FlyingPig:
     spawn: Pig
     mount: InvisibleBat
-    sound: pig_death
+    sound: entity_pig_death
 
   FlyingSquid:
     spawn: Squid
     mount: InvisibleBat
-    sound: swim
+    sound: entity_generic_swim
     air: 72000
-        
+
   FlyingSaddledPig:
     spawn: SaddledPig
     mount: InvisibleBat
@@ -438,7 +438,7 @@ creatures:
     potions:
     - type: invisibility
       ambient: false
-    
+
   FlyingSkull:
     spawn: Skeleton
     despawns: false
@@ -447,7 +447,7 @@ creatures:
     potions:
     - type: invisibility
     - type: fire_resistance
-    helmet: 
+    helmet:
       item: skull_item
       dropchance: 0.0
     weapon:
@@ -467,7 +467,7 @@ creatures:
     lightning:
       min: 4
       max: 7
-    sound: wither_spawn
+    sound: entity_wither_spawn
     helmet:
       item: skull_item
       lore:
@@ -480,13 +480,19 @@ creatures:
       enchantments:
       - type: protection_environmental
         level: 4
-    leggings: 
+    leggings:
       item: diamond_leggings
       damage: 3
       dropchance: 0.0
       enchantments:
       - type: protection_environmental
         level: 4
+    boots:
+      item: diamond_boots
+      dropchance: 0.0
+      enchantments:
+      - type: protection_environmental
+        level: 4
     weapon:
       item: diamond_sword
       name: Whittlebone
@@ -500,7 +506,7 @@ creatures:
         level: 5
       - type: fire_aspect
         level: 2
-    boots:
+    shield:
 #      item: tripwire_hook
 #      name: The Key of Notch
 #      lore:
@@ -547,6 +553,12 @@ creatures:
       - type: protection_environmental
         level: 4
     boots:
+      item: diamond_boots
+      dropchance: 0.0
+      enchantments:
+      - type: protection_environmental
+        level: 4
+    shield:
       item: written_book
       lore:
       - "&4&oA mysterious tome of great power."
@@ -653,14 +665,14 @@ creatures:
       - weight: 0.5
         spawn: Bat
 
-        
+
 players:
   Notch:
     spawn: Notch
     shapes:
     - diamond_t_ns
     - diamond_t_ew
-        
+
   jeb_:
     shapes:
     - diamond_t_ns

diff --git a/plugin.yml b/plugin.yml
@@ -1,14 +1,16 @@
-name: Doppelganger
+name: ${project.name}
 main: io.github.totemo.doppelganger.Doppelganger
 version: ${project.version}
 description: ${project.description}
 author: totemo
-website: http://github.com/totemo/Doppelganger
+website: ${project.url}
+
 commands:
   doppel:
     description: Describes, finds, spawns and kills doppelgangers. See /doppel help.
     usage: /doppel [help|info|coords|kill|spawn|maintain] <subcommand arguments>
     permission: doppelganger.help
+
 permissions:
   doppelganger.*:
     description: Permission to use doppelganger commands.

diff --git a/pom.xml b/pom.xml
@@ -3,52 +3,29 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.github.totemo</groupId>
 	<artifactId>Doppelganger</artifactId>
-	<version>0.9.2</version>
+	<version>0.10.0</version>
 	<packaging>jar</packaging>
 	<name>Doppelganger</name>
+	<description>Provides custom, summonable mobs that are reminiscent of the built-in golem types.</description>
+	<url>https://github.com/totemo/Doppelganger</url>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
-
-    <distributionManagement>
-        <repository>
-            <id></id>
-            <name></name>
-            <url></url>
-        </repository>
-        <snapshotRepository>
-            <id></id>
-            <name></name>
-            <url></url>
-        </snapshotRepository>
-    </distributionManagement>
-
-	<pluginRepositories>
-		<pluginRepository>
-			<id>bukkit-plugins</id>
-			<url>http://repo.bukkit.org/content/groups/public/</url>
-		</pluginRepository>
-	</pluginRepositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.bukkit</groupId>
 			<artifactId>bukkit</artifactId>
-			<version>1.5.2-R0.1</version>
+			<version>1.9-R0.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 	<repositories>
 		<repository>
-			<id>bukkit-repo</id>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-			<releases>
-				<enabled>true</enabled>
-			</releases>
-			<url>http://repo.bukkit.org/content/groups/public/</url>
+			<id>spigot-repo</id>
+			<url>https://hub.spigotmc.org/nexus/content/groups/public</url>
 		</repository>
 	</repositories>
 	<build>
+		<defaultGoal>clean package</defaultGoal>
 		<sourceDirectory>${basedir}/src</sourceDirectory>
 		<resources>
 			<resource>
@@ -62,7 +39,6 @@
 				</includes>
 			</resource>
 		</resources>
-		<defaultGoal>clean package</defaultGoal>
 		<pluginManagement>
 			<plugins>
 				<plugin>