Update to 1.11

Libter · Nov 19, 2016 · 0b85939 · 0b85939
1 parent 39152a8
commit 0b85939
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 20 deletions.
diff --git a/src/com/gmail/zariust/common/CommonEntity.java b/src/com/gmail/zariust/common/CommonEntity.java
@@ -18,7 +18,6 @@
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.bukkit.Material;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Boat;
@@ -29,14 +28,14 @@
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.Fish;
 import org.bukkit.entity.Minecart;
-import org.bukkit.entity.PoweredMinecart;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Snowball;
-import org.bukkit.entity.StorageMinecart;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.ThrownExpBottle;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.entity.WitherSkull;
+import org.bukkit.entity.minecart.PoweredMinecart;
+import org.bukkit.entity.minecart.StorageMinecart;
 
 //import static org.bukkit.Material.*;
 

diff --git a/src/com/gmail/zariust/common/CommonMaterial.java b/src/com/gmail/zariust/common/CommonMaterial.java
@@ -272,11 +272,11 @@ public static Material matchMaterial(String mat) {
 
     // Colors
     public static int getWoolColor(DyeColor color) {
-        return color.getData();
+        return color.getWoolData();
     }
 
     public static int getDyeColor(DyeColor color) {
-        return 0xF - color.getData();
+        return 0xF - color.getDyeData();
     }
 
     @SuppressWarnings("incomplete-switch")
@@ -425,7 +425,7 @@ public static String getBlockOrItemData(Material mat, int data) {
             case STAINED_GLASS:
             case STAINED_GLASS_PANE:
             case STAINED_CLAY:
-                return DyeColor.getByData((byte) data).toString();
+                return DyeColor.getByDyeData((byte) data).toString();
             case SMOOTH_BRICK:
                 switch (data) {
                 case 0:

diff --git a/src/com/gmail/zariust/odspecialevents/DyeEvent.java b/src/com/gmail/zariust/odspecialevents/DyeEvent.java
@@ -45,11 +45,11 @@ public void executeAt(OccurredEvent event) {
             if (agent instanceof PlayerSubject) {
                 ToolAgent tool = ((PlayerSubject) agent).getTool();
                 if (tool.getMaterial() == Material.INK_SACK)
-                    dye = DyeColor.getByData((byte) (0xF - tool.getData()
+                    dye = DyeColor.getByDyeData((byte) (0xF - tool.getData()
                             .getData()));
             }
             if (colour == null)
-                dye = DyeColor.getByData((byte) event.getRandom(16));
+                dye = DyeColor.getByDyeData((byte) event.getRandom(16));
         } else
             dye = colour;
         CreatureSubject target = (CreatureSubject) event.getTarget();

diff --git a/src/com/gmail/zariust/otherdrops/PlayerWrapper.java b/src/com/gmail/zariust/otherdrops/PlayerWrapper.java
@@ -1644,4 +1644,19 @@ public void setPortalCooldown(int i) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
 
+    @Override
+    public Set<String> getScoreboardTags() {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean addScoreboardTag(String string) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
+    @Override
+    public boolean removeScoreboardTag(String string) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
+
 }
diff --git a/src/com/gmail/zariust/otherdrops/data/ItemData.java b/src/com/gmail/zariust/otherdrops/data/ItemData.java
@@ -97,7 +97,7 @@ private String get(Material mat) {
         case COAL:
             return CoalType.getByData((byte) data).toString();
         case INK_SACK:
-            DyeColor dyeColorData = DyeColor.getByData((byte) (0xF - data));
+            DyeColor dyeColorData = DyeColor.getByDyeData((byte) (0xF - data));
             if (dyeColorData != null)
                 return dyeColorData.toString();
             break;

diff --git a/src/com/gmail/zariust/otherdrops/data/RangeData.java b/src/com/gmail/zariust/otherdrops/data/RangeData.java
@@ -84,7 +84,7 @@ public void setOn(Entity mob, Player witness) {
                 ((Sheep) mob).setSheared(true);
             val -= 32;
             if (val > 0)
-                ((Sheep) mob).setColor(DyeColor.getByData((byte) (val - 1)));
+                ((Sheep) mob).setColor(DyeColor.getByDyeData((byte) (val - 1)));
             break;
         case SLIME:
             if (val > 0)

diff --git a/src/com/gmail/zariust/otherdrops/drop/ContentsDrop.java b/src/com/gmail/zariust/otherdrops/drop/ContentsDrop.java
@@ -26,7 +26,7 @@
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.StorageMinecart;
+import org.bukkit.entity.minecart.StorageMinecart;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 

diff --git a/src/com/gmail/zariust/otherdrops/drop/VehicleDrop.java b/src/com/gmail/zariust/otherdrops/drop/VehicleDrop.java
@@ -30,8 +30,8 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Painting;
-import org.bukkit.entity.PoweredMinecart;
-import org.bukkit.entity.StorageMinecart;
+import org.bukkit.entity.minecart.PoweredMinecart;
+import org.bukkit.entity.minecart.StorageMinecart;
 
 public class VehicleDrop extends DropType {
     private Material vessel;

diff --git a/src/com/gmail/zariust/otherdrops/event/OccurredEvent.java b/src/com/gmail/zariust/otherdrops/event/OccurredEvent.java
@@ -32,7 +32,7 @@
 import org.bukkit.entity.EnderDragonPart;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Explosive;
-import org.bukkit.entity.FallingSand;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Fireball;
 import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.LivingEntity;
@@ -885,8 +885,8 @@ else if (what instanceof Vehicle)
             return new VehicleTarget((Vehicle) what);
         else if (what instanceof Painting)
             return new VehicleTarget((Painting) what);
-        else if (what instanceof FallingSand)
-            return new BlockTarget((FallingSand) what);
+        else if (what instanceof FallingBlock)
+            return new BlockTarget((FallingBlock) what);
         else if (what instanceof Fireball)
             return null; // TODO: do we need to do anything here? This is a
                          // fireball dying, getting hurt or being interacted

diff --git a/src/com/gmail/zariust/otherdrops/subject/BlockTarget.java b/src/com/gmail/zariust/otherdrops/subject/BlockTarget.java
@@ -25,7 +25,7 @@
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Chest;
 import org.bukkit.block.CommandBlock;
-import org.bukkit.entity.FallingSand;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.inventory.InventoryHolder;
 
 import com.gmail.zariust.common.CommonMaterial;
@@ -87,7 +87,7 @@ public BlockTarget(Material mat, Data d) { // The Rome constructor
         data = d;
     }
 
-    public BlockTarget(FallingSand what) {
+    public BlockTarget(FallingBlock what) {
         // TODO: Get the type of falling block rather than assuming it's sand
         this(Material.SAND, 0);
     }

diff --git a/src/com/gmail/zariust/otherdrops/subject/VehicleTarget.java b/src/com/gmail/zariust/otherdrops/subject/VehicleTarget.java
@@ -33,8 +33,8 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Painting;
-import org.bukkit.entity.PoweredMinecart;
-import org.bukkit.entity.StorageMinecart;
+import org.bukkit.entity.minecart.PoweredMinecart;
+import org.bukkit.entity.minecart.StorageMinecart;
 import org.bukkit.entity.Vehicle;
 
 public class VehicleTarget implements Target {