Because proper conventions are dumb >.<

This commit is contained in:
NovaFox161 2018-05-08 07:07:16 -05:00
parent 66512f31d5
commit 8eb2edbcc0
31 changed files with 93 additions and 109 deletions

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Lib" level="project" />
<orderEntry type="library" name="spigot-1.12.2" level="project" />
<orderEntry type="library" name="spigot-1.7.10" level="project" />
</component>
</module>

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.api;
package com.songoda.epichoppers.API;
import com.songoda.epichoppers.EpicHoppers;
import org.bukkit.inventory.ItemStack;

View File

@ -3,14 +3,14 @@ package com.songoda.epichoppers;
import com.songoda.arconix.api.mcupdate.MCUpdate;
import com.songoda.arconix.api.utils.ConfigWrapper;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.api.EpicHoppersAPI;
import com.songoda.epichoppers.handlers.*;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.hopper.HopperManager;
import com.songoda.epichoppers.hopper.LevelManager;
import com.songoda.epichoppers.listeners.*;
import com.songoda.epichoppers.utils.SettingsManager;
import com.songoda.epichoppers.API.EpicHoppersAPI;
import com.songoda.epichoppers.Events.*;
import com.songoda.epichoppers.Handlers.*;
import com.songoda.epichoppers.Hopper.Filter;
import com.songoda.epichoppers.Hopper.Hopper;
import com.songoda.epichoppers.Hopper.HopperManager;
import com.songoda.epichoppers.Hopper.LevelManager;
import com.songoda.epichoppers.Utils.SettingsManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.Block;

View File

