INITIAL 1.8 SPIGOT UPDATE

1.7 users beware! Also, lots of TODOs.
DenizenScript · Nov 28, 2014 · 549410a · 549410a
1 parent 0e7039a
commit 549410a
Show file tree

Hide file tree

Showing 31 changed files with 143 additions and 95 deletions.
diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <craftbukkit.version>1.7.10-R0.1-SNAPSHOT</craftbukkit.version>
+        <craftbukkit.version>1.8-R0.1-SNAPSHOT</craftbukkit.version>
         <json.version>20090211</json.version>
         <citizens.version>2.0.13-SNAPSHOT</citizens.version>
         <build.number>Unknown</build.number>

diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java
@@ -155,7 +155,7 @@ public NotableManager notableManager() {
     @Override
     public void onEnable() {
         try {
-            net.minecraft.server.v1_7_R4.Block.getById(0);
+            net.minecraft.server.v1_8_R1.Block.getById(0);
         }
         catch (NoClassDefFoundError e) {
             getLogger().warning("-------------------------------------");

diff --git a/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java b/src/main/java/net/aufdemrand/denizen/events/bukkit/ReplaceableTagEvent.java
@@ -7,7 +7,7 @@
 import net.aufdemrand.denizen.tags.Attribute;
 
 import net.aufdemrand.denizen.tags.TagManager;
-import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/FishingTrait.java
@@ -6,10 +6,10 @@
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
 import net.citizensnpcs.util.PlayerAnimation;
-import net.minecraft.server.v1_7_R4.*;
+import net.minecraft.server.v1_8_R1.*;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.util.Vector;
@@ -20,9 +20,30 @@
 
 public class FishingTrait extends Trait {
 
-    private static final List junkResults = Arrays.asList(new PossibleFishingResult[]{(new PossibleFishingResult(new ItemStack(Items.LEATHER_BOOTS), 10)).a(0.9F), new PossibleFishingResult(new ItemStack(Items.LEATHER), 10), new PossibleFishingResult(new ItemStack(Items.BONE), 10), new PossibleFishingResult(new ItemStack(Items.POTION), 10), new PossibleFishingResult(new ItemStack(Items.STRING), 5), (new PossibleFishingResult(new ItemStack(Items.FISHING_ROD), 2)).a(0.9F), new PossibleFishingResult(new ItemStack(Items.BOWL), 10), new PossibleFishingResult(new ItemStack(Items.STICK), 5), new PossibleFishingResult(new ItemStack(Items.INK_SACK, 10, 0), 1), new PossibleFishingResult(new ItemStack(Blocks.TRIPWIRE_SOURCE), 10), new PossibleFishingResult(new ItemStack(Items.ROTTEN_FLESH), 10)});
-    private static final List treasureResults = Arrays.asList(new PossibleFishingResult[] { new PossibleFishingResult(new ItemStack(Blocks.WATER_LILY), 1), new PossibleFishingResult(new ItemStack(Items.NAME_TAG), 1), new PossibleFishingResult(new ItemStack(Items.SADDLE), 1), (new PossibleFishingResult(new ItemStack(Items.BOW), 1)).a(0.25F).a(), (new PossibleFishingResult(new ItemStack(Items.FISHING_ROD), 1)).a(0.25F).a(), (new PossibleFishingResult(new ItemStack(Items.BOOK), 1)).a()});
-    private static final List fishResults = Arrays.asList(new PossibleFishingResult[] { new PossibleFishingResult(new ItemStack(Items.RAW_FISH, 1, EnumFish.COD.a()), 60), new PossibleFishingResult(new ItemStack(Items.RAW_FISH, 1, EnumFish.SALMON.a()), 25), new PossibleFishingResult(new ItemStack(Items.RAW_FISH, 1, EnumFish.CLOWNFISH.a()), 2), new PossibleFishingResult(new ItemStack(Items.RAW_FISH, 1, EnumFish.PUFFERFISH.a()), 13)});
+    private static final List junkResults = Arrays.asList(new PossibleFishingResult[]{(
+            new PossibleFishingResult(new ItemStack(Items.LEATHER_BOOTS), 10)).a(0.9F),
+            new PossibleFishingResult(new ItemStack(Items.LEATHER), 10),
+            new PossibleFishingResult(new ItemStack(Items.BONE), 10),
+            new PossibleFishingResult(new ItemStack(Items.POTION), 10),
+            new PossibleFishingResult(new ItemStack(Items.STRING), 5),
+            (new PossibleFishingResult(new ItemStack(Items.FISHING_ROD), 2)).a(0.9F),
+            new PossibleFishingResult(new ItemStack(Items.BOWL), 10),
+            new PossibleFishingResult(new ItemStack(Items.STICK), 5),
+            new PossibleFishingResult(new ItemStack(Items.DYE, 10, 0), 1),
+            new PossibleFishingResult(new ItemStack(Blocks.TRIPWIRE_HOOK), 10),
+            new PossibleFishingResult(new ItemStack(Items.ROTTEN_FLESH), 10)});
+    private static final List treasureResults = Arrays.asList(new PossibleFishingResult[] {
+            new PossibleFishingResult(new ItemStack(Blocks.WATERLILY), 1),
+            new PossibleFishingResult(new ItemStack(Items.NAME_TAG), 1),
+            new PossibleFishingResult(new ItemStack(Items.SADDLE), 1),
+            (new PossibleFishingResult(new ItemStack(Items.BOW), 1)).a(0.25F).a(),
+            (new PossibleFishingResult(new ItemStack(Items.FISHING_ROD), 1)).a(0.25F).a(),
+            (new PossibleFishingResult(new ItemStack(Items.BOOK), 1)).a()});
+    private static final List fishResults = Arrays.asList(new PossibleFishingResult[] {
+            new PossibleFishingResult(new ItemStack(Items.FISH, 1, EnumFish.COD.a()), 60),
+            new PossibleFishingResult(new ItemStack(Items.FISH, 1, EnumFish.SALMON.a()), 25),
+            new PossibleFishingResult(new ItemStack(Items.FISH, 1, EnumFish.CLOWNFISH.a()), 2),
+            new PossibleFishingResult(new ItemStack(Items.FISH, 1, EnumFish.PUFFERFISH.a()), 13)});
 
     public static enum CatchType { NONE, DEFAULT, JUNK, TREASURE, FISH }
 
@@ -236,8 +257,13 @@ private void reel() {
     public ItemStack getFishingResult() {
         if (catchType == CatchType.DEFAULT) {
             float f = nmsworld.random.nextFloat();
+            /*
             int i = EnchantmentManager.getLuckEnchantmentLevel(fishHook.owner);
             int j = EnchantmentManager.getLureEnchantmentLevel(fishHook.owner);
+            */
+            // TODO: 1.8 UPDATE
+            int i = 0;
+            int j = 0;
             float f1 = 0.1F - (float) i * 0.025F - (float) j * 0.01F;
             float f2 = 0.05F + (float) i * 0.01F - (float) j * 0.01F;
 

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/ParticlesTrait.java
@@ -10,7 +10,7 @@
 import org.bukkit.EntityEffect;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftWolf;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftWolf;
 import org.bukkit.entity.Wolf;
 
 public class ParticlesTrait extends Trait {

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/PushableTrait.java
@@ -6,10 +6,10 @@
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_7_R4.EntityLiving;
+import net.minecraft.server.v1_8_R1.EntityLiving;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java b/src/main/java/net/aufdemrand/denizen/npc/traits/SneakingTrait.java
@@ -3,9 +3,9 @@
 import net.aufdemrand.denizen.utilities.DenizenAPI;
 import net.citizensnpcs.api.persistence.Persist;
 import net.citizensnpcs.api.trait.Trait;
-import net.minecraft.server.v1_7_R4.EntityHuman;
+import net.minecraft.server.v1_8_R1.EntityHuman;
 
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.Listener;
 

diff --git a/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java b/src/main/java/net/aufdemrand/denizen/objects/ObjectFetcher.java
@@ -9,7 +9,7 @@
 import net.aufdemrand.denizen.scripts.queues.ScriptQueue;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import net.aufdemrand.denizen.utilities.depends.Depends;
-import net.minecraft.util.org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  *

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dChunk.java b/src/main/java/net/aufdemrand/denizen/objects/dChunk.java
@@ -7,7 +7,7 @@
 import net.aufdemrand.denizen.utilities.depends.Depends;
 import net.citizensnpcs.api.CitizensAPI;
 import org.bukkit.*;
-import org.bukkit.craftbukkit.v1_7_R4.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R1.CraftChunk;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -12,14 +12,16 @@
 import net.aufdemrand.denizen.utilities.depends.Depends;
 import net.aufdemrand.denizen.utilities.nbt.CustomNBT;
 import net.aufdemrand.denizencore.utilities.CoreUtilities;
-import net.minecraft.server.v1_7_R4.EntityHuman;
-import net.minecraft.server.v1_7_R4.EntityLiving;
+import net.minecraft.server.v1_8_R1.*;
 import org.bukkit.*;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftAnimals;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
+import org.bukkit.Material;
+import org.bukkit.World;
+import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftAnimals;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftCreature;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.*;
+import org.bukkit.entity.Entity;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
@@ -29,6 +31,7 @@
 import org.bukkit.util.Vector;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -121,12 +124,15 @@ else if (entityGroup.matches("P@")) {
 
             // Assume entity
             else {
-                if (aH.matchesInteger(m.group(2))) {
-                    int entityID = Integer.valueOf(m.group(2));
+                try {
+                    UUID entityID = UUID.fromString(m.group(2));
                     Entity entity = getEntityForID(entityID);
                     if (entity != null) return new dEntity(entity);
                     return null;
                 }
+                catch (Exception ex) {
+                    ex.getCause(); // DO NOTHING
+                }
 
 //                else if (isSaved(m.group(2)))
 //                    return getSaved(m.group(2));
@@ -175,9 +181,10 @@ else if (entityGroup.matches("P@")) {
         return null;
     }
 
-    public static Entity getEntityForID(int ID) {
+    @Deprecated
+    public static Entity getEntityForID(UUID ID) {
         for (World world : Bukkit.getWorlds()) {
-            net.minecraft.server.v1_7_R4.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(ID);
+            net.minecraft.server.v1_8_R1.Entity nmsEntity = ((CraftWorld) world).getHandle().getEntity(ID);
 
             // Make sure the nmsEntity is valid, to prevent unpleasant errors
             if (nmsEntity != null) {
@@ -2161,7 +2168,7 @@ else if (isLivingEntity()) {
             dList list = dList.valueOf(value.asString());
             if (list.size() > 1) {
                 if (list.get(0).equalsIgnoreCase("true"))
-                    ((CraftAnimals)getLivingEntity()).getHandle().f((EntityHuman) null);
+                    ((CraftAnimals)getLivingEntity()).getHandle().a((EntityHuman) null); // TODO: 1.8 UPDATE - is this right?
                 else
                     ((CraftAnimals)getLivingEntity()).getHandle().cf();
             }

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dInventory.java b/src/main/java/net/aufdemrand/denizen/objects/dInventory.java
@@ -21,7 +21,7 @@
 import org.bukkit.block.Chest;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.block.Furnace;
-import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory;
+import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftInventory;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryType;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dItem.java b/src/main/java/net/aufdemrand/denizen/objects/dItem.java
@@ -12,7 +12,7 @@
 import net.aufdemrand.denizen.tags.Attribute;
 import net.aufdemrand.denizen.utilities.debugging.dB;
 import org.bukkit.*;
-import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Item;
 import org.bukkit.inventory.ItemStack;
@@ -720,7 +720,7 @@ public String getAttribute(Attribute attribute) {
         // {'text':'Item','color':'white','hoverEvent':{'action':'show_item','value':'{<player.item_in_hand.json>}'}}]}"
         // -->
         if (attribute.startsWith("json")) {
-            String JSON = CraftItemStack.asNMSCopy(item).E().getChatModifier().toString();
+            String JSON = CraftItemStack.asNMSCopy(item).C().getChatModifier().toString(); // TODO: 1.8 UPDATE: Is this correct?
             return new Element(JSON.substring(176, JSON.length() - 154))
                     .getAttribute(attribute.fulfill(1));
         }

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dNPC.java b/src/main/java/net/aufdemrand/denizen/objects/dNPC.java
@@ -32,10 +32,10 @@
 import net.citizensnpcs.trait.Poses;
 import net.citizensnpcs.util.Anchor;
 import net.citizensnpcs.util.Pose;
-import net.minecraft.server.v1_7_R4.EntityLiving;
+import net.minecraft.server.v1_8_R1.EntityLiving;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.ItemFrame;
@@ -1066,14 +1066,17 @@ public void adjust(Mechanism mechanism) {
             switch (getEntity().getType()) {
                 case DROPPED_ITEM:
                     ((org.bukkit.entity.Item) getEntity()).getItemStack().setType(mat);
-                    ((ItemController.ItemNPC) getEntity()).setType(mat, data);
+                    //((ItemController.ItemNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.8 UPDATE
                     break;
                 case ITEM_FRAME:
                     ((ItemFrame) getEntity()).getItem().setType(mat);
-                    ((ItemFrameController.ItemFrameNPC) getEntity()).setType(mat, data);
+                    //((ItemFrameController.ItemFrameNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.8 UPDATE
                     break;
                 case FALLING_BLOCK:
-                    ((FallingBlockController.FallingBlockNPC) getEntity()).setType(mat, data);
+                    //((FallingBlockController.FallingBlockNPC) getEntity()).setType(mat, data);
+                    // TODO: 1.8 UPDATE
                     break;
                 default:
                     dB.echoError("NPC is the not an item type!");

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java b/src/main/java/net/aufdemrand/denizen/objects/dPlayer.java
@@ -17,10 +17,10 @@
 import net.aufdemrand.denizen.utilities.packets.PlayerBars;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.npc.NPC;
-import net.minecraft.server.v1_7_R4.PacketPlayOutGameStateChange;
+import net.minecraft.server.v1_8_R1.PacketPlayOutGameStateChange;
 import org.bukkit.*;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

diff --git a/src/main/java/net/aufdemrand/denizen/objects/dWorld.java b/src/main/java/net/aufdemrand/denizen/objects/dWorld.java
@@ -12,7 +12,7 @@
 import org.bukkit.Chunk;
 import org.bukkit.Difficulty;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_7_R4.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R1.CraftChunk;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 

diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/AnimateChestCommand.java
@@ -2,16 +2,16 @@
 
 import net.aufdemrand.denizen.BukkitScriptEntryData;
 import net.aufdemrand.denizen.objects.*;
-import net.minecraft.server.v1_7_R4.PacketPlayOutBlockAction;
+import net.minecraft.server.v1_8_R1.PacketPlayOutBlockAction;
 import org.bukkit.Sound;
 
 import net.aufdemrand.denizencore.exceptions.CommandExecutionException;
 import net.aufdemrand.denizencore.exceptions.InvalidArgumentsException;
 import net.aufdemrand.denizen.scripts.ScriptEntry;
 import net.aufdemrand.denizen.scripts.commands.AbstractCommand;
 import net.aufdemrand.denizen.utilities.debugging.dB;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
-import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
+import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -77,6 +77,7 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                                           + aH.debugObj("players", players.toString()));
 
         switch (ChestAction.valueOf(action.asString().toUpperCase())) {
+            /*
             case OPEN:
                 for (dPlayer player: players) {
                     if (sound.asBoolean()) player.getPlayerEntity().playSound(location, Sound.CHEST_OPEN, 1, 1);
@@ -93,7 +94,8 @@ public void execute(ScriptEntry scriptEntry) throws CommandExecutionException {
                             new PacketPlayOutBlockAction(location.getBlockX(), location.getBlockY(), location.getBlockZ(),
                             ((CraftWorld)location.getWorld()).getHandle().getType(location.getBlockX(), location.getBlockY(), location.getBlockZ()), 1, 0));
                 }
-                break;
+                break;*/
+            // TODO: 1.8 UPDATE
         }
     }
 }
diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/ModifyBlockCommand.java
@@ -15,7 +15,7 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
+import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
 import org.bukkit.entity.EntityType;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -188,18 +188,24 @@ boolean preSetup(List<dObject> locations) {
             return false;
         // Freeze the first world in the list.
         CraftWorld craftWorld = (CraftWorld)((dLocation)locations.get(0)).getWorld();
+        /*
         boolean was_static = craftWorld.getHandle().isStatic;
         if (no_physics)
             craftWorld.getHandle().isStatic = true;
         return was_static;
+            */
+        // TODO: 1.8 UPDATE
+        return false;
     }
 
     void postComplete(Location loc, boolean was_static) {
         // Unfreeze the first world in the list.
         CraftWorld craftWorld = (CraftWorld)loc.getWorld();
+        /*
         if (no_physics)
             craftWorld.getHandle().isStatic = was_static;
-        no_physics = false;
+        no_physics = false;*/
+        // TODO: 1.8 UPDATE
     }
 
     void handleLocation(dLocation location, int index, List<dMaterial> materialList, boolean doPhysics,