Rollback to 1.10.2

ataranlen · Dec 31, 2016 · dcc74a8 · dcc74a8
1 parent 10af314
commit dcc74a8
Show file tree

Hide file tree

Showing 33 changed files with 54 additions and 50 deletions.
diff --git a/civcraft/.classpath b/civcraft/.classpath
@@ -18,9 +18,9 @@
 	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/json.jar"/>
 	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/TitleAPI-1.7.4.jar"/>
 	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/TagAPI-1.1.9.jar"/>
-	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/spigot-api-1.11.2-R0.1-SNAPSHOT-shaded.jar"/>
-	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/bukkit-1.11.2-R0.1-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/craftbukkit-1.11.2.jar"/>
-	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/CustomMobs-4.16.jar"/>
+	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/spigot-api-1.10.2-R0.1-SNAPSHOT-shaded.jar"/>
+	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/bukkit-1.10.2-R0.1-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/craftbukkit-1.10.2.jar"/>
+	<classpathentry kind="lib" path="D:/civcraftsvn/trunk/lib/CustomMobs-4.16.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/civcraft/bin/com/avrgaming/civcraft/components/ProjectileComponent.class b/civcraft/bin/com/avrgaming/civcraft/components/ProjectileComponent.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class b/civcraft/bin/com/avrgaming/civcraft/config/CivSettings.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener$1RuffianProjectile.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class b/civcraft/bin/com/avrgaming/civcraft/listener/BlockListener.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/listener/armor/ArmorType.class b/civcraft/bin/com/avrgaming/civcraft/listener/armor/ArmorType.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class b/civcraft/bin/com/avrgaming/civcraft/main/CivGlobal.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/siege/CannonProjectile.class b/civcraft/bin/com/avrgaming/civcraft/siege/CannonProjectile.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyHorseAction.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable$1buyItemAction.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class b/civcraft/bin/com/avrgaming/civcraft/structure/Stable.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/threading/tasks/StructureBlockHitEvent.class b/civcraft/bin/com/avrgaming/civcraft/threading/tasks/StructureBlockHitEvent.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/util/EntityProximity.class b/civcraft/bin/com/avrgaming/civcraft/util/EntityProximity.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/util/PlayerBlockChangeUtil.class b/civcraft/bin/com/avrgaming/civcraft/util/PlayerBlockChangeUtil.class
diff --git a/civcraft/bin/com/avrgaming/civcraft/war/WarRegen.class b/civcraft/bin/com/avrgaming/civcraft/war/WarRegen.class
diff --git a/civcraft/bin/gpl/AttributeUtil$1$1.class b/civcraft/bin/gpl/AttributeUtil$1$1.class
diff --git a/civcraft/bin/gpl/AttributeUtil$Attribute.class b/civcraft/bin/gpl/AttributeUtil$Attribute.class
diff --git a/civcraft/bin/gpl/AttributeUtil.class b/civcraft/bin/gpl/AttributeUtil.class
diff --git a/civcraft/bin/gpl/HorseModifier.class b/civcraft/bin/gpl/HorseModifier.class
diff --git a/civcraft/bin/gpl/ImprovedOfflinePlayer.class b/civcraft/bin/gpl/ImprovedOfflinePlayer.class
diff --git a/civcraft/bin/plugin.yml b/civcraft/bin/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.8.0
+version: 1.8.0-Beta3
 depend: [CustomMobs]
 
 commands:

diff --git a/civcraft/src/com/avrgaming/civcraft/components/ProjectileComponent.java b/civcraft/src/com/avrgaming/civcraft/components/ProjectileComponent.java
@@ -20,11 +20,11 @@
 
 import java.util.HashSet;
 
-import net.minecraft.server.v1_11_R1.Vec3D;
+import net.minecraft.server.v1_10_R1.Vec3D;
 
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;