@ -1,11 +1,11 @@
package com.songoda.epichoppers.listeners;
package com.songoda.epichoppers.Events;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Filter;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Hopper.Filter;
import com.songoda.epichoppers.Hopper.Hopper;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.Material;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.listeners;
package com.songoda.epichoppers.Events;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Hopper;
@ -45,7 +45,7 @@ public class HopperListeners implements Listener {
if (!instance.getHopperManager().isHopper(e.getSource().getLocation())) return;
com.songoda.epichoppers.hopper.Hopper hopper = instance.getHopperManager().getHopper(e.getSource().getLocation());
com.songoda.epichoppers.Hopper.Hopper hopper = instance.getHopperManager().getHopper(e.getSource().getLocation());
if (source.getHolder() instanceof Hopper && hopper.getSyncedBlock() != null) {
e.setCancelled(true);

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.listeners;
package com.songoda.epichoppers.Events;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Hopper.Hopper;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.listeners;
package com.songoda.epichoppers.Events;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Hopper.Hopper;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.listeners;
package com.songoda.epichoppers.Events;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.handlers;
package com.songoda.epichoppers.Handlers;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Bukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.handlers;
package com.songoda.epichoppers.Handlers;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.handlers;
package com.songoda.epichoppers.Handlers;
import com.songoda.arconix.api.utils.ConfigWrapper;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hooks.*;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Hooks.*;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@ -24,20 +24,20 @@ public class HookHandler {
public void hook() {
try {
hooksFile.createNewFile("Loading hooks File", EpicHoppers.getInstance().getDescription().getName() + " hooks File");
hooksFile.createNewFile("Loading hooks File", EpicHoppers.getInstance().getDescription().getName() + " hooks File");
new FactionsHook();
new RedProtectHook();
new GriefPreventionHook();
new ASkyBlockHook();
new USkyBlockHook();
new WorldGuardHook();
new PlotSquaredHook();
new KingdomsHook();
new TownyHook();
new FactionsHook();
new RedProtectHook();
new GriefPreventionHook();
new ASkyBlockHook();
new USkyBlockHook();
new WorldGuardHook();
new PlotSquaredHook();
new KingdomsHook();
new TownyHook();
hooksFile.getConfig().options().copyDefaults(true);
hooksFile.saveConfig();
hooksFile.getConfig().options().copyDefaults(true);
hooksFile.saveConfig();
} catch (Exception e) {
Debugger.runReport(e);
}

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.handlers;
package com.songoda.epichoppers.Handlers;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.apache.commons.lang.StringUtils;
import org.bukkit.*;
import org.bukkit.block.Block;
@ -63,7 +63,7 @@ public class HopHandler {
try {
Set<Entity> metaItems = new HashSet<>();
for (com.songoda.epichoppers.hopper.Hopper hopper : instance.getHopperManager().getHoppers().values()) {
for (com.songoda.epichoppers.Hopper.Hopper hopper : instance.getHopperManager().getHoppers().values()) {
Location location = hopper.getLocation();
@ -209,7 +209,7 @@ public class HopHandler {
}
}
private void doBlacklist(Hopper hopperBlock, com.songoda.epichoppers.hopper.Hopper hopper, ItemStack item, ItemStack[] isS, int amt, int place) {
private void doBlacklist(Hopper hopperBlock, com.songoda.epichoppers.Hopper.Hopper hopper, ItemStack item, ItemStack[] isS, int amt, int place) {
try {
Location loc = hopperBlock.getLocation();
Block b = loc.getBlock();
@ -230,7 +230,7 @@ public class HopHandler {
}
}
private int addItem(Hopper hopperBlock, com.songoda.epichoppers.hopper.Hopper hopper, Block b2, ItemStack is, ItemStack[] isS, int amt, int place) {
private int addItem(Hopper hopperBlock, com.songoda.epichoppers.Hopper.Hopper hopper, Block b2, ItemStack is, ItemStack[] isS, int amt, int place) {
try {
ItemStack it = null;
if (is != null) {

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.handlers;
package com.songoda.epichoppers.Handlers;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Hopper.Hopper;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.block.BlockFace;

View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import com.wasteofplastic.askyblock.ASkyBlockAPI;
import org.bukkit.Location;
import org.bukkit.entity.Player;
@ -43,7 +43,7 @@ public class ASkyBlockHook extends Hook {
}
}
for (Location loc: list2) {
for (Location loc : list2) {
if (as.getIslandAt(location).getOwner().equals(as.getIslandAt(loc).getOwner())) {
return true;
}

View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import me.markeh.factionsframework.entities.FPlayer;
import me.markeh.factionsframework.entities.FPlayers;
import me.markeh.factionsframework.entities.Faction;
@ -24,11 +24,11 @@ public class FactionsHook extends Hook {
@Override
public boolean canBuild(Player p, Location location) {
try {
FPlayer fp = FPlayers.getBySender(p);
FPlayer fp = FPlayers.getBySender(p);
Faction faction = Factions.getFactionAt(location);
Faction faction = Factions.getFactionAt(location);
return (fp.getFaction().equals(faction) || faction.isNone());
return (fp.getFaction().equals(faction) || faction.isNone());
} catch (Exception e) {
Debugger.runReport(e);
}

View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import me.ryanhamshire.GriefPrevention.Claim;
import me.ryanhamshire.GriefPrevention.GriefPrevention;
import org.bukkit.Location;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import org.bukkit.Bukkit;
@ -17,7 +17,7 @@ public abstract class Hook {
protected boolean isEnabled() {
return (Bukkit.getPluginManager().isPluginEnabled(pluginName)
&& EpicHoppers.getInstance().hooks.hooksFile.getConfig().getBoolean("hooks." + pluginName,true));
&& EpicHoppers.getInstance().hooks.hooksFile.getConfig().getBoolean("hooks." + pluginName, true));
}
boolean hasBypass(Player p) {
@ -35,6 +35,4 @@ public abstract class Hook {
}
}

View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.kingdoms.constants.land.Land;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.intellectualcrafters.plot.api.PlotAPI;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Location;
import org.bukkit.entity.Player;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import br.net.fabiozumbi12.RedProtect.Bukkit.API.RedProtectAPI;
import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Location;
import org.bukkit.entity.Player;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.palmergames.bukkit.towny.object.Resident;
import com.palmergames.bukkit.towny.object.TownyUniverse;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Location;
import org.bukkit.entity.Player;

View File

@ -1,7 +1,7 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.entity.Player;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.hooks;
package com.songoda.epichoppers.Hooks;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.Utils.Debugger;
import org.bukkit.Location;
import org.bukkit.entity.Player;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.songoda.epichoppers.Hopper;
import org.bukkit.block.Block;
import org.bukkit.inventory.ItemStack;

View File

@ -1,9 +1,9 @@
package com.songoda.epichoppers.hopper;
package com.songoda.epichoppers.Hopper;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.utils.Debugger;
import com.songoda.epichoppers.utils.Methods;
import com.songoda.epichoppers.Utils.Debugger;
import com.songoda.epichoppers.Utils.Methods;
import net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.songoda.epichoppers.Hopper;
import com.songoda.epichoppers.EpicHoppers;
import org.bukkit.Location;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.songoda.epichoppers.Hopper;
import com.songoda.epichoppers.EpicHoppers;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.hopper;
package com.songoda.epichoppers.Hopper;
import java.util.Collections;
import java.util.Map;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.songoda.epichoppers.Utils;
import com.songoda.epichoppers.EpicHoppers;

View File

@ -1,8 +1,8 @@
package com.songoda.epichoppers.utils;
package com.songoda.epichoppers.Utils;
import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppers;
import com.songoda.epichoppers.hopper.Hopper;
import com.songoda.epichoppers.Hopper.Hopper;
import net.minecraft.server.v1_7_R4.AxisAlignedBB;
import org.bukkit.Location;
import org.bukkit.Material;

View File

@ -1,4 +1,4 @@
package com.songoda.epichoppers.utils;
package com.songoda.epichoppers.Utils;
import com.songoda.arconix.api.utils.ConfigWrapper;
import com.songoda.arconix.plugin.Arconix;
@ -231,7 +231,7 @@ public class SettingsManager implements Listener {
o11("hopper-Limit", "Main.Max Hoppers Per Chunk", -1),
o12("Helpful-Tips", "Main.Display Helpful Tips For Operators", true),
o13("Sounds", "Main.Sounds Enabled", true),
o14("BlockBreak-Particle-Type", "Main.BlockBreak Particle Type","LAVA"),
o14("BlockBreak-Particle-Type", "Main.BlockBreak Particle Type", "LAVA"),
o15("BlockBreak-Blacklist", "Main.BlockBreak Blacklisted Blocks", Arrays.asList("BEDROCK")),
o16("Rainbow-Glass", "Interfaces.Replace Glass Type 1 With Rainbow Glass", false),