Upstream/EpicHoppers
1
0
Fork 0
mirror of https://github.com/songoda/EpicHoppers.git synced 2024-09-28 15:47:28 +02:00
Code Issues Projects Releases Wiki Activity

Support for liquidtanks added

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-11-12 22:34:11 -05:00
parent e324b6c48c
commit e2fea06b16
6 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/EpicHoppersPlugin.java
View File

@ -86,6 +86,8 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
private Storage storage;
private boolean liquidtanks = false;
public static EpicHoppersPlugin getInstance() {
return INSTANCE;
}
@ -217,6 +219,8 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
pluginManager.registerEvents(new InteractListeners(this), this);
pluginManager.registerEvents(new InventoryListeners(this), this);
if (pluginManager.isPluginEnabled("LiquidTanks")) liquidtanks = true;
// Register default hooks
if (pluginManager.isPluginEnabled("ASkyBlock")) this.register(HookASkyBlock::new);
if (pluginManager.isPluginEnabled("FactionsFramework")) this.register(HookFactions::new);
@ -514,6 +518,10 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
return playerDataManager;
}
public boolean isLiquidtanks() {
return liquidtanks;
}
@Override
public void register(Supplier<ProtectionPluginHook> hookSupplier) {
this.registerProtectionHook(hookSupplier.get());

6
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/BlockListeners.java
View File

@ -47,6 +47,9 @@ public class BlockListeners implements Listener {
if (e.getBlock().getType() != Material.HOPPER) return;
if (instance.isLiquidtanks() && net.arcaniax.liquidtanks.object.LiquidTankAPI.isLiquidTank(e.getBlock().getLocation()))
return;
int amt = count(e.getBlock().getChunk());
int max = maxHoppers(player);
@ -111,6 +114,9 @@ public class BlockListeners implements Listener {
if (event.getBlock().getType() != Material.HOPPER) return;
if (instance.isLiquidtanks() && net.arcaniax.liquidtanks.object.LiquidTankAPI.isLiquidTank(block.getLocation()))
return;
Hopper hopper = instance.getHopperManager().getHopper(block);
Level level = hopper.getLevel();

3
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/HopperListeners.java
View File

@ -28,6 +28,9 @@ public class HopperListeners implements Listener {
if (source.getLocation().getBlock().getType() != Material.HOPPER) return;
if (instance.isLiquidtanks() && net.arcaniax.liquidtanks.object.LiquidTankAPI.isLiquidTank(event.getDestination().getLocation()))
return;
Hopper hopper = instance.getHopperManager().getHopper(source.getLocation());
if (hopper.getSyncedBlock() == null) {
hopper.setSyncedBlock(event.getDestination().getLocation().getBlock());

2
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/listeners/InteractListeners.java
View File

@ -107,6 +107,8 @@ public class InteractListeners implements Listener {
if (playerData.getSyncType() == null) {
if (e.getClickedBlock().getType() == Material.HOPPER) {
if (instance.isLiquidtanks() && net.arcaniax.liquidtanks.object.LiquidTankAPI.isLiquidTank(e.getClickedBlock().getLocation()))
return;
Hopper hopper = instance.getHopperManager().getHopper(e.getClickedBlock());
playerData.setLastHopper(hopper);
if (instance.getConfig().getBoolean("Main.Allow hopper Upgrading")

4
EpicHoppers-Plugin/src/main/resources/plugin.yml
View File

@ -2,8 +2,8 @@ name: EpicHoppers
description: EpicHoppers
main: com.songoda.epichoppers.EpicHoppersPlugin
depend: [Arconix]
softdepend: [WildStacker, Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault]
version: 3.1.32
softdepend: [LiquidTanks, WildStacker, Towny, RedProtect, Kingdoms, PlotsSquared, GriefPrevention, USkyBlock, ASkyBlock, WorldGuard, Factions, Vault]
version: 3.1.33
author: Songoda
api-version: 1.13
commands:

7
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>EpicHoppers</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>3.1.32</version>
<version>3.1.33</version>
<build>
<defaultGoal>clean package</defaultGoal>
<plugins>
@ -60,6 +60,11 @@
<artifactId>arconix</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>net.arcaniax</groupId>
<artifactId>liquidtanks</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>org</groupId>
<artifactId>kingdoms</artifactId>