diff --git a/civcraft/src/com/avrgaming/civcraft/config/CivSettings.java b/civcraft/src/com/avrgaming/civcraft/config/CivSettings.java
@@ -380,6 +380,9 @@ public static void validateFiles() {
 	public static void streamResourceToDisk(String filepath) throws IOException {
 		URL inputUrl = plugin.getClass().getResource(filepath);
 		File dest = new File(plugin.getDataFolder().getPath()+filepath);
+		if (inputUrl == null) {
+			CivLog.error("Destination is null: "+filepath);
+		}
 		FileUtils.copyURLToFile(inputUrl, dest);
 	}
 

diff --git a/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java b/civcraft/src/com/avrgaming/civcraft/listener/BlockListener.java
@@ -24,14 +24,14 @@
 import java.util.List;
 import java.util.Random;
 
-import net.minecraft.server.v1_11_R1.AttributeInstance;
-import net.minecraft.server.v1_11_R1.AxisAlignedBB;
-import net.minecraft.server.v1_11_R1.DamageSource;
-import net.minecraft.server.v1_11_R1.Entity;
-import net.minecraft.server.v1_11_R1.EntityInsentient;
-import net.minecraft.server.v1_11_R1.EntityPlayer;
-import net.minecraft.server.v1_11_R1.GenericAttributes;
-import net.minecraft.server.v1_11_R1.NBTTagCompound;
+import net.minecraft.server.v1_10_R1.AttributeInstance;
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
+import net.minecraft.server.v1_10_R1.DamageSource;
+import net.minecraft.server.v1_10_R1.Entity;
+import net.minecraft.server.v1_10_R1.EntityInsentient;
+import net.minecraft.server.v1_10_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.GenericAttributes;
+import net.minecraft.server.v1_10_R1.NBTTagCompound;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -42,9 +42,9 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
-import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Fireball;

diff --git a/civcraft/src/com/avrgaming/civcraft/siege/CannonProjectile.java b/civcraft/src/com/avrgaming/civcraft/siege/CannonProjectile.java
@@ -4,7 +4,7 @@
 import java.util.LinkedList;
 import java.util.Random;
 
-import net.minecraft.server.v1_11_R1.EntityPlayer;
+import net.minecraft.server.v1_10_R1.EntityPlayer;
 
 import org.bukkit.Color;
 import org.bukkit.FireworkEffect;

diff --git a/civcraft/src/com/avrgaming/civcraft/structure/Stable.java b/civcraft/src/com/avrgaming/civcraft/structure/Stable.java
@@ -52,6 +52,7 @@
 import com.avrgaming.civcraft.util.ItemManager;
 import com.avrgaming.civcraft.util.SimpleBlock;
 
+@SuppressWarnings("deprecation")
 public class Stable extends Structure {
 
 	public static Integer FEE_MIN = 5;

diff --git a/civcraft/src/com/avrgaming/civcraft/threading/tasks/StructureBlockHitEvent.java b/civcraft/src/com/avrgaming/civcraft/threading/tasks/StructureBlockHitEvent.java
@@ -19,7 +19,7 @@
 package com.avrgaming.civcraft.threading.tasks;
 
 import gpl.AttributeUtil;
-import net.minecraft.server.v1_11_R1.Material;
+import net.minecraft.server.v1_10_R1.Material;
 
 import org.bukkit.World;
 import org.bukkit.entity.Player;

diff --git a/civcraft/src/com/avrgaming/civcraft/util/EntityProximity.java b/civcraft/src/com/avrgaming/civcraft/util/EntityProximity.java
@@ -3,11 +3,11 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import net.minecraft.server.v1_11_R1.AxisAlignedBB;
+import net.minecraft.server.v1_10_R1.AxisAlignedBB;
 
 import org.bukkit.Location;
-import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_10_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 
 public class EntityProximity {
@@ -30,14 +30,14 @@ public static LinkedList<Entity> getNearbyEntities(Entity exempt, Location loc,
 		CraftWorld craftWorld = (CraftWorld)loc.getWorld();
 		AxisAlignedBB bb = new AxisAlignedBB(x-r, y-r, z-r, x+r, y+r, z+r);
 
-		List<net.minecraft.server.v1_11_R1.Entity> eList;
+		List<net.minecraft.server.v1_10_R1.Entity> eList;
 		if (exempt != null) {
 			 eList = craftWorld.getHandle().getEntities(((CraftEntity)exempt).getHandle(), bb);
 		} else {
 			 eList = craftWorld.getHandle().getEntities(null, bb);
 		}
 
-		for (net.minecraft.server.v1_11_R1.Entity e : eList) {
+		for (net.minecraft.server.v1_10_R1.Entity e : eList) {
 
 
 			if (filter == null || (filter.isInstance(e))) {

diff --git a/civcraft/src/com/avrgaming/civcraft/util/PlayerBlockChangeUtil.java b/civcraft/src/com/avrgaming/civcraft/util/PlayerBlockChangeUtil.java
@@ -4,7 +4,7 @@
 import java.util.LinkedList;
 import java.util.TreeMap;
 
-import net.minecraft.server.v1_11_R1.PacketPlayOutMultiBlockChange;
+import net.minecraft.server.v1_10_R1.PacketPlayOutMultiBlockChange;
 
 import org.bukkit.entity.Player;
 

diff --git a/civcraft/src/gpl/AttributeUtil.java b/civcraft/src/gpl/AttributeUtil.java
@@ -10,14 +10,14 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.minecraft.server.v1_11_R1.NBTBase;
-import net.minecraft.server.v1_11_R1.NBTTagCompound;
-import net.minecraft.server.v1_11_R1.NBTTagInt;
-import net.minecraft.server.v1_11_R1.NBTTagList;
-import net.minecraft.server.v1_11_R1.NBTTagString;
+import net.minecraft.server.v1_10_R1.NBTBase;
+import net.minecraft.server.v1_10_R1.NBTTagCompound;
+import net.minecraft.server.v1_10_R1.NBTTagInt;
+import net.minecraft.server.v1_10_R1.NBTTagList;
+import net.minecraft.server.v1_10_R1.NBTTagString;
 
 import org.bukkit.ChatColor;
-import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftItemStack;
 import org.bukkit.inventory.ItemStack;
 
 import com.avrgaming.civcraft.loreenhancements.LoreEnhancement;
@@ -222,7 +222,7 @@ public Attribute build() {
     }
 
     // This may be modified
-    public net.minecraft.server.v1_11_R1.ItemStack nmsStack;
+    public net.minecraft.server.v1_10_R1.ItemStack nmsStack;
 
     private NBTTagCompound parent;
     private NBTTagList attributes;

diff --git a/civcraft/src/gpl/HorseModifier.java b/civcraft/src/gpl/HorseModifier.java
@@ -7,15 +7,15 @@
 import java.util.Map.Entry;
 import java.util.UUID;
 
-import net.minecraft.server.v1_11_R1.AttributeInstance;
-import net.minecraft.server.v1_11_R1.AttributeModifier;
-import net.minecraft.server.v1_11_R1.EntityInsentient;
-import net.minecraft.server.v1_11_R1.GenericAttributes;
+import net.minecraft.server.v1_10_R1.AttributeInstance;
+import net.minecraft.server.v1_10_R1.AttributeModifier;
+import net.minecraft.server.v1_10_R1.EntityInsentient;
+import net.minecraft.server.v1_10_R1.GenericAttributes;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_11_R1.entity.CraftLivingEntity;
+import org.bukkit.craftbukkit.v1_10_R1.entity.CraftLivingEntity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;

diff --git a/civcraft/src/gpl/ImprovedOfflinePlayer.java b/civcraft/src/gpl/ImprovedOfflinePlayer.java
@@ -30,23 +30,23 @@
 import java.util.ArrayList;
 import java.util.UUID;
 
-import net.minecraft.server.v1_11_R1.AttributeMapBase;
-import net.minecraft.server.v1_11_R1.AttributeMapServer;
-import net.minecraft.server.v1_11_R1.GenericAttributes;
-import net.minecraft.server.v1_11_R1.NBTCompressedStreamTools;
-import net.minecraft.server.v1_11_R1.NBTTagCompound;
-import net.minecraft.server.v1_11_R1.NBTTagDouble;
-import net.minecraft.server.v1_11_R1.NBTTagFloat;
-import net.minecraft.server.v1_11_R1.NBTTagList;
-import net.minecraft.server.v1_11_R1.PlayerAbilities;
-import net.minecraft.server.v1_11_R1.PlayerInventory;
+import net.minecraft.server.v1_10_R1.AttributeMapBase;
+import net.minecraft.server.v1_10_R1.AttributeMapServer;
+import net.minecraft.server.v1_10_R1.GenericAttributes;
+import net.minecraft.server.v1_10_R1.NBTCompressedStreamTools;
+import net.minecraft.server.v1_10_R1.NBTTagCompound;
+import net.minecraft.server.v1_10_R1.NBTTagDouble;
+import net.minecraft.server.v1_10_R1.NBTTagFloat;
+import net.minecraft.server.v1_10_R1.NBTTagList;
+import net.minecraft.server.v1_10_R1.PlayerAbilities;
+import net.minecraft.server.v1_10_R1.PlayerInventory;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.World;
-import org.bukkit.craftbukkit.v1_11_R1.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_10_R1.inventory.CraftInventoryPlayer;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.util.Vector;
 

diff --git a/civcraft/src/plugin.yml b/civcraft/src/plugin.yml
@@ -1,7 +1,7 @@
 name: CivCraft
 main: com.avrgaming.civcraft.main.CivCraft
 softdepends: [TitleAPI]
-version: 1.8.0
+version: 1.8.0-Beta3
 depend: [CustomMobs]
 
 commands: