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

Lots of code cleaned up.

Browse Source 
Started work on a module API.
This commit is contained in:
Brianna O'Keefe 2018-08-29 14:03:04 -04:00
parent ef08449afb
commit d9a492c9ff
10 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/Level.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.hopper.levels; package com.songoda.epichoppers.api.hopper.levels;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -69,7 +69,7 @@ public interface Level {
List<String> getDescription(); List<String> getDescription();
ArrayList<ModuleAbstract> getRegisteredModules(); ArrayList<Module> getRegisteredModules();
void addModule(ModuleAbstract module); void addModule(Module module);
} }

4
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/LevelManager.java
View File

@ -1,6 +1,6 @@
package com.songoda.epichoppers.api.hopper.levels; package com.songoda.epichoppers.api.hopper.levels;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map; import java.util.Map;
@ -20,7 +20,7 @@ public interface LevelManager {
* @param filter Whether or not access to the filter is allowed. * @param filter Whether or not access to the filter is allowed.
* @param teleport Whether or not teleporting through hoppers is allowed. * @param teleport Whether or not teleporting through hoppers is allowed.
*/ */
void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> modules); void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> modules);
/** /**
* Get {@link Level} by corresponding integer value. * Get {@link Level} by corresponding integer value.

2
EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/ModuleAbstract.java → EpicHoppers-API/src/main/java/com/songoda/epichoppers/api/hopper/levels/modules/Module.java
View File

@ -5,7 +5,7 @@ import org.bukkit.Material;
import java.util.List; import java.util.List;
public interface ModuleAbstract { public interface Module {
String getName(); String getName();

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

@ -9,7 +9,7 @@ import com.songoda.epichoppers.api.EpicHoppersAPI;
import com.songoda.epichoppers.api.hopper.*; import com.songoda.epichoppers.api.hopper.*;
import com.songoda.epichoppers.api.hopper.levels.Level; import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.levels.LevelManager; import com.songoda.epichoppers.api.hopper.levels.LevelManager;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.api.utils.ClaimableProtectionPluginHook; import com.songoda.epichoppers.api.utils.ClaimableProtectionPluginHook;
import com.songoda.epichoppers.api.utils.ProtectionPluginHook; import com.songoda.epichoppers.api.utils.ProtectionPluginHook;
import com.songoda.epichoppers.boost.BoostData; import com.songoda.epichoppers.boost.BoostData;
@ -46,7 +46,6 @@ import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -267,7 +266,7 @@ public class EpicHoppersPlugin extends JavaPlugin implements EpicHoppers {
int costExperiance = levels.getInt("Cost-xp"); int costExperiance = levels.getInt("Cost-xp");
int costEconomy = levels.getInt("Cost-eco"); int costEconomy = levels.getInt("Cost-eco");
ArrayList<ModuleAbstract> modules = new ArrayList<>(); ArrayList<Module> modules = new ArrayList<>();
for (String key : levels.getKeys(false)) { for (String key : levels.getKeys(false)) {
if (key.equals("Suction") && levels.getInt("Suction") != 0) { if (key.equals("Suction") && levels.getInt("Suction") != 0) {

9
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/handlers/HopHandler.java
View File

@ -2,18 +2,14 @@ package com.songoda.epichoppers.handlers;
import com.songoda.arconix.plugin.Arconix; import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.boost.BoostData; import com.songoda.epichoppers.boost.BoostData;
import com.songoda.epichoppers.utils.Debugger; import com.songoda.epichoppers.utils.Debugger;
import org.apache.commons.lang.StringUtils;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.Hopper; import org.bukkit.block.Hopper;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.inventory.*; import org.bukkit.inventory.*;
import org.bukkit.metadata.FixedMetadataValue;
import java.util.*; import java.util.*;
@ -82,7 +78,7 @@ public class HopHandler {
List<Material> materials = new ArrayList<>(); List<Material> materials = new ArrayList<>();
for (ModuleAbstract module : hopper.getLevel().getRegisteredModules()) { for (Module module : hopper.getLevel().getRegisteredModules()) {
// Run Module // Run Module
module.run(hopper); module.run(hopper);
@ -90,7 +86,6 @@ public class HopHandler {
// Add banned materials to list. // Add banned materials to list.
if (module.getBlockedItems(hopper) == null) continue; if (module.getBlockedItems(hopper) == null) continue;
materials.addAll(module.getBlockedItems(hopper)); materials.addAll(module.getBlockedItems(hopper));
} }

12
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevel.java
View File

@ -2,14 +2,14 @@ package com.songoda.epichoppers.hopper.levels;
import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.levels.Level; import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
public class ELevel implements Level { public class ELevel implements Level {
private final ArrayList<ModuleAbstract> registeredModules; private final ArrayList<Module> registeredModules;
private int level, costExperience, costEconomy, range, amount; private int level, costExperience, costEconomy, range, amount;
@ -17,7 +17,7 @@ public class ELevel implements Level {
private final List<String> description = new ArrayList<>(); private final List<String> description = new ArrayList<>();
ELevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> registeredModules) { ELevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> registeredModules) {
this.level = level; this.level = level;
this.costExperience = costExperience; this.costExperience = costExperience;
this.costEconomy = costEconomy; this.costEconomy = costEconomy;
@ -34,7 +34,7 @@ public class ELevel implements Level {
if (filter) description.add(instance.getLocale().getMessage("interface.hopper.filter", true)); if (filter) description.add(instance.getLocale().getMessage("interface.hopper.filter", true));
if (teleport) description.add(instance.getLocale().getMessage("interface.hopper.teleport", true)); if (teleport) description.add(instance.getLocale().getMessage("interface.hopper.teleport", true));
for (ModuleAbstract module : registeredModules) { for (Module module : registeredModules) {
description.add(module.getDescription()); description.add(module.getDescription());
} }
@ -81,12 +81,12 @@ public class ELevel implements Level {
} }
@Override @Override
public ArrayList<ModuleAbstract> getRegisteredModules() { public ArrayList<Module> getRegisteredModules() {
return new ArrayList<>(registeredModules); return new ArrayList<>(registeredModules);
} }
@Override @Override
public void addModule(ModuleAbstract module) { public void addModule(Module module) {
registeredModules.add(module); registeredModules.add(module);
} }

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/ELevelManager.java
View File

@ -2,7 +2,7 @@ package com.songoda.epichoppers.hopper.levels;
import com.songoda.epichoppers.api.hopper.levels.Level; import com.songoda.epichoppers.api.hopper.levels.Level;
import com.songoda.epichoppers.api.hopper.levels.LevelManager; import com.songoda.epichoppers.api.hopper.levels.LevelManager;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import java.util.*; import java.util.*;
@ -11,7 +11,7 @@ public class ELevelManager implements LevelManager {
private final NavigableMap<Integer, ELevel> registeredLevels = new TreeMap<>(); private final NavigableMap<Integer, ELevel> registeredLevels = new TreeMap<>();
@Override @Override
public void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<ModuleAbstract> modules) { public void addLevel(int level, int costExperience, int costEconomy, int range, int amount, boolean filter, boolean teleport, ArrayList<Module> modules) {
registeredLevels.put(level, new ELevel(level, costExperience, costEconomy, range, amount, filter, teleport, modules)); registeredLevels.put(level, new ELevel(level, costExperience, costEconomy, range, amount, filter, teleport, modules));
} }

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleAutoCrafting.java
View File

@ -2,7 +2,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper; import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.utils.Debugger; import com.songoda.epichoppers.utils.Debugger;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class ModuleAutoCrafting implements ModuleAbstract { public class ModuleAutoCrafting implements Module {
@Override @Override
public String getName() { public String getName() {

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleBlockBreak.java
View File

@ -3,7 +3,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
import com.songoda.arconix.plugin.Arconix; import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper; import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -13,7 +13,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
public class ModuleBlockBreak implements ModuleAbstract { public class ModuleBlockBreak implements Module {
private Map<Block, Integer> blockTick = new HashMap<>(); private Map<Block, Integer> blockTick = new HashMap<>();

4
EpicHoppers-Plugin/src/main/java/com/songoda/epichoppers/hopper/levels/modules/ModuleSuction.java
View File

@ -3,7 +3,7 @@ package com.songoda.epichoppers.hopper.levels.modules;
import com.songoda.arconix.plugin.Arconix; import com.songoda.arconix.plugin.Arconix;
import com.songoda.epichoppers.EpicHoppersPlugin; import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper; import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.modules.ModuleAbstract; import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.utils.Debugger; import com.songoda.epichoppers.utils.Debugger;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.bukkit.Material; import org.bukkit.Material;
@ -16,7 +16,7 @@ import org.bukkit.metadata.FixedMetadataValue;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
public class ModuleSuction implements ModuleAbstract { public class ModuleSuction implements Module {
private final int amount; private final int amount;