Revert "Add reflection esque version support for 1.8 and 1.9 -untested"

JamieSinn · JamieSinn · commit a3a61aa09120 · 2016-05-25T23:08:15.000-04:00
This reverts commit e647b34.
diff --git a/pom.xml b/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>Essentials</artifactId>
             <version>2.14-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.darkblade12</groupId>
-            <artifactId>particleeffect</artifactId>
-            <version>1.7.0-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <distributionManagement>
         <repository>
@@ -66,26 +61,6 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.5</version>
-                <configuration>
-                    <artifactSet>
-                        <includes>
-                            <include>com.darkblade12:*</include>
-                        </includes>
-                    </artifactSet>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
         <resources>
             <resource>
diff --git a/src/main/java/ca/jamiesinn/trailgui/Listeners.java b/src/main/java/ca/jamiesinn/trailgui/Listeners.java
@@ -1,7 +1,6 @@
 package ca.jamiesinn.trailgui;
 
 import ca.jamiesinn.trailgui.trails.Trail;
-import ca.jamiesinn.trailgui.util.Methods;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
diff --git a/src/main/java/ca/jamiesinn/trailgui/Methods.java b/src/main/java/ca/jamiesinn/trailgui/Methods.java
@@ -1,6 +1,5 @@
-package ca.jamiesinn.trailgui.util;
+package ca.jamiesinn.trailgui;
 
-import ca.jamiesinn.trailgui.TrailGUI;
 import ca.jamiesinn.trailgui.files.Userdata;
 import ca.jamiesinn.trailgui.trails.Trail;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ca/jamiesinn/trailgui/ParticleManager.java b/src/main/java/ca/jamiesinn/trailgui/ParticleManager.java
diff --git a/src/main/java/ca/jamiesinn/trailgui/TrailGUI.java b/src/main/java/ca/jamiesinn/trailgui/TrailGUI.java
@@ -5,7 +5,6 @@
 import ca.jamiesinn.trailgui.commands.CommandTrails;
 import ca.jamiesinn.trailgui.files.Userdata;
 import ca.jamiesinn.trailgui.trails.*;
-import ca.jamiesinn.trailgui.util.Methods;
 import com.earth2me.essentials.IEssentials;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/ca/jamiesinn/trailgui/api/TrailDisplayEvent.java b/src/main/java/ca/jamiesinn/trailgui/api/TrailDisplayEvent.java
@@ -0,0 +1,82 @@
+package ca.jamiesinn.trailgui.api;
+
+import org.bukkit.Particle;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+public class TrailDisplayEvent extends Event implements Cancellable
+{
+    private static final HandlerList handlers = new HandlerList();
+    private String name;
+    private double displayLocation;
+    private int amount;
+    private int cooldown;
+    private float speed;
+    private int range;
+    private Particle type;
+    private boolean cancelled;
+
+    public TrailDisplayEvent(String name, double displayLocation, int amount, int cooldown, float speed, int range, Particle type)
+    {
+        this.name = name;
+        this.displayLocation = displayLocation;
+        this.amount = amount;
+        this.cooldown = cooldown;
+        this.speed = speed;
+        this.range = range;
+
+    }
+
+    @Override
+    public HandlerList getHandlers()
+    {
+        return handlers;
+    }
+
+
+    public double getDisplayLocation()
+    {
+        return displayLocation;
+    }
+
+    public int getAmount()
+    {
+        return amount;
+    }
+
+    public int getCooldown()
+    {
+        return cooldown;
+    }
+
+    public float getSpeed()
+    {
+        return speed;
+    }
+
+    public int getRange()
+    {
+        return range;
+    }
+
+    public String getName()
+    {
+        return name;
+    }
+
+    public Particle getType()
+    {
+        return type;
+    }
+
+    public boolean isCancelled()
+    {
+        return cancelled;
+    }
+
+    public void setCancelled(boolean cancelled)
+    {
+        this.cancelled = cancelled;
+    }
+}
diff --git a/src/main/java/ca/jamiesinn/trailgui/commands/CommandTrail.java b/src/main/java/ca/jamiesinn/trailgui/commands/CommandTrail.java
@@ -1,6 +1,6 @@
 package ca.jamiesinn.trailgui.commands;
 
-import ca.jamiesinn.trailgui.util.Methods;
+import ca.jamiesinn.trailgui.Methods;
 import ca.jamiesinn.trailgui.TrailGUI;
 import ca.jamiesinn.trailgui.trails.Trail;
 import org.bukkit.Bukkit;
diff --git a/src/main/java/ca/jamiesinn/trailgui/commands/CommandTrails.java b/src/main/java/ca/jamiesinn/trailgui/commands/CommandTrails.java
@@ -1,7 +1,7 @@
 package ca.jamiesinn.trailgui.commands;
 
 import ca.jamiesinn.trailgui.TrailGUI;
-import ca.jamiesinn.trailgui.util.Methods;
+import ca.jamiesinn.trailgui.Methods;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/BlockTrail.java b/src/main/java/ca/jamiesinn/trailgui/trails/BlockTrail.java
@@ -1,6 +1,6 @@
 package ca.jamiesinn.trailgui.trails;
 
-import ca.jamiesinn.trailgui.ParticleManager;
+import org.bukkit.Particle;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.material.MaterialData;
@@ -13,21 +13,22 @@ public class BlockTrail extends Trail
     public BlockTrail(ConfigurationSection config)
     {
         super(config);
-        itemData = (byte) config.getInt("data", 0);
+        itemData = (byte)config.getInt("data", 0);
         blockData = new MaterialData(itemType, itemData);
         loadType(config.getString("type"));
     }
 
     @Override
     protected void loadType(String sType)
     {
-        this.type = sType;
+        this.type = Particle.valueOf(sType);
     }
 
     @Override
     public void justDisplay(Player player)
     {
-        ParticleManager.spawnBlockParticle(player, displayLocation, amount, cooldown,speed,range, type, blockData);
+        if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())
+            player.getWorld().spawnParticle(type, player.getLocation().add(0.0D, displayLocation, 0.0D), amount, 0,0,0, speed, blockData);
 
     }
 }
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/EffectTrail.java b/src/main/java/ca/jamiesinn/trailgui/trails/EffectTrail.java
@@ -23,6 +23,7 @@ protected void loadType(String sType)
     @Override
     public void justDisplay(Player player)
     {
-        player.getWorld().playEffect(player.getLocation(), this.effect, 1);
+        if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())
+            player.getWorld().playEffect(player.getLocation(), this.effect, 1);
     }
 }
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/ItemTrail.java b/src/main/java/ca/jamiesinn/trailgui/trails/ItemTrail.java
@@ -1,6 +1,6 @@
 package ca.jamiesinn.trailgui.trails;
 
-import ca.jamiesinn.trailgui.ParticleManager;
+import org.bukkit.Particle;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -21,7 +21,7 @@ public ItemTrail(ConfigurationSection config)
     @Override
     protected void loadType(String sType)
     {
-        this.type = sType;
+        this.type = Particle.valueOf(sType);
     }
 
     @Override
@@ -31,6 +31,7 @@ public void justDisplay(Player player)
         {
             return;
         }
-        ParticleManager.spawnItemParticle(player, displayLocation, amount, cooldown, speed, range, type, getItem());
+        if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())
+            player.getWorld().spawnParticle(type, player.getLocation().add(0.0D, displayLocation, 0.0D), amount, 0,0,0, speed, data);
     }
 }
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/NormalTrail.java b/src/main/java/ca/jamiesinn/trailgui/trails/NormalTrail.java
@@ -1,6 +1,6 @@
 package ca.jamiesinn.trailgui.trails;
 
-import ca.jamiesinn.trailgui.ParticleManager;
+import org.bukkit.Particle;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
@@ -15,7 +15,7 @@ public NormalTrail(ConfigurationSection config)
     @Override
     protected void loadType(String sType)
     {
-        this.type = sType;
+        this.type = Particle.valueOf(sType);
     }
 
     @Override
@@ -25,6 +25,7 @@ public void justDisplay(Player player)
         {
             return;
         }
-        ParticleManager.spawnParticle(player, displayLocation, amount, cooldown, speed, range, type);
+        if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())
+            player.getWorld().spawnParticle(type, player.getLocation().add(0.0D, displayLocation, 0.0D), amount, 0, 0, 0, speed);
     }
 }
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/Trail.java b/src/main/java/ca/jamiesinn/trailgui/trails/Trail.java
@@ -1,12 +1,13 @@
 package ca.jamiesinn.trailgui.trails;
 
+import ca.jamiesinn.trailgui.Methods;
 import ca.jamiesinn.trailgui.TrailGUI;
 import ca.jamiesinn.trailgui.api.TrailDisableEvent;
+import ca.jamiesinn.trailgui.api.TrailDisplayEvent;
 import ca.jamiesinn.trailgui.api.TrailEnableEvent;
-import ca.jamiesinn.trailgui.util.ITrailManager;
-import ca.jamiesinn.trailgui.util.Methods;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
+import org.bukkit.Particle;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -28,8 +29,7 @@ public abstract class Trail
     protected String itemName;
     protected boolean loreEnabled;
     protected List<String> lore;
-    protected String type;
-    protected ITrailManager trailManager;
+    protected Particle type;
     Map<UUID, Long> cooldownMap = new HashMap<UUID, Long>();
 
     public Trail(ConfigurationSection config)
@@ -44,7 +44,7 @@ public Trail(ConfigurationSection config)
         this.itemType = Material.valueOf(config.getString("itemType").toUpperCase());
         this.itemName = config.getString("itemName", "").replace("&", "\u00a7");
         this.loreEnabled = config.getBoolean("loreEnabled", false);
-        this.lore = new ArrayList<>();
+        this.lore = new ArrayList<String>();
         lore.add(config.getString("loreLineOne"));
         lore.add(config.getString("loreLineTwo"));
         lore.add(config.getString("loreLineThree"));
@@ -351,6 +351,14 @@ public boolean onCommand(Player player, String[] args)
         return false;
     }
 
+    public TrailDisplayEvent displayEvent(String name, double location, int amount, int cooldown, float speed, int range, Particle type)
+    {
+        TrailDisplayEvent event = new TrailDisplayEvent(name,
+                location, amount, cooldown, speed, range, type);
+        TrailGUI.getPlugin().getServer().getPluginManager().callEvent(event);
+        return event;
+    }
+
     public static void enableEvent(Player player, Trail trail)
     {
         TrailEnableEvent event = new TrailEnableEvent(player, trail);
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/v1_8_x/TrailManager.java b/src/main/java/ca/jamiesinn/trailgui/trails/v1_8_x/TrailManager.java
diff --git a/src/main/java/ca/jamiesinn/trailgui/trails/v1_9_x/TrailManager.java b/src/main/java/ca/jamiesinn/trailgui/trails/v1_9_x/TrailManager.java
diff --git a/src/main/java/ca/jamiesinn/trailgui/util/ITrailManager.java b/src/main/java/ca/jamiesinn/trailgui/util/ITrailManager.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package ca.jamiesinn.trailgui.trails;`
`2`	`2`
`3`		`-import ca.jamiesinn.trailgui.ParticleManager;`
	`3`	`+import org.bukkit.Particle;`
`4`	`4`	`import org.bukkit.configuration.ConfigurationSection;`
`5`	`5`	`import org.bukkit.entity.Player;`
`6`	`6`	`import org.bukkit.material.MaterialData;`
`@@ -13,21 +13,22 @@ public class BlockTrail extends Trail`
`13`	`13`	`public BlockTrail(ConfigurationSection config)`
`14`	`14`	`{`
`15`	`15`	`super(config);`
`16`		`- itemData = (byte) config.getInt("data", 0);`
	`16`	`+ itemData = (byte)config.getInt("data", 0);`
`17`	`17`	`blockData = new MaterialData(itemType, itemData);`
`18`	`18`	`loadType(config.getString("type"));`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`protected void loadType(String sType)`
`23`	`23`	`{`
`24`		`- this.type = sType;`
	`24`	`+ this.type = Particle.valueOf(sType);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`@Override`
`28`	`28`	`public void justDisplay(Player player)`
`29`	`29`	`{`
`30`		`- ParticleManager.spawnBlockParticle(player, displayLocation, amount, cooldown,speed,range, type, blockData);`
	`30`	`+ if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())`
	`31`	`+ player.getWorld().spawnParticle(type, player.getLocation().add(0.0D, displayLocation, 0.0D), amount, 0,0,0, speed, blockData);`
`31`	`32`
`32`	`33`	`}`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ protected void loadType(String sType)`
`23`	`23`	`@Override`
`24`	`24`	`public void justDisplay(Player player)`
`25`	`25`	`{`
`26`		`- player.getWorld().playEffect(player.getLocation(), this.effect, 1);`
	`26`	`+ if(!displayEvent(getName(), getDisplayLocation(), getAmount(), cooldown, getSpeed(), getRange(), type).isCancelled())`
	`27`	`+ player.getWorld().playEffect(player.getLocation(), this.effect, 1);`
`27`	`28`	`}`
`28`	`29`	`}`