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

Performance bump

Browse Source
This commit is contained in:
Brianna O'Keefe 2018-10-26 19:47:32 -04:00
parent b0b1cbdca4
commit a362dc1145
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,7 +74,7 @@ public class HopHandler {
Block block = location.getBlock();
if (block == null || !(block.getState() instanceof Hopper)) {
if (block == null || block.getType() != Material.HOPPER) {
instance.getHopperManager().removeHopper(location);
instance.getLogger().info("EpicHoppers Removing non-hopper entry: " + location.toString());
}

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

@ -39,7 +39,7 @@ public class EHopper implements Hopper {
private Filter filter;
private TeleportTrigger teleportTrigger;
private Material autoCrafting;
private org.bukkit.block.Hopper hopper;
public EHopper(Location location, Level level, UUID lastPlayer, UUID placedBy, Block syncedBlock, Filter filter, TeleportTrigger teleportTrigger, Material autoCrafting) {
this.location = location;
@ -50,6 +50,7 @@ public class EHopper implements Hopper {
this.placedBy = placedBy;
this.teleportTrigger = teleportTrigger;
this.autoCrafting = autoCrafting;
this.hopper = (org.bukkit.block.Hopper) (location.getBlock() != null && location.getBlock().getType() == Material.HOPPER ? location.getBlock().getState() : null);
}
public EHopper(Block block, Level level, UUID lastPlayer, UUID placedBy, Block syncedBlock, Filter filter, TeleportTrigger teleportTrigger, Material autoCrafting) {
@ -519,7 +520,7 @@ public class EHopper implements Hopper {
@Override
public org.bukkit.block.Hopper getHopper() {
return (org.bukkit.block.Hopper) (location.getBlock() != null ? location.getBlock().getState() : null);
return hopper;
}
@Override

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

@ -4,6 +4,7 @@ import com.songoda.epichoppers.EpicHoppersPlugin;
import com.songoda.epichoppers.api.hopper.Hopper;
import com.songoda.epichoppers.api.hopper.levels.modules.Module;
import com.songoda.epichoppers.utils.Debugger;
import jdk.nashorn.internal.ir.Block;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.inventory.*;
@ -16,6 +17,7 @@ import java.util.Map;
public class ModuleAutoCrafting implements Module {
private final Map<Material, Recipe> cachedRecipes = new HashMap<>();
private final Map<Hopper, Material> lastMaterial = new HashMap<>();
public static List<ItemStack> compressItemStack(List<ItemStack> target) {
HashMap<Material, ItemStack> sortingList = new HashMap<>();
@ -38,16 +40,16 @@ public class ModuleAutoCrafting implements Module {
}
public void run(Hopper hopper) {
if (hopper.getAutoCrafting() != null && canMove(hopper.getHopper().getInventory(), new ItemStack(hopper.getAutoCrafting()))) {
org.bukkit.block.Hopper hopperBlock = hopper.getHopper();
main:
for (Recipe recipe : Bukkit.getServer().getRecipesFor(new ItemStack(hopper.getAutoCrafting()))) {
if (!(recipe instanceof ShapedRecipe) && !(recipe instanceof ShapelessRecipe)) continue;
org.bukkit.block.Hopper hopperBlock = hopper.getHopper();
if (hopper.getAutoCrafting() != null && canMove(hopperBlock.getInventory(), new ItemStack(hopper.getAutoCrafting()))) {
Recipe recipe = cachedRecipes.get(hopper.getAutoCrafting());
if (!(recipe instanceof ShapedRecipe) && !(recipe instanceof ShapelessRecipe)) return;
List<ItemStack> ingredientMap = null;
if (recipe instanceof ShapelessRecipe) ingredientMap = ((ShapelessRecipe) recipe).getIngredientList();
if (recipe instanceof ShapedRecipe)
ingredientMap = new ArrayList<>(((ShapedRecipe) recipe).getIngredientMap().values());
if (hopperBlock.getInventory().getSize() == 0) continue;
if (hopperBlock.getInventory().getSize() == 0) return;
Map<Material, Integer> items = new HashMap<>();
for (ItemStack item : ingredientMap) {
@ -68,7 +70,7 @@ public class ModuleAutoCrafting implements Module {
}
if (amt < item.getAmount()) {
continue main;
return;
}
}
main2:
@ -89,7 +91,7 @@ public class ModuleAutoCrafting implements Module {
}
hopperBlock.getInventory().addItem(recipe.getResult());
}
}
}
public List<Material> getBlockedItems(Hopper hopper) {
@ -98,6 +100,13 @@ public class ModuleAutoCrafting implements Module {
Material material = hopper.getAutoCrafting();
if (material == Material.AIR) return materials;
if (lastMaterial.get(hopper) != material) {
lastMaterial.put(hopper, material);
cachedRecipes.remove(hopper);
}
if (!cachedRecipes.containsKey(material)) {
for (Recipe recipe : Bukkit.getServer().getRecipesFor(new ItemStack(material))) {
cachedRecipes.put(material, recipe);