diff --git a/pom.xml b/pom.xml index b86cf8ac9b..18e390b2da 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 1.7.10-R0.1-SNAPSHOT + 1.8-R0.1-SNAPSHOT 20090211 2.0.13-SNAPSHOT Unknown diff --git a/src/main/java/net/aufdemrand/denizen/Denizen.java b/src/main/java/net/aufdemrand/denizen/Denizen.java index 94360f086a..9df28a16d9 100644 --- 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 index b5b5cba0f7..3b6429117a 100644 --- 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 index 1850cd0b1b..e4679e654b 100644 --- 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 index 797ec83c7b..b81893ca97 100644 --- 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 index 87538dbacc..6e1636f3fc 100644 --- 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 index d8bd153be5..6449959173 100644 --- 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 index 05dbabaa0a..e001b3a1fc 100644 --- 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 index 78231c56d7..11065aec59 100644 --- 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 index 8a0d57a17e..a4d779f4f9 100644 --- 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 index e9f00abadc..385bae6d89 100644 --- 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 index 7e781133be..8a930b7d27 100644 --- 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':'{}'}}]}" // --> 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 index eeee5cacee..322378c5e8 100644 --- 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 index a89cffe83f..852993a008 100644 --- 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 index 5eca2ba097..c165f1fe72 100644 --- 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 index 39a89924c3..65a5f85f1f 100644 --- 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,7 +2,7 @@ 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; @@ -10,8 +10,8 @@ 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 index d74b232a09..93c91d3b50 100644 --- 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 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 materialList, boolean doPhysics, diff --git a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java index 0473e0df14..95b2f13a16 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/commands/world/SwitchCommand.java @@ -14,13 +14,13 @@ import net.aufdemrand.denizen.utilities.debugging.dB; import net.citizensnpcs.api.CitizensAPI; import net.citizensnpcs.api.npc.NPC; -import net.minecraft.server.v1_7_R4.Block; +import net.minecraft.server.v1_8_R1.Block; import org.bukkit.Bukkit; 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_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 java.util.Map; @@ -155,12 +155,15 @@ else if (Depends.citizens != null) { else { // TODO: Rewrite the below code to not use freakin' NMS! + /* Block.getById(interactLocation.getBlock().getType().getId()) .interact(((CraftWorld)world).getHandle(), interactLocation.getBlockX(), interactLocation.getBlockY(), interactLocation.getBlockZ(), craftPlayer != null ? craftPlayer.getHandle(): null, 0, 0f, 0f, 0f); + */ + // TODO: 1.8 UPDATE } dB.echoDebug(scriptEntry, "Switched " + interactLocation.getBlock().getType().toString() + "! Current state now: " + diff --git a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java index ea73e30fd8..b8ec0b596d 100644 --- a/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java +++ b/src/main/java/net/aufdemrand/denizen/scripts/containers/core/CommandScriptHelper.java @@ -6,8 +6,8 @@ import org.bukkit.Server; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; -import org.bukkit.craftbukkit.v1_7_R4.command.VanillaCommandWrapper; -import org.bukkit.craftbukkit.v1_7_R4.help.CommandAliasHelpTopic; +import org.bukkit.craftbukkit.v1_8_R1.command.VanillaCommandWrapper; +import org.bukkit.craftbukkit.v1_8_R1.help.CommandAliasHelpTopic; import org.bukkit.event.Listener; import org.bukkit.help.HelpMap; import org.bukkit.help.HelpTopic; diff --git a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java index bc9828bd4b..608fa01d68 100644 --- a/src/main/java/net/aufdemrand/denizen/tags/TagManager.java +++ b/src/main/java/net/aufdemrand/denizen/tags/TagManager.java @@ -10,7 +10,6 @@ import net.aufdemrand.denizen.utilities.depends.Depends; import net.aufdemrand.denizencore.tags.TagContext; import net.aufdemrand.denizencore.utilities.CoreUtilities; -import net.minecraft.util.org.apache.commons.lang3.StringUtils; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java b/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java index 7bc0fd9e7b..e44916ca40 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/DenizenCommandSender.java @@ -4,7 +4,7 @@ import org.bukkit.Server; import org.bukkit.conversations.Conversation; import org.bukkit.conversations.ConversationAbandonedEvent; -import org.bukkit.craftbukkit.v1_7_R4.command.ColouredConsoleSender; +import org.bukkit.craftbukkit.v1_8_R1.command.ColouredConsoleSender; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachmentInfo; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java index 0d878ba95b..bf92e95a56 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/entity/CraftFakeArrow.java @@ -1,10 +1,10 @@ package net.aufdemrand.denizen.utilities.entity; -import net.minecraft.server.v1_7_R4.EntityArrow; +import net.minecraft.server.v1_8_R1.EntityArrow; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.CraftServer; -import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow; +import org.bukkit.craftbukkit.v1_8_R1.CraftServer; +import org.bukkit.craftbukkit.v1_8_R1.CraftWorld; +import org.bukkit.craftbukkit.v1_8_R1.entity.CraftArrow; import org.bukkit.entity.Arrow; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Vehicle; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/FakeArrowEntity.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/FakeArrowEntity.java index 078fe147aa..d45695de93 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/entity/FakeArrowEntity.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/entity/FakeArrowEntity.java @@ -1,10 +1,10 @@ package net.aufdemrand.denizen.utilities.entity; -import net.minecraft.server.v1_7_R4.EntityArrow; +import net.minecraft.server.v1_8_R1.EntityArrow; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.CraftServer; -import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_8_R1.CraftServer; +import org.bukkit.craftbukkit.v1_8_R1.CraftWorld; public class FakeArrowEntity extends EntityArrow { diff --git a/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java b/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java index 31a2ba7070..d708710786 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/entity/Rotation.java @@ -1,9 +1,9 @@ package net.aufdemrand.denizen.utilities.entity; -import net.minecraft.server.v1_7_R4.EntityHuman; -import net.minecraft.server.v1_7_R4.EntityLiving; +import net.minecraft.server.v1_8_R1.EntityHuman; +import net.minecraft.server.v1_8_R1.EntityLiving; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R1.entity.CraftEntity; import org.bukkit.entity.EnderDragon; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; @@ -47,7 +47,7 @@ else if (entity instanceof LivingEntity) { } else { - net.minecraft.server.v1_7_R4.Entity handle = ((CraftEntity) entity).getHandle(); + net.minecraft.server.v1_8_R1.Entity handle = ((CraftEntity) entity).getHandle(); handle.yaw = yaw; handle.pitch = pitch; } @@ -55,7 +55,7 @@ else if (entity instanceof LivingEntity) { // Taken from C2 NMS class for less dependency on C2 private static void look(Entity entity, float yaw, float pitch) { - net.minecraft.server.v1_7_R4.Entity handle = !(entity instanceof CraftEntity)?null:((CraftEntity)entity).getHandle(); + net.minecraft.server.v1_8_R1.Entity handle = !(entity instanceof CraftEntity)?null:((CraftEntity)entity).getHandle(); if (handle != null) { handle.yaw = yaw; if(entity instanceof EntityLiving) { @@ -66,10 +66,12 @@ private static void look(Entity entity, float yaw, float pitch) { while(yaw >= 180.0F) { yaw -= 360.0F; } + /* livingHandle.aO = yaw; if(!(handle instanceof EntityHuman)) livingHandle.aM = yaw; - livingHandle.aP = yaw; + livingHandle.aP = yaw;*/ + // TODO: 1.8 UPDATE } handle.pitch = pitch; } diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java index 1e690ad526..f2ddab533d 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/nbt/CustomNBT.java @@ -1,9 +1,9 @@ package net.aufdemrand.denizen.utilities.nbt; -import net.minecraft.server.v1_7_R4.EntityLiving; -import net.minecraft.server.v1_7_R4.NBTTagCompound; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; +import net.minecraft.server.v1_8_R1.EntityLiving; +import net.minecraft.server.v1_8_R1.NBTTagCompound; +import org.bukkit.craftbukkit.v1_8_R1.entity.CraftEntity; +import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.inventory.ItemStack; @@ -22,7 +22,7 @@ public static MapOfEnchantments getEnchantments(ItemStack item) { public static boolean hasCustomNBT(ItemStack item, String key) { if (item == null) return false; NBTTagCompound tag; - net.minecraft.server.v1_7_R4.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_8_R1.ItemStack cis = CraftItemStack.asNMSCopy(item); if (!cis.hasTag()) return false; tag = cis.getTag(); // dB.echoDebug(tag.toString()); @@ -32,7 +32,7 @@ public static boolean hasCustomNBT(ItemStack item, String key) { public static String getCustomNBT(ItemStack item, String key) { if (item == null) return null; - net.minecraft.server.v1_7_R4.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_8_R1.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag; if (!cis.hasTag()) cis.setTag(new NBTTagCompound()); @@ -45,7 +45,7 @@ public static String getCustomNBT(ItemStack item, String key) { public static ItemStack removeCustomNBT(ItemStack item, String key) { if (item == null) return null; - net.minecraft.server.v1_7_R4.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_8_R1.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag; if (!cis.hasTag()) cis.setTag(new NBTTagCompound()); @@ -57,7 +57,7 @@ public static ItemStack removeCustomNBT(ItemStack item, String key) { public static ItemStack addCustomNBT(ItemStack item, String key, String value) { if (item == null) return null; - net.minecraft.server.v1_7_R4.ItemStack cis = CraftItemStack.asNMSCopy(item); + net.minecraft.server.v1_8_R1.ItemStack cis = CraftItemStack.asNMSCopy(item); NBTTagCompound tag = null; // Do stuff with tag if (!cis.hasTag()) @@ -70,7 +70,7 @@ public static ItemStack addCustomNBT(ItemStack item, String key, String value) { public static LivingEntity addCustomNBT(LivingEntity entity, String key, String value) { if (entity == null) return null; Entity bukkitEntity = entity; - net.minecraft.server.v1_7_R4.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_8_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -87,7 +87,7 @@ public static LivingEntity addCustomNBT(LivingEntity entity, String key, String public static LivingEntity removeCustomNBT(LivingEntity entity, String key) { if (entity == null) return null; Entity bukkitEntity = entity; - net.minecraft.server.v1_7_R4.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_8_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -104,7 +104,7 @@ public static LivingEntity removeCustomNBT(LivingEntity entity, String key) { public static boolean hasCustomNBT(LivingEntity entity, String key) { if (entity == null) return false; Entity bukkitEntity = entity; - net.minecraft.server.v1_7_R4.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_8_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag @@ -117,7 +117,7 @@ public static boolean hasCustomNBT(LivingEntity entity, String key) { public static String getCustomNBT(LivingEntity entity, String key) { if (entity == null) return null; Entity bukkitEntity = entity; - net.minecraft.server.v1_7_R4.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); + net.minecraft.server.v1_8_R1.Entity nmsEntity = ((CraftEntity) bukkitEntity).getHandle(); NBTTagCompound tag = new NBTTagCompound(); // Writes the entity's NBT data to tag diff --git a/src/main/java/net/aufdemrand/denizen/utilities/nbt/ImprovedOfflinePlayer.java b/src/main/java/net/aufdemrand/denizen/utilities/nbt/ImprovedOfflinePlayer.java index 6e1baa12b0..73c54b8471 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/nbt/ImprovedOfflinePlayer.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/nbt/ImprovedOfflinePlayer.java @@ -2,12 +2,12 @@ // NMS/CB imports start import net.aufdemrand.denizen.scripts.containers.core.InventoryScriptHelper; -import net.minecraft.server.v1_7_R4.*; -import net.minecraft.server.v1_7_R4.PlayerInventory; +import net.minecraft.server.v1_8_R1.*; +import net.minecraft.server.v1_8_R1.PlayerInventory; import org.bukkit.*; import org.bukkit.World; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventory; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryPlayer; +import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftInventory; +import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftInventoryPlayer; // NMS/CB imports end import java.io.File; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/BossHealthBar.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/BossHealthBar.java index 645b0f1e8c..4533b69c52 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/BossHealthBar.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/BossHealthBar.java @@ -1,11 +1,11 @@ package net.aufdemrand.denizen.utilities.packets; -import net.minecraft.server.v1_7_R4.PacketPlayInClientCommand; -import net.minecraft.server.v1_7_R4.PacketPlayOutEntityDestroy; -import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata; -import net.minecraft.server.v1_7_R4.PacketPlayOutSpawnEntityLiving; -import net.minecraft.server.v1_7_R4.EnumClientCommand; -import net.minecraft.server.v1_7_R4.DataWatcher; +import net.minecraft.server.v1_8_R1.PacketPlayInClientCommand; +import net.minecraft.server.v1_8_R1.PacketPlayOutEntityDestroy; +import net.minecraft.server.v1_8_R1.PacketPlayOutEntityMetadata; +import net.minecraft.server.v1_8_R1.PacketPlayOutSpawnEntityLiving; +import net.minecraft.server.v1_8_R1.EnumClientCommand; +import net.minecraft.server.v1_8_R1.DataWatcher; import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/EntityEquipment.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/EntityEquipment.java index e946c7ef11..88427a987d 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/EntityEquipment.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/EntityEquipment.java @@ -1,8 +1,8 @@ package net.aufdemrand.denizen.utilities.packets; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.minecraft.server.v1_7_R4.PacketPlayOutEntityEquipment; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; +import net.minecraft.server.v1_8_R1.PacketPlayOutEntityEquipment; +import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java index a7164baeb6..eeeadfce9c 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/ItemChangeMessage.java @@ -2,9 +2,9 @@ import net.aufdemrand.denizen.utilities.DenizenAPI; import net.aufdemrand.denizen.utilities.debugging.dB; -import net.minecraft.server.v1_7_R4.PacketPlayOutSetSlot; +import net.minecraft.server.v1_8_R1.PacketPlayOutSetSlot; import org.bukkit.Material; -import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemStack; +import org.bukkit.craftbukkit.v1_8_R1.inventory.CraftItemStack; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java index 1d95437fba..dd9f08cfd4 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/PacketHelper.java @@ -1,8 +1,8 @@ package net.aufdemrand.denizen.utilities.packets; -import net.minecraft.server.v1_7_R4.EntityPlayer; -import net.minecraft.server.v1_7_R4.Packet; -import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer; +import net.minecraft.server.v1_8_R1.EntityPlayer; +import net.minecraft.server.v1_8_R1.Packet; +import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer; import org.bukkit.entity.Player; import java.lang.reflect.Field; diff --git a/src/main/java/net/aufdemrand/denizen/utilities/packets/PlayerBars.java b/src/main/java/net/aufdemrand/denizen/utilities/packets/PlayerBars.java index 9a90230342..a5db50e329 100644 --- a/src/main/java/net/aufdemrand/denizen/utilities/packets/PlayerBars.java +++ b/src/main/java/net/aufdemrand/denizen/utilities/packets/PlayerBars.java @@ -1,7 +1,7 @@ package net.aufdemrand.denizen.utilities.packets; -import net.minecraft.server.v1_7_R4.PacketPlayOutExperience; -import net.minecraft.server.v1_7_R4.PacketPlayOutUpdateHealth; +import net.minecraft.server.v1_8_R1.PacketPlayOutExperience; +import net.minecraft.server.v1_8_R1.PacketPlayOutUpdateHealth; import net.aufdemrand.denizen.utilities.debugging.dB; import org.bukkit.entity.Player;