Upstream/EpicFurnaces
1
0
Fork 0
mirror of https://github.com/songoda/EpicFurnaces.git synced 2025-02-18 20:41:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' into 'master'

Browse Source 
1.14

See merge request Songoda/epicfurnaces!12
This commit is contained in:
Brianna O'Keefe 2019-04-26 23:03:17 +00:00
commit ea479ac4de
27 changed files with 175 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables:
name: "EpicFurnaces"
path: "/builds/$CI_PROJECT_PATH"
version: "4.1.2"
version: "4.2"
build:
stage: build

38
core/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>EpicFurnaces-Parent</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<artifactId>EpicFurnaces</artifactId>
@ -77,7 +77,7 @@
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.13.2</version>
<version>1.14-pre5-2</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -92,76 +92,64 @@
<version>2.3.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>craftbukkit-1-13</artifactId>
<version>4.1.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>craftbukkit-1-8</artifactId>
<version>4.1.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>askyblock</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>factions</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>griefprevention</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>kingdoms</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>plotsquared</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>redprotect</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>towny</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>uskyblock</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>worldguard</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>worldguard6</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
@ -173,7 +161,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>fabledskyblock</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

6
core/src/main/java/com/songoda/epicfurnaces/EpicFurnaces.java
View File

@ -53,7 +53,6 @@ public class EpicFurnaces extends JavaPlugin {
private Storage storage;
private HologramManager hologramManager;
private Economy economy;
private CraftBukkitHook craftBukkitHook;
private int currentVersion;
@Override
@ -264,7 +263,6 @@ public class EpicFurnaces extends JavaPlugin {
private boolean checkVersion() {
String version = getServer().getClass().getPackage().getName().split("\\.")[3];
currentVersion = Integer.parseInt(version.split("_")[1]);
craftBukkitHook = currentVersion >= 13 ? new CraftBukkitHook113() : new CraftBukkitHook18();
int workingVersion = 8;
if (currentVersion < workingVersion) {
@ -342,7 +340,7 @@ public class EpicFurnaces extends JavaPlugin {
return economy;
}
public CraftBukkitHook getCraftBukkitHook() {
return craftBukkitHook;
public int getCurrentVersion() {
return currentVersion;
}
}

6
core/src/main/java/com/songoda/epicfurnaces/menus/OverviewMenu.java
View File

@ -53,8 +53,6 @@ public class OverviewMenu extends FastInv {
for (String line : parts) {
currentLevel.addLore(StringUtils.formatText(line));
}
}
fill(Methods.getGlass());
@ -199,13 +197,13 @@ public class OverviewMenu extends FastInv {
if (instance.getConfig().getBoolean("Main.Upgrade With XP") && accessor.hasPermission("EpicFurnaces.Upgrade.XP")) {
addItem(11, xp.build(), event -> {
furnace.upgrade("XP", event.getPlayer());
event.getPlayer().closeInventory();
furnace.openOverview(event.getPlayer());
});
}
if (instance.getConfig().getBoolean("Main.Upgrade With Economy") && accessor.hasPermission("EpicFurnaces.Upgrade.ECO")) {
addItem(15, eco.build(), event -> {
furnace.upgrade("ECO", event.getPlayer());
event.getPlayer().closeInventory();
furnace.openOverview(event.getPlayer());
});
}

10
core/src/main/java/com/songoda/epicfurnaces/objects/FurnaceObject.java
View File

@ -110,10 +110,6 @@ public class FurnaceObject {
BoostData boostData = instance.getBoostManager().getBoost(placedBy);
r = r * (boostData == null ? 1 : boostData.getMultiplier());
if (e.getResult() == null) {
return;
}
e.getResult().setAmount(e.getResult().getAmount() + r);
}
@ -155,10 +151,12 @@ public class FurnaceObject {
}
Location loc = location.clone().add(.5, .5, .5);
instance.getCraftBukkitHook().broadcastParticle(loc, instance.getConfig().getString("Main.Upgrade Particle Type"), 200);
if (instance.getCurrentVersion() > 8)
location.getWorld().spawnParticle(Particle.valueOf(instance.getConfig().getString("Main.Upgrade Particle Type")), loc.getX(), loc.getY(), loc.getZ(), 200, .5, .5, .5);
if (instance.getConfig().getBoolean("Main.Sounds Enabled")) {
if (instance.getLevelManager().getHighestLevel() == level) {
if (instance.getLevelManager().getHighestLevel() != level) {
player.playSound(player.getLocation(), instance.getBukkitEnums().getSound("ENTITY_PLAYER_LEVELUP"), 0.6F, 15.0F);
} else {
player.playSound(player.getLocation(), instance.getBukkitEnums().getSound("ENTITY_PLAYER_LEVELUP"), 2F, 25.0F);

23
core/src/main/java/com/songoda/epicfurnaces/storage/types/StorageYaml.java
View File

@ -4,12 +4,10 @@ import com.songoda.epicfurnaces.EpicFurnaces;
import com.songoda.epicfurnaces.storage.Storage;
import com.songoda.epicfurnaces.storage.StorageItem;
import com.songoda.epicfurnaces.storage.StorageRow;
import org.apache.commons.io.FileUtils;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.MemorySection;
import java.io.File;
import java.io.IOException;
import java.io.*;
import java.util.*;
public class StorageYaml extends Storage {
@ -72,7 +70,7 @@ public class StorageYaml extends Storage {
File data = new File(instance.getDataFolder() + "/data.yml");
File dataClone = new File(instance.getDataFolder() + "/backup/data-backup-" + System.currentTimeMillis() + ".yml");
try {
FileUtils.copyFile(data, dataClone);
copyFile(data, dataClone);
} catch (IOException e) {
e.printStackTrace();
}
@ -101,4 +99,21 @@ public class StorageYaml extends Storage {
public void closeConnection() {
instance.save("data");
}
private static void copyFile(File source, File dest) throws IOException {
InputStream is = null;
OutputStream os = null;
try {
is = new FileInputStream(source);
os = new FileOutputStream(dest);
byte[] buffer = new byte[1024];
int length;
while ((length = is.read(buffer)) > 0) {
os.write(buffer, 0, length);
}
} finally {
is.close();
os.close();
}
}
}

4
core/src/main/java/com/songoda/epicfurnaces/tasks/FurnaceTask.java
View File

@ -5,6 +5,7 @@ import com.songoda.epicfurnaces.objects.FurnaceObject;
import com.songoda.epicfurnaces.objects.FurnaceObject.BoostType;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Particle;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Furnace;
@ -163,7 +164,8 @@ public class FurnaceTask extends BukkitRunnable {
private void broadcastParticles(Location location) {
if (instance.getConfig().getBoolean("Main.Overheat Particles")) {
instance.getCraftBukkitHook().broadcastParticle(location, "SMOKE", 25, "SMOKE_NORMAL");
if (instance.getCurrentVersion() > 8)
location.getWorld().spawnParticle(Particle.SMOKE_NORMAL, location.getX(), location.getY(), location.getZ(), 25, 0, 0, 0, 0);
}
}
}

180
core/src/main/java/com/songoda/epicfurnaces/utils/gui/AbstractAnvilGUI.java
View File

@ -5,6 +5,7 @@ import com.songoda.epicfurnaces.utils.NMSUtil;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
@ -22,97 +23,109 @@ import java.util.Map;
import java.util.Objects;
public class AbstractAnvilGUI {
private static Class<?> BlockPositionClass;
private static Class<?> PacketPlayOutOpenWindowClass;
private static Class<?> IChatBaseComponentClass;
private static Class<?> ICraftingClass;
private static Class<?> ContainerAnvilClass;
private static Class<?> ChatMessageClass;
private static Class<?> EntityHumanClass;
private static Class<?> ContainerClass;
private static Class<?> ContainerAccessClass;
private static Class<?> WorldClass;
private static Class<?> PlayerInventoryClass;
private static Class<?> ContainersClass;
private final EpicFurnaces instance;
private static Class<?> BlockPosition;
private static Class<?> PacketPlayOutOpenWindow;
private static Class<?> ContainerAnvil;
private static Class<?> ChatMessage;
private static Class<?> EntityHuman;
private static boolean loadedClasses = false;
private Player player;
@SuppressWarnings("unused")
private AnvilClickEventHandler handler;
private Map<AnvilSlot, ItemStack> items = new HashMap<>();
private OnClose onClose = null;
private Inventory inv;
private Listener listener;
static {
BlockPositionClass = NMSUtil.getNMSClass("BlockPosition");
PacketPlayOutOpenWindowClass = NMSUtil.getNMSClass("PacketPlayOutOpenWindow");
IChatBaseComponentClass = NMSUtil.getNMSClass("IChatBaseComponent");
ICraftingClass = NMSUtil.getNMSClass("ICrafting");
ContainerAnvilClass = NMSUtil.getNMSClass("ContainerAnvil");
EntityHumanClass = NMSUtil.getNMSClass("EntityHuman");
ChatMessageClass = NMSUtil.getNMSClass("ChatMessage");
ContainerClass = NMSUtil.getNMSClass("Container");
WorldClass = NMSUtil.getNMSClass("World");
PlayerInventoryClass = NMSUtil.getNMSClass("PlayerInventory");
if (NMSUtil.getVersionNumber() > 13) {
ContainerAccessClass = NMSUtil.getNMSClass("ContainerAccess");
ContainersClass = NMSUtil.getNMSClass("Containers");
}
}
public AbstractAnvilGUI(EpicFurnaces instance, final Player player, final AnvilClickEventHandler handler) {
this.instance = instance;
loadClasses();
this.player = player;
this.handler = handler;
this.listener = new Listener() {
@EventHandler
@EventHandler(priority = EventPriority.LOWEST)
public void onInventoryClick(InventoryClickEvent event) {
if (!(event.getWhoClicked() instanceof Player) || !event.getInventory().equals(inv)) return;
if (event.getWhoClicked() instanceof Player) {
event.setCancelled(true);
if (event.getInventory().equals(inv)) {
event.setCancelled(true);
ItemStack item = event.getCurrentItem();
int slot = event.getRawSlot();
String name = "";
ItemStack item = event.getCurrentItem();
int slot = event.getRawSlot();
String name = "";
if (item != null) {
if (item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta();
if (item != null) {
if (item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta();
if (meta.hasDisplayName()) {
name = meta.getDisplayName();
if (meta != null && meta.hasDisplayName()) {
name = meta.getDisplayName();
}
}
}
AnvilClickEvent clickEvent = new AnvilClickEvent(AnvilSlot.bySlot(slot), name);
handler.onAnvilClick(clickEvent);
if (clickEvent.getWillClose()) {
event.getWhoClicked().closeInventory();
}
if (clickEvent.getWillDestroy()) {
destroy();
}
}
}
AnvilClickEvent clickEvent = new AnvilClickEvent(AnvilSlot.bySlot(slot), name);
handler.onAnvilClick(clickEvent);
if (clickEvent.getWillClose()) {
event.getWhoClicked().closeInventory();
}
if (clickEvent.getWillDestroy()) {
destroy();
}
}
@EventHandler
@EventHandler(priority = EventPriority.LOWEST)
public void onInventoryClose(InventoryCloseEvent event) {
if (!(event.getPlayer() instanceof Player)) return;
Inventory inv = event.getInventory();
player.setLevel(player.getLevel() - 1);
if (!inv.equals(AbstractAnvilGUI.this.inv)) return;
inv.clear();
OnClose onClose = getOnClose();
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> {
if (onClose != null) onClose.onClose(player, inv);
destroy();
}, 1L);
if (event.getPlayer() instanceof Player) {
Inventory inv = event.getInventory();
player.setLevel(player.getLevel() - 1);
if (inv.equals(inv)) {
inv.clear();
Bukkit.getScheduler().scheduleSyncDelayedTask(instance, () -> {
if (onClose != null) onClose.onClose(player, inv);
destroy();
}, 1L);
}
}
}
@EventHandler
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerQuit(PlayerQuitEvent event) {
if (!event.getPlayer().equals(getPlayer())) return;
player.setLevel(player.getLevel() - 1);
destroy();
if (event.getPlayer().equals(getPlayer())) {
player.setLevel(player.getLevel() - 1);
destroy();
}
}
};
Bukkit.getPluginManager().registerEvents(listener, instance);
}
private void loadClasses() {
if (loadedClasses) return;
BlockPosition = NMSUtil.getNMSClass("BlockPosition");
PacketPlayOutOpenWindow = NMSUtil.getNMSClass("PacketPlayOutOpenWindow");
ContainerAnvil = NMSUtil.getNMSClass("ContainerAnvil");
EntityHuman = NMSUtil.getNMSClass("EntityHuman");
ChatMessage = NMSUtil.getNMSClass("ChatMessage");
loadedClasses = true;
}
public Player getPlayer() {
return player;
}
@ -125,19 +138,26 @@ public class AbstractAnvilGUI {
player.setLevel(player.getLevel() + 1);
try {
Object craftPlayer = Objects.requireNonNull(NMSUtil.getCraftClass("entity.CraftPlayer")).cast(player);
Object craftPlayer = NMSUtil.getCraftClass("entity.CraftPlayer").cast(player);
Method getHandleMethod = craftPlayer.getClass().getMethod("getHandle");
Object entityPlayer = getHandleMethod.invoke(craftPlayer);
Object playerInventory = NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "inventory", false));
Object world = NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "world", false));
Object blockPosition = BlockPositionClass.getConstructor(int.class, int.class, int.class).newInstance(0, 0, 0);
Object container;
if (NMSUtil.getVersionNumber() == 7) {
container = ContainerAnvil.getConstructor(new Class[]{NMSUtil.getNMSClass("PlayerInventory"), NMSUtil.getNMSClass("World"), Integer.TYPE, Integer.TYPE, Integer.TYPE, EntityHuman}).newInstance(NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "inventory", false)), NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "world", false)), 0, 0, 0, entityPlayer);
if (NMSUtil.getVersionNumber() > 13) {
container = ContainerAnvilClass
.getConstructor(int.class, PlayerInventoryClass, ContainerAccessClass)
.newInstance(7, playerInventory, ContainerAccessClass.getMethod("at", WorldClass, BlockPositionClass).invoke(null, world, blockPosition));
} else {
container = ContainerAnvil.getConstructor(NMSUtil.getNMSClass("PlayerInventory"), NMSUtil.getNMSClass("World"), BlockPosition, EntityHuman).newInstance(NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "inventory", false)), NMSUtil.getFieldObject(entityPlayer, NMSUtil.getField(entityPlayer.getClass(), "world", false)), BlockPosition.getConstructor(int.class, int.class, int.class).newInstance(0, 0, 0), entityPlayer);
container = ContainerAnvilClass
.getConstructor(PlayerInventoryClass, WorldClass, BlockPositionClass, EntityHumanClass)
.newInstance(playerInventory, world, blockPosition, entityPlayer);
}
Objects.requireNonNull(NMSUtil.getField(NMSUtil.getNMSClass("Container"), "checkReachable", true)).set(container, false);
NMSUtil.getField(ContainerClass, "checkReachable", true).set(container, false);
Method getBukkitViewMethod = container.getClass().getMethod("getBukkitView");
Object bukkitView = getBukkitViewMethod.invoke(container);
@ -151,25 +171,34 @@ public class AbstractAnvilGUI {
Method nextContainerCounterMethod = entityPlayer.getClass().getMethod("nextContainerCounter");
int c = (int) nextContainerCounterMethod.invoke(entityPlayer);
Constructor<?> chatMessageConstructor = ChatMessage.getConstructor(String.class, Object[].class);
Constructor<?> chatMessageConstructor = ChatMessageClass.getConstructor(String.class, Object[].class);
Object inventoryTitle = chatMessageConstructor.newInstance("Repairing", new Object[]{});
Object packet;
if (NMSUtil.getVersionNumber() == 7) {
packet = PacketPlayOutOpenWindow.getConstructor(new Class[]{Integer.TYPE, Integer.TYPE, String.class, Integer.TYPE, Boolean.TYPE, Integer.TYPE}).newInstance(c, 8, "Repairing", 0, Boolean.TRUE, 0);
if (NMSUtil.getVersionNumber() > 13) {
packet = PacketPlayOutOpenWindowClass
.getConstructor(int.class, ContainersClass, IChatBaseComponentClass)
.newInstance(c, ContainersClass.getField("ANVIL").get(null), inventoryTitle);
} else {
packet = PacketPlayOutOpenWindow.getConstructor(int.class, String.class, NMSUtil.getNMSClass("IChatBaseComponent"), int.class).newInstance(c, "minecraft:anvil", chatMessageConstructor.newInstance("Repairing", new Object[]{}), 0);
packet = PacketPlayOutOpenWindowClass
.getConstructor(int.class, String.class, IChatBaseComponentClass, int.class)
.newInstance(c, "minecraft:anvil", inventoryTitle, 0);
}
NMSUtil.sendPacket(player, packet);
Field activeContainerField = NMSUtil.getField(EntityHuman, "activeContainer", true);
Field activeContainerField = NMSUtil.getField(EntityHumanClass, "activeContainer", true);
if (activeContainerField != null) {
activeContainerField.set(entityPlayer, container);
Objects.requireNonNull(NMSUtil.getField(NMSUtil.getNMSClass("Container"), "windowId", true)).set(activeContainerField.get(entityPlayer), c);
Method addSlotListenerMethod = activeContainerField.get(entityPlayer).getClass().getMethod("addSlotListener", NMSUtil.getNMSClass("ICrafting"));
NMSUtil.getField(ContainerClass, "windowId", true).set(activeContainerField.get(entityPlayer), c);
Method addSlotListenerMethod = activeContainerField.get(entityPlayer).getClass().getMethod("addSlotListener", ICraftingClass);
addSlotListenerMethod.invoke(activeContainerField.get(entityPlayer), entityPlayer);
if (NMSUtil.getVersionNumber() > 13) {
ContainerClass.getMethod("setTitle", IChatBaseComponentClass).invoke(container, inventoryTitle);
}
}
} catch (Exception e) {
e.printStackTrace();
@ -177,9 +206,7 @@ public class AbstractAnvilGUI {
}
public void destroy() {
onClose = null;
player = null;
handler = null;
items = null;
HandlerList.unregisterAll(listener);
@ -221,6 +248,7 @@ public class AbstractAnvilGUI {
}
}
@FunctionalInterface
public interface AnvilClickEventHandler {
void onAnvilClick(AnvilClickEvent event);
}
@ -262,5 +290,5 @@ public class AbstractAnvilGUI {
this.destroy = destroy;
}
}
}
}

2
core/src/main/resources/plugin.yml
View File

@ -1,5 +1,5 @@
name: EpicFurnaces
version: ${project.version}
version: maven-version-number
main: com.songoda.epicfurnaces.EpicFurnaces
authors: [Brianna, GB6]
website: https://songoda.com/

4
hooks/askyblock/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -28,7 +28,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

29
hooks/craftbukkit-1-13/pom.xml
View File

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>craftbukkit-1-13</artifactId>
<dependencies>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.13.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

31
hooks/craftbukkit-1-13/src/main/java/com/songoda/epicfurnaces/hooks/CraftBukkitHook113.java
View File

@ -1,31 +0,0 @@
package com.songoda.epicfurnaces.hooks;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.craftbukkit.v1_13_R2.CraftWorld;
public class CraftBukkitHook113 implements CraftBukkitHook {
@Override
public void broadcastParticle(Location location, String name, int amount, String... optional) {
if (optional.length != 0) {
try {
((CraftWorld) location.getWorld()).spawnParticle(Particle.valueOf(optional[0]), location.getX(), location.getY(), location.getZ(), amount, 0, 0, 0, 0);
return;
} catch (Exception ignore) {
}
}
try {
location.getWorld().playEffect(location, Effect.valueOf(name), amount);
return;
} catch (Exception ignore) {
}
try {
((CraftWorld) location.getWorld()).spawnParticle(Particle.valueOf(name), location.getX(), location.getY(), location.getZ(), amount, 0, 0, 0, 0);
} catch (Exception ignore) {
}
}
}

27
hooks/craftbukkit-1-8/pom.xml
View File

@ -1,27 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>craftbukkit-1-8</artifactId>
<dependencies>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.spigotmc</groupId>
<artifactId>spigot</artifactId>
<version>1.8.8</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

24
hooks/craftbukkit-1-8/src/main/java/com/songoda/epicfurnaces/hooks/CraftBukkitHook18.java
View File

@ -1,24 +0,0 @@
package com.songoda.epicfurnaces.hooks;
import org.bukkit.Effect;
import org.bukkit.Location;
public class CraftBukkitHook18 implements CraftBukkitHook {
@Override
public void broadcastParticle(Location location, String name, int amount, String... optional) {
if (Effect.getByName(name) == null) {
return;
}
String[] split = name.split("_");
String type;
if (split.length != 1 && Effect.getByName(name.split("_")[0]) != null) {
type = name.split("_")[0];
} else {
type = name;
}
location.getWorld().playEffect(location, Effect.getByName(type), amount);
}
}

4
hooks/fabledskyblock/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -21,7 +21,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>

4
hooks/factions/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<artifactId>factions</artifactId>
@ -28,7 +28,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/griefprevention/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

6
hooks/kingdoms/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,13 +27,13 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
hooks/manager/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

4
hooks/plotsquared/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/pom.xml
View File

@ -7,7 +7,7 @@
<parent>
<artifactId>EpicFurnaces-Parent</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -25,8 +25,6 @@
<module>griefprevention</module>
<module>worldguard6</module>
<module>worldguard7</module>
<module>craftbukkit-1-8</module>
<module>craftbukkit-1-13</module>
<module>fabledskyblock</module>
</modules>
</project>

4
hooks/redprotect/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/towny/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/uskyblock/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -26,7 +26,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/worldguard6/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -27,7 +27,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

4
hooks/worldguard7/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>hooks</artifactId>
<groupId>com.songoda</groupId>
<version>4.1.3</version>
<version>maven-version-number</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -33,7 +33,7 @@
<dependency>
<groupId>com.songoda</groupId>
<artifactId>manager</artifactId>
<version>4.1.3</version>
<version>maven-version-number</version>
<scope>compile</scope>
</dependency>
</dependencies>

2
pom.xml
View File

@ -5,7 +5,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicFurnaces-Parent</artifactId>
<packaging>pom</packaging>
<version>4.1.3</version>
<version>maven-version-number</version>
<modules>
<module>core</module>