diff --git a/src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java b/src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java index a4854f297..cd56f137f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/MultiBlock.java @@ -13,8 +13,8 @@ public class MultiBlock { public static List list = new ArrayList<>(); - Material[] blocks; - Material trigger; + private Material[] blocks; + private Material trigger; public MultiBlock(Material[] build, Material trigger) { this.blocks = build; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java index 6fe190f1e..5281f4db8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/DamagableChargableItem.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack; public class DamagableChargableItem extends SlimefunItem { - String chargeType; + private String chargeType; public DamagableChargableItem(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String chargeType) { super(category, item, id, recipeType, recipe); @@ -19,6 +19,8 @@ public class DamagableChargableItem extends SlimefunItem { this.chargeType = chargeType; } - public String getChargeType() { return this.chargeType; } + public String getChargeType() { + return this.chargeType; + } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index c5ae45b9e..35b8d8b8b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -1,18 +1,21 @@ package me.mrCookieSlime.Slimefun.Objects.SlimefunItem; -import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; -import me.mrCookieSlime.Slimefun.SlimefunStartup; -import me.mrCookieSlime.Slimefun.Lists.Categories; -import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; +import java.util.Random; import org.bukkit.block.Block; import org.bukkit.block.Furnace; import org.bukkit.inventory.ItemStack; +import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; +import me.mrCookieSlime.Slimefun.Lists.Categories; +import me.mrCookieSlime.Slimefun.Lists.RecipeType; +import me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker; + public class EnhancedFurnace extends SlimefunItem { - int speed, efficiency, fortune; + private int speed; + private int efficiency; + private int fortune; public EnhancedFurnace(int speed, int efficiency, int fortune, ItemStack item, String id, ItemStack[] recipe) { super(Categories.MACHINES_1, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe); @@ -59,7 +62,7 @@ public class EnhancedFurnace extends SlimefunItem { public int getOutput() { int fortune = this.fortune; - fortune = SlimefunStartup.randomize(fortune + 2) - 1; + fortune = new Random().nextInt(fortune + 2) - 1; if (fortune <= 0) fortune = 0; fortune++; return fortune; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java index 84a47d1d9..f512be3e7 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/JetBoots.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack; public class JetBoots extends DamagableChargableItem { - double speed; + private double speed; public JetBoots(ItemStack item, String id, ItemStack[] recipe, double speed) { super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jet Boots"); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java index b7093a53e..a0c2b1cfc 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/Jetpack.java @@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack; public class Jetpack extends DamagableChargableItem { - double thrust; + private double thrust; public Jetpack(ItemStack item, String id, ItemStack[] recipe, double thrust) { super(Categories.TECH, item, id, RecipeType.ENHANCED_CRAFTING_TABLE, recipe, "Jetpack"); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java index 133847d58..3fcd05ff9 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/MultiTool.java @@ -11,7 +11,7 @@ import org.bukkit.inventory.ItemStack; public class MultiTool extends DamagableChargableItem { - List modes; + private List modes; public MultiTool(ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { super(Categories.TECH, item, id, recipeType, recipe, "Multi Tool", keys, values); @@ -19,7 +19,7 @@ public class MultiTool extends DamagableChargableItem { @Override public void create() { - List list = new ArrayList(); + List list = new ArrayList<>(); for (int i = 0; i < 50; i++) { if (Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled") != null) { if ((Boolean) Slimefun.getItemValue(this.getID(), "mode." + i + ".enabled")) list.add(i); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java index 5ed225ad5..92924744f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunArmorPiece.java @@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffect; public class SlimefunArmorPiece extends SlimefunItem { - PotionEffect[] effects; + private PotionEffect[] effects; public SlimefunArmorPiece(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, PotionEffect[] effects) { super(category, item, id, recipeType, recipe); @@ -20,6 +20,8 @@ public class SlimefunArmorPiece extends SlimefunItem { this.effects = effects; } - public PotionEffect[] getEffects() { return this.effects; } + public PotionEffect[] getEffects() { + return this.effects; + } } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java index 678ead229..1da6bd55c 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunGadget.java @@ -10,13 +10,15 @@ import org.bukkit.inventory.ItemStack; public class SlimefunGadget extends SlimefunItem { - List recipes; - List display_recipes; + private List recipes; + private List display_recipes; public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes) { super(category, item, id, recipeType, recipe); - this.recipes = new ArrayList(); - this.display_recipes = new ArrayList(); + + this.recipes = new ArrayList<>(); + this.display_recipes = new ArrayList<>(); + for (ItemStack i: machineRecipes) { this.recipes.add(new ItemStack[] {i}); this.display_recipes.add(i); @@ -25,8 +27,9 @@ public class SlimefunGadget extends SlimefunItem { public SlimefunGadget(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack[] machineRecipes, String[] keys, Object[] values) { super(category, item, id, recipeType, recipe, keys, values); - this.recipes = new ArrayList(); - this.display_recipes = new ArrayList(); + this.recipes = new ArrayList<>(); + this.display_recipes = new ArrayList<>(); + for (ItemStack i: machineRecipes) { this.recipes.add(new ItemStack[] {i}); this.display_recipes.add(i); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index 3aa41e51b..e8db4aad8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -349,7 +349,7 @@ public class SlimefunItem { if (recipeType.toItem().isSimilar(RecipeType.MOB_DROP.toItem())) { try { EntityType entity = EntityType.valueOf(ChatColor.stripColor(recipe[4].getItemMeta().getDisplayName()).toUpperCase().replace(" ", "_")); - List dropping = new ArrayList(); + List dropping = new ArrayList<>(); if (SlimefunManager.drops.containsKey(entity)) dropping = SlimefunManager.drops.get(entity); dropping.add(output); SlimefunManager.drops.put(entity, dropping); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java index 0c8a2c612..31e2a778b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AContainer.java @@ -255,8 +255,8 @@ public abstract class AContainer extends SlimefunItem { } else { MachineRecipe r = null; - Map found = new HashMap(); - outer: + Map found = new HashMap<>(); + for (MachineRecipe recipe: recipes) { for (ItemStack input: recipe.getInput()) { slots: @@ -269,7 +269,7 @@ public abstract class AContainer extends SlimefunItem { } if (found.size() == recipe.getInput().length) { r = recipe; - break outer; + break; } else found.clear(); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java index 81cc931ca..2fb5449ec 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/ADrill.java @@ -118,7 +118,7 @@ public abstract class ADrill extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java index f6bb02d69..53cb87baf 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/AReactor.java @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.Random; import java.util.Set; import org.bukkit.Bukkit; @@ -264,7 +265,7 @@ public abstract class AReactor extends SlimefunItem { public void register(boolean slimefun) { addItemHandler(new EnergyTicker() { - Set explode = new HashSet(); + private Set explode = new HashSet<>(); @Override public double generateEnergy(final Location l, SlimefunItem sf, Config data) { @@ -284,13 +285,13 @@ public abstract class AReactor extends SlimefunItem { progress.put(l, timeleft - 1); Bukkit.getScheduler().scheduleSyncDelayedTask(SlimefunStartup.instance, () -> { - if (!l.getBlock().getRelative(cooling[CSCoreLib.randomizer().nextInt(cooling.length)]).isLiquid()) explode.add(l); + if (!l.getBlock().getRelative(cooling[new Random().nextInt(cooling.length)]).isLiquid()) explode.add(l); }); ItemStack item = getProgressBar().clone(); ItemMeta im = item.getItemMeta(); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(l).getTicks())); lore.add(MachineHelper.getCoolant(timeleft, processing.get(l).getTicks())); lore.add(""); @@ -353,7 +354,7 @@ public abstract class AReactor extends SlimefunItem { } else { MachineFuel r = null; - Map found = new HashMap(); + Map found = new HashMap<>(); if (port != null) { refill: @@ -384,6 +385,7 @@ public abstract class AReactor extends SlimefunItem { for (Map.Entry entry: found.entrySet()) { BlockStorage.getInventory(l).replaceExistingItem(entry.getKey(), InvUtils.decreaseItem(BlockStorage.getInventory(l).getItemInSlot(entry.getKey()), entry.getValue())); } + processing.put(l, r); progress.put(l, r.getTicks()); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineRecipe.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineRecipe.java index 9f87a0386..8f8bc18f0 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineRecipe.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/abstractItems/MachineRecipe.java @@ -4,9 +4,9 @@ import org.bukkit.inventory.ItemStack; public class MachineRecipe { - int ticks; - ItemStack[] input; - ItemStack[] output; + private int ticks; + private ItemStack[] input; + private ItemStack[] output; public MachineRecipe(int seconds, ItemStack[] input, ItemStack[] output) { this.ticks = seconds * 2; diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoAnvil.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoAnvil.java index 44ac5ecba..a8a069f17 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoAnvil.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoAnvil.java @@ -61,7 +61,7 @@ public abstract class AutoAnvil extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDisenchanter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDisenchanter.java index f23221ec0..6db9240bd 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDisenchanter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoDisenchanter.java @@ -62,7 +62,7 @@ public class AutoDisenchanter extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); @@ -88,8 +88,8 @@ public class AutoDisenchanter extends AContainer { } else { MachineRecipe r = null; - Map enchantments = new HashMap(); - Set enchantments2 = new HashSet(); + Map enchantments = new HashMap<>(); + Set enchantments2 = new HashSet<>(); slots: for (int slot: getInputSlots()) { ItemStack target = BlockStorage.getInventory(b).getItemInSlot(slot == getInputSlots()[0] ? getInputSlots()[1]: getInputSlots()[0]); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java index 6febd2a0f..2a3040949 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutoEnchanter.java @@ -64,7 +64,7 @@ public class AutoEnchanter extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); @@ -101,8 +101,8 @@ public class AutoEnchanter extends AContainer { // Enchant if (item != null && item.getType() == Material.ENCHANTED_BOOK && target != null) { - Map enchantments = new HashMap(); - Set enchantments2 = new HashSet(); + Map enchantments = new HashMap<>(); + Set enchantments2 = new HashSet<>(); int amount = 0; int special_amount = 0; EnchantmentStorageMeta meta = (EnchantmentStorageMeta) item.getItemMeta(); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutomatedCraftingChamber.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutomatedCraftingChamber.java index 2f77795f4..4f1ee4edd 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutomatedCraftingChamber.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/AutomatedCraftingChamber.java @@ -41,7 +41,7 @@ public abstract class AutomatedCraftingChamber extends SlimefunItem { private static final int[] border_in = {9, 10, 11, 12, 13, 18, 22, 27, 31, 36, 40, 45, 46, 47, 48, 49}; private static final int[] border_out = {23, 24, 25, 26, 32, 35, 41, 42, 43, 44}; - public static Map recipes = new HashMap(); + public static Map recipes = new HashMap<>(); public AutomatedCraftingChamber(Category category, ItemStack item, String name, RecipeType recipeType, ItemStack[] recipe) { super(category, item, name, recipeType, recipe); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java index 9c61f8596..a39c601ab 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/CropGrowthAccelerator.java @@ -32,7 +32,7 @@ public abstract class CropGrowthAccelerator extends SlimefunItem { private static final int[] border = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26}; - public static final Map crops = new HashMap(); + public static final Map crops = new HashMap<>(); static { crops.put(Material.WHEAT, 7); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java index 3da5401f5..fede481dc 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/ElectricGoldPan.java @@ -51,7 +51,7 @@ public abstract class ElectricGoldPan extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/FluidPump.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/FluidPump.java index 10a1b803c..ecaaf723a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/FluidPump.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/FluidPump.java @@ -36,8 +36,8 @@ import me.mrCookieSlime.Slimefun.api.item_transport.ItemTransportFlow; public class FluidPump extends SlimefunItem{ - public static Map processing = new HashMap(); - public static Map progress = new HashMap(); + public static Map processing = new HashMap<>(); + public static Map progress = new HashMap<>(); private static final int[] border = {0, 1, 2, 3, 4, 5, 6, 7, 8, 13, 31, 36, 37, 38, 39, 40, 41, 42, 43, 44, 22}; private static final int[] border_in = {9, 10, 11, 12, 18, 21, 27, 28, 29, 30}; @@ -124,13 +124,13 @@ public class FluidPump extends SlimefunItem{ ItemStack output = new ItemStack(Material.LAVA_BUCKET); - if (!fits(b, new ItemStack[] {output})) return; + if (!fits(b, output)) return; ChargableBlock.addCharge(b, -getEnergyConsumption()); BlockStorage.getInventory(b).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(b).getItemInSlot(slot), 1)); - pushItems(b, new ItemStack[] {output}); + pushItems(b, output); - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(fluid.getLocation()); Vein.calculate(fluid.getLocation(), fluid.getLocation(), list, 64); list.get(list.size() - 1).getBlock().setType(Material.AIR); @@ -146,11 +146,11 @@ public class FluidPump extends SlimefunItem{ ItemStack output = new ItemStack(Material.WATER_BUCKET); - if (!fits(b, new ItemStack[] {output})) return; + if (!fits(b, output)) return; ChargableBlock.addCharge(b, -getEnergyConsumption()); BlockStorage.getInventory(b).replaceExistingItem(slot, InvUtils.decreaseItem(BlockStorage.getInventory(b).getItemInSlot(slot), 1)); - pushItems(b, new ItemStack[] {output}); + pushItems(b, output); fluid.setType(Material.AIR); @@ -198,11 +198,11 @@ public class FluidPump extends SlimefunItem{ return inv; } - protected boolean fits(Block b, ItemStack[] items) { + protected boolean fits(Block b, ItemStack... items) { return inject(b).addItem(items).isEmpty(); } - protected void pushItems(Block b, ItemStack[] items) { + protected void pushItems(Block b, ItemStack... items) { Inventory inv = inject(b); inv.addItem(items); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java index d8e47667d..8aa717a1d 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/HeatedPressureChamber.java @@ -63,7 +63,7 @@ public abstract class HeatedPressureChamber extends AContainer { public int[] getSlotsAccessedByItemTransport(BlockMenu menu, ItemTransportFlow flow, ItemStack item) { if (flow.equals(ItemTransportFlow.WITHDRAW)) return getOutputSlots(); - List slots = new ArrayList(); + List slots = new ArrayList<>(); for (int slot: getInputSlots()) { if (SlimefunManager.isItemSimiliar(menu.getItemInSlot(slot), item, true)) { @@ -98,8 +98,8 @@ public abstract class HeatedPressureChamber extends AContainer { registerRecipe(30, new ItemStack[] {SlimefunItems.BLISTERING_INGOT, SlimefunItems.CARBONADO}, new ItemStack[] {SlimefunItems.BLISTERING_INGOT_2}); registerRecipe(60, new ItemStack[] {SlimefunItems.BLISTERING_INGOT_2, new ItemStack(Material.NETHER_STAR)}, new ItemStack[] {SlimefunItems.BLISTERING_INGOT_3}); registerRecipe(90, new ItemStack[] {SlimefunItems.PLUTONIUM, SlimefunItems.URANIUM}, new ItemStack[] {SlimefunItems.BOOSTED_URANIUM}); - registerRecipe(60, new ItemStack[]{SlimefunItems.NETHER_ICE, SlimefunItems.PLUTONIUM}, new ItemStack[]{new CustomItem(SlimefunItems.ENRICHED_NETHER_ICE, 4)}); - registerRecipe(45, new ItemStack[]{SlimefunItems.ENRICHED_NETHER_ICE}, new ItemStack[]{new CustomItem(SlimefunItems.NETHER_ICE_COOLANT_CELL, 8)}); + registerRecipe(60, new ItemStack[] {SlimefunItems.NETHER_ICE, SlimefunItems.PLUTONIUM}, new ItemStack[]{new CustomItem(SlimefunItems.ENRICHED_NETHER_ICE, 4)}); + registerRecipe(45, new ItemStack[] {SlimefunItems.ENRICHED_NETHER_ICE}, new ItemStack[]{new CustomItem(SlimefunItems.NETHER_ICE_COOLANT_CELL, 8)}); } public String getInventoryTitle() { @@ -148,7 +148,7 @@ public abstract class HeatedPressureChamber extends AContainer { ItemMeta im = item.getItemMeta(); im.setDisplayName(" "); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); @@ -174,8 +174,8 @@ public abstract class HeatedPressureChamber extends AContainer { } else { MachineRecipe r = null; - Map found = new HashMap(); - outer: + Map found = new HashMap<>(); + for (MachineRecipe recipe: recipes) { for (ItemStack input: recipe.getInput()) { slots: @@ -188,7 +188,7 @@ public abstract class HeatedPressureChamber extends AContainer { } if (found.size() == recipe.getInput().length) { r = recipe; - break outer; + break; } else found.clear(); } diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java index 134c3534a..0dbc0385b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/OilPump.java @@ -91,7 +91,7 @@ public abstract class OilPump extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java index 1a288e408..f3e08fb1f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/Refinery.java @@ -53,7 +53,7 @@ public abstract class Refinery extends AContainer { ItemMeta im = item.getItemMeta(); ((Damageable) im).setDamage(MachineHelper.getDurability(item, timeleft, processing.get(b).getTicks())); im.setDisplayName(" "); - List lore = new ArrayList(); + List lore = new ArrayList<>(); lore.add(MachineHelper.getProgress(timeleft, processing.get(b).getTicks())); lore.add(""); lore.add(MachineHelper.getTimeLeft(timeleft / 2)); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Files.java b/src/me/mrCookieSlime/Slimefun/Setup/Files.java index 1bdf6148f..ab7527c78 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Files.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Files.java @@ -34,19 +34,20 @@ public final class Files { } } - public static void delete(File folder) { + public static boolean delete(File folder) { File[] files = folder.listFiles(); if (files != null) { for (File current: files) { if (current.isDirectory()) { - delete(current); + if (!delete(current)) return false;; } else { - current.delete(); + if (!current.delete()) return false; } } } - folder.delete(); + + return folder.delete(); } } diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java index fd2750707..3370647af 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java @@ -1196,7 +1196,7 @@ public final class SlimefunSetup { public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List drops) { if (SlimefunManager.isItemSimiliar(e.getPlayer().getInventory().getItemInMainHand(), SlimefunItems.LUMBER_AXE, true)) { if (MaterialHelper.isLog( e.getBlock().getType())) { - List logs = new ArrayList(); + List logs = new ArrayList<>(); TreeCalculator.getTree(e.getBlock().getLocation(), e.getBlock().getLocation(), logs); if (logs.contains(e.getBlock().getLocation())) logs.remove(e.getBlock().getLocation()); @@ -1541,9 +1541,10 @@ public final class SlimefunSetup { return false; } - Chest chest = (Chest) chestBlock.getState(); + Chest chest = (Chest) chestBlock.getState(); final Inventory inv = chest.getInventory(); - List ores = new ArrayList(); + List ores = new ArrayList<>(); + for (int x = b.getX() - 4; x <= b.getX() + 4; x++) { for (int z = b.getZ() - 4; z <= b.getZ() + 4; z++) { for (int y = b.getY(); y > 0; y--) { @@ -1599,9 +1600,10 @@ public final class SlimefunSetup { return false; } - Chest chest = (Chest) chestBlock.getState(); + Chest chest = (Chest) chestBlock.getState(); final Inventory inv = chest.getInventory(); - List ores = new ArrayList(); + List ores = new ArrayList<>(); + for (int x = b.getX() - 6; x <= b.getX() + 6; x++) { for (int z = b.getZ() - 6; z <= b.getZ() + 6; z++) { for (int y = b.getY(); y > 0; y--) { @@ -1789,15 +1791,19 @@ public final class SlimefunSetup { new ItemStack[] {new ItemStack(Material.GRAVEL), new ItemStack(Material.FLINT), new ItemStack(Material.GRAVEL), new ItemStack(Material.CLAY_BALL), new ItemStack(Material.GRAVEL), SlimefunItems.SIFTED_ORE}, Material.OAK_TRAPDOOR) .register(true, new MultiBlockInteractionHandler() { + private Random random = new Random(); + @Override public boolean onInteract(final Player p, MultiBlock mb, final Block b) { if (mb.isMultiBlock(SlimefunItem.getByID("AUTOMATED_PANNING_MACHINE"))) { if (CSCoreLib.getLib().getProtectionManager().canAccessChest(p.getUniqueId(), b, true)) { final ItemStack input = p.getInventory().getItemInMainHand(); ItemStack output = null; - if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.SIFTED_ORE"))) output = SlimefunItems.SIFTED_ORE; - else if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.CLAY"))) output = new ItemStack(Material.CLAY_BALL); - else if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.FLINT"))) output = new ItemStack(Material.FLINT); + + if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.SIFTED_ORE")) output = SlimefunItems.SIFTED_ORE; + else if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.CLAY")) output = new ItemStack(Material.CLAY_BALL); + else if (random.nextInt(100) < (Integer) Slimefun.getItemValue("GOLD_PAN", "chance.FLINT")) output = new ItemStack(Material.FLINT); + final ItemStack drop = output; if (input != null) { if (input.getType() == Material.GRAVEL) { @@ -1815,6 +1821,7 @@ public final class SlimefunSetup { return true; } } + Messages.local.sendTranslation(p, "machines.wrong-item", true); return true; } @@ -1864,7 +1871,7 @@ public final class SlimefunSetup { } if (e.getPlayer().getInventory().getItemInMainHand().getEnchantments().containsKey(Enchantment.DURABILITY)) { - if (SlimefunStartup.randomize(100) <= (60 + 40 / (e.getPlayer().getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.DURABILITY) + 1))) PlayerInventory.damageItemInHand(e.getPlayer()); + if (new Random().nextInt(100) <= (60 + 40 / (e.getPlayer().getInventory().getItemInMainHand().getEnchantmentLevel(Enchantment.DURABILITY) + 1))) PlayerInventory.damageItemInHand(e.getPlayer()); } else PlayerInventory.damageItemInHand(e.getPlayer()); @@ -2108,7 +2115,7 @@ public final class SlimefunSetup { public boolean onBlockBreak(BlockBreakEvent e, ItemStack item, int fortune, List drops) { if (SlimefunManager.isItemSimiliar(e.getPlayer().getInventory().getItemInMainHand(), SlimefunItems.PICKAXE_OF_VEIN_MINING, true)) { if (e.getBlock().getType().toString().endsWith("_ORE")) { - List blocks = new ArrayList(); + List blocks = new ArrayList<>(); Vein.calculate(e.getBlock().getLocation(), e.getBlock().getLocation(), blocks, 16); for (Location block: blocks) { Block b = block.getBlock(); @@ -2555,7 +2562,8 @@ public final class SlimefunSetup { PlayerInventory.consumeItemInHand(e.getPlayer()); FireworkShow.launchRandom(e.getPlayer(), 2); - List gifts = new ArrayList(); + List gifts = new ArrayList<>(); + for (int i = 0; i < 2; i++) { gifts.add(new CustomItem(SlimefunItems.EASTER_CARROT_PIE, 4)); gifts.add(new CustomItem(SlimefunItems.CHRISTMAS_APPLE_PIE, 4)); diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java index 77ff40444..63986e386 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunGuide.java @@ -289,10 +289,10 @@ public final class SlimefunGuide { clearHistory(p.getUniqueId()); if (book) { - List pages = new ArrayList(); - List texts = new ArrayList(); - List tooltips = new ArrayList(); - List actions = new ArrayList(); + List pages = new ArrayList<>(); + List texts = new ArrayList<>(); + List tooltips = new ArrayList<>(); + List actions = new ArrayList<>(); int tier = 0; @@ -501,7 +501,7 @@ public final class SlimefunGuide { index++; } else { - List parents = new ArrayList(); + List parents = new ArrayList<>(); parents.add(""); parents.add(ChatColor.translateAlternateColorCodes('&', "&rYou need to unlock all Items")); parents.add(ChatColor.translateAlternateColorCodes('&', "&rfrom the following Categories first:")); @@ -549,10 +549,10 @@ public final class SlimefunGuide { if (category == null) return; if (book && category.getItems().size() < 250) { - List pages = new ArrayList(); - List texts = new ArrayList(); - List tooltips = new ArrayList(); - List actions = new ArrayList(); + List pages = new ArrayList<>(); + List texts = new ArrayList<>(); + List tooltips = new ArrayList<>(); + List actions = new ArrayList<>(); for (final SlimefunItem item: category.getItems()) { if (Slimefun.hasPermission(p, item, false)) { diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java index 922f9daec..9179ad4b7 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunStartup.java @@ -100,7 +100,7 @@ public class SlimefunStartup extends JavaPlugin { private boolean coreProtect = false; // Supported Versions of Minecraft - final String[] supported = {"v1_14_"}; + private final String[] supported = {"v1_14_"}; @Override public void onEnable() { diff --git a/src/me/mrCookieSlime/Slimefun/androids/AndroidObject.java b/src/me/mrCookieSlime/Slimefun/androids/AndroidObject.java index 150be42a7..9f4d60d25 100644 --- a/src/me/mrCookieSlime/Slimefun/androids/AndroidObject.java +++ b/src/me/mrCookieSlime/Slimefun/androids/AndroidObject.java @@ -4,8 +4,8 @@ import org.bukkit.block.Block; public class AndroidObject { - ProgrammableAndroid android; - Block b; + private ProgrammableAndroid android; + private Block b; public AndroidObject(ProgrammableAndroid android, Block b) { this.android = android; diff --git a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java index db17690ce..3223523e9 100644 --- a/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java +++ b/src/me/mrCookieSlime/Slimefun/androids/ProgrammableAndroid.java @@ -273,80 +273,67 @@ public abstract class ProgrammableAndroid extends SlimefunItem { ScriptPart part = ScriptPart.valueOf(script[index]); if (getAndroidType().isType(part.getRequiredType())) { + BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); + double damage = getTier() < 2 ? 20D : 4D * getTier(); + switch (part) { - case GO_DOWN: { + case GO_DOWN: try { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); Block block = b.getRelative(BlockFace.DOWN); move(b, face, block); } catch (Exception e) { e.printStackTrace(); } break; - } - case GO_FORWARD: { + case GO_FORWARD: try { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); Block block = b.getRelative(face); move(b, face, block); } catch (Exception e) { e.printStackTrace(); } break; - } - case GO_UP: { + case GO_UP: try { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); Block block = b.getRelative(BlockFace.UP); move(b, face, block); } catch (Exception e) { e.printStackTrace(); } break; - } - case REPEAT: { + case REPEAT: BlockStorage.addBlockInfo(b, "index", String.valueOf(0)); break; - } - case TURN_LEFT: { - int rotIndex = directions.indexOf(BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) - 1; - if (rotIndex < 0) rotIndex = directions.size() - 1; - BlockFace dir = directions.get(rotIndex); - Rotatable blockData = (Rotatable) b.getBlockData(); - blockData.setRotation(dir); - b.setBlockData(blockData); - BlockStorage.addBlockInfo(b, "rotation", dir.toString()); + case TURN_LEFT: + int indexLeft = directions.indexOf(BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) - 1; + if (indexLeft < 0) indexLeft = directions.size() - 1; + Rotatable rotatableLeft = (Rotatable) b.getBlockData(); + rotatableLeft.setRotation(directions.get(indexLeft)); + b.setBlockData(rotatableLeft); + BlockStorage.addBlockInfo(b, "rotation", directions.get(indexLeft).toString()); break; - } case TURN_RIGHT: { - int rotIndex = directions.indexOf(BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) + 1; - if (rotIndex == directions.size()) rotIndex = 0; - BlockFace dir = directions.get(rotIndex); - Rotatable blockData = (Rotatable) b.getBlockData(); - blockData.setRotation(dir); - b.setBlockData(blockData); - BlockStorage.addBlockInfo(b, "rotation", dir.toString()); + int indexRight = directions.indexOf(BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) + 1; + if (indexRight == directions.size()) indexRight = 0; + Rotatable rotatableRight = (Rotatable) b.getBlockData(); + rotatableRight.setRotation(directions.get(indexRight)); + b.setBlockData(rotatableRight); + BlockStorage.addBlockInfo(b, "rotation", directions.get(indexRight).toString()); break; } - case DIG_FORWARD: { - Block block = b.getRelative(BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))); - mine(b, block); + case DIG_FORWARD: + mine(b, b.getRelative(face)); break; - } - case DIG_UP: { - Block block = b.getRelative(BlockFace.UP); - mine(b, block); + case DIG_UP: + mine(b, b.getRelative(BlockFace.UP)); break; - } - case DIG_DOWN: { - Block block = b.getRelative(BlockFace.DOWN); - mine(b, block); + case DIG_DOWN: + mine(b, b.getRelative(BlockFace.DOWN)); break; - } - case CATCH_FISH: { - Block block = b.getRelative(BlockFace.DOWN); - if (block.getType().equals(Material.WATER)) { - block.getWorld().playSound(block.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); + case CATCH_FISH: + Block water = b.getRelative(BlockFace.DOWN); + if (water.getType().equals(Material.WATER)) { + water.getWorld().playSound(water.getLocation(), Sound.ENTITY_PLAYER_SPLASH, 1F, 1F); if (CSCoreLib.randomizer().nextInt(100) < 10 * getTier()) { ItemStack drop = fish[CSCoreLib.randomizer().nextInt(fish.length)]; if (fits(b, drop)) pushItems(b, drop); @@ -354,30 +341,19 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } break; - } - case MOVE_AND_DIG_FORWARD: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - movedig(b, face, block); + case MOVE_AND_DIG_FORWARD: + movedig(b, face, b.getRelative(face)); break; - } case MOVE_AND_DIG_UP: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(BlockFace.UP); - movedig(b, face, block); + movedig(b, face, b.getRelative(BlockFace.UP)); break; } - case MOVE_AND_DIG_DOWN: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(BlockFace.DOWN); - movedig(b, face, block); + case MOVE_AND_DIG_DOWN: + movedig(b, face, b.getRelative(BlockFace.DOWN)); break; - } - case INTERFACE_ITEMS: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - if (BlockStorage.check(block, "ANDROID_INTERFACE_ITEMS") && block.getState() instanceof Dispenser) { - Dispenser d = (Dispenser) block.getState(); + case INTERFACE_ITEMS: + if (BlockStorage.check(b.getRelative(face), "ANDROID_INTERFACE_ITEMS") && b.getRelative(face).getState() instanceof Dispenser) { + Dispenser d = (Dispenser) b.getRelative(face).getState(); for (int slot: getOutputSlots()) { ItemStack stack = BlockStorage.getInventory(b).getItemInSlot(slot); if (stack != null) { @@ -393,12 +369,9 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - case INTERFACE_FUEL: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - if (BlockStorage.check(block, "ANDROID_INTERFACE_FUEL") && block.getState() instanceof Dispenser) { - Dispenser d = (Dispenser) block.getState(); + case INTERFACE_FUEL: + if (BlockStorage.check(b.getRelative(face), "ANDROID_INTERFACE_FUEL") && b.getRelative(face).getState() instanceof Dispenser) { + Dispenser d = (Dispenser) b.getRelative(face).getState(); for (int slot = 0; slot < 9; slot++) { ItemStack item = d.getInventory().getItem(slot); if (item != null) { @@ -420,36 +393,23 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - case FARM_FORWARD: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - farm(b, block); + case FARM_FORWARD: + farm(b, b.getRelative(face)); break; - } - case FARM_DOWN: { - Block block = b.getRelative(BlockFace.DOWN); - farm(b, block); + case FARM_DOWN: + farm(b, b.getRelative(BlockFace.DOWN)); break; - } - case FARM_EXOTIC_FORWARD: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - exoticFarm(b, block); + case FARM_EXOTIC_FORWARD: + exoticFarm(b, b.getRelative(face)); break; - } - case FARM_EXOTIC_DOWN: { - Block block = b.getRelative(BlockFace.DOWN); - exoticFarm(b, block); + case FARM_EXOTIC_DOWN: + exoticFarm(b, b.getRelative(BlockFace.DOWN)); break; - } - case CHOP_TREE: { - BlockFace face = BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation")); - Block block = b.getRelative(face); - if (MaterialHelper.isLog( block.getType())) { - List list = new ArrayList(); - list.add(block.getLocation()); - TreeCalculator.getTree(block.getLocation(), block.getLocation(), list); + case CHOP_TREE: + if (MaterialHelper.isLog(b.getRelative(face).getType())) { + List list = new ArrayList<>(); + list.add(b.getRelative(face).getLocation()); + TreeCalculator.getTree(b.getRelative(face).getLocation(), b.getRelative(face).getLocation(), list); if (!list.isEmpty()) { refresh = false; Block log = list.get(list.size() - 1).getBlock(); @@ -460,7 +420,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { if (fits(b, items)) { pushItems(b, items); log.getWorld().playEffect(log.getLocation(), Effect.STEP_SOUND, log.getType()); - if (log.getY() == block.getY()) { + if (log.getY() == b.getRelative(face).getY()) { log.setType(MaterialHelper.getSaplingFromLog(log.getType())); } else log.setType(Material.AIR); @@ -470,10 +430,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - case ATTACK_MOBS_ANIMALS: { - double damage = getTier() < 2 ? 20D : 4D * getTier(); - + case ATTACK_MOBS_ANIMALS: entities: for (Entity n: AndroidStatusHologram.getNearbyEntities(b, 4D + getTier())) { switch (BlockFace.valueOf(BlockStorage.getLocationInfo(b.getLocation(), "rotation"))) { @@ -522,10 +479,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - case ATTACK_MOBS: { - double damage = getTier() < 2 ? 20D : 4D * getTier(); - + case ATTACK_MOBS: entities: for (Entity n: AndroidStatusHologram.getNearbyEntities(b, 4D + getTier())) { if (n instanceof Animals) continue; @@ -575,11 +529,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - - case ATTACK_ANIMALS: { - double damage = getTier() < 2 ? 20D : 4D * getTier(); - + case ATTACK_ANIMALS: entities: for (Entity n: AndroidStatusHologram.getNearbyEntities(b, 4D + getTier())) { if (n instanceof Monster) continue; @@ -629,11 +579,7 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } - - case ATTACK_ANIMALS_ADULT: { - double damage = getTier() < 2 ? 20D : 4D * getTier(); - + case ATTACK_ANIMALS_ADULT: entities: for (Entity n: AndroidStatusHologram.getNearbyEntities(b, 4D + getTier())) { if (n instanceof Monster) continue; @@ -684,7 +630,6 @@ public abstract class ProgrammableAndroid extends SlimefunItem { } } break; - } default: break; } diff --git a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java index b11f58920..7e30f866c 100644 --- a/src/me/mrCookieSlime/Slimefun/api/Slimefun.java +++ b/src/me/mrCookieSlime/Slimefun/api/Slimefun.java @@ -259,7 +259,7 @@ public class Slimefun { * @return the list of all the IDs of the enabled items. */ public static List listIDs() { - List ids = new ArrayList(); + List ids = new ArrayList<>(); for (SlimefunItem item: SlimefunItem.list()) { ids.add(item.getID()); } @@ -273,7 +273,7 @@ public class Slimefun { * @see #current_categories */ public static List listCategories() { - List items = new ArrayList(); + List items = new ArrayList<>(); for (Category c: Category.list()) { items.add(c.getItem()); } @@ -348,6 +348,6 @@ public class Slimefun { } public static List getGuideHandlers(int tier) { - return guide_handlers.containsKey(tier) ? guide_handlers.get(tier): new ArrayList(); + return guide_handlers.containsKey(tier) ? guide_handlers.get(tier): new ArrayList<>(); } } \ No newline at end of file diff --git a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java index 223afe8e6..c6fd1e35f 100644 --- a/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/energy/EnergyNet.java @@ -26,9 +26,9 @@ public class EnergyNet extends Network { private static final int RANGE = 6; - public static Set machines_input = new HashSet(); - public static Set machines_storage = new HashSet(); - public static Set machines_output = new HashSet(); + public static Set machines_input = new HashSet<>(); + public static Set machines_storage = new HashSet<>(); + public static Set machines_output = new HashSet<>(); public static NetworkComponent getComponent(Block b) { return getComponent(b.getLocation()); @@ -79,9 +79,9 @@ public class EnergyNet extends Network { return energy_network; } - private Set input = new HashSet(); - private Set storage = new HashSet(); - private Set output = new HashSet(); + private Set input = new HashSet<>(); + private Set storage = new HashSet<>(); + private Set output = new HashSet<>(); protected EnergyNet(Location l) { super(l); diff --git a/src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java b/src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java index e2a982d9f..5f611d72c 100644 --- a/src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java +++ b/src/me/mrCookieSlime/Slimefun/api/inventory/UniversalBlockMenu.java @@ -12,8 +12,8 @@ import me.mrCookieSlime.CSCoreLibPlugin.Configuration.Config; public class UniversalBlockMenu extends DirtyChestMenu { - BlockMenuPreset preset; - ItemManipulationEvent event; + private BlockMenuPreset preset; + private ItemManipulationEvent event; public UniversalBlockMenu(BlockMenuPreset preset) { super(preset.getTitle()); diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java index 9fe206b40..5a67ee143 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoManager.java @@ -202,7 +202,7 @@ public class CargoManager { boolean data = blockInfo.getString("filter-durability").equals("true"); if (blockInfo.getString("filter-type").equals("whitelist")) { - List items = new ArrayList(); + List items = new ArrayList<>(); for (int slot: slots) { ItemStack template = menu.getItemInSlot(slot); if (template != null) items.add(new CustomItem(template, 1)); diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java index 72112f786..90d5f172c 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/CargoNet.java @@ -33,6 +33,7 @@ import me.mrCookieSlime.Slimefun.api.network.Network; import me.mrCookieSlime.Slimefun.holograms.CargoHologram; public class CargoNet extends Network { + public static boolean EXTRA_CHANNELS = false; private static final int RANGE = 5; @@ -67,15 +68,15 @@ public class CargoNet extends Network { return getNetworkFromLocation(b.getLocation()) != null; } - private Set inputNodes = new HashSet(); - private Set outputNodes = new HashSet(); - private Set advancedOutputNodes = new HashSet(); + private Set inputNodes = new HashSet<>(); + private Set outputNodes = new HashSet<>(); + private Set advancedOutputNodes = new HashSet<>(); //Chest Terminal Stuff - final Set terminals = new HashSet(); - final Set imports = new HashSet(); - final Set exports = new HashSet(); + private final Set terminals = new HashSet<>(); + private final Set imports = new HashSet<>(); + private final Set exports = new HashSet<>(); protected CargoNet(Location l) { super(l); diff --git a/src/me/mrCookieSlime/Slimefun/api/item_transport/ItemRequest.java b/src/me/mrCookieSlime/Slimefun/api/item_transport/ItemRequest.java index ee6d54199..1ff9215fc 100644 --- a/src/me/mrCookieSlime/Slimefun/api/item_transport/ItemRequest.java +++ b/src/me/mrCookieSlime/Slimefun/api/item_transport/ItemRequest.java @@ -5,10 +5,10 @@ import org.bukkit.inventory.ItemStack; public class ItemRequest { - ItemStack item; - ItemTransportFlow flow; - Location terminal; - int slot; + private ItemStack item; + private ItemTransportFlow flow; + private Location terminal; + private int slot; public ItemRequest(Location terminal, int slot, ItemStack item, ItemTransportFlow flow) { this.terminal = terminal; diff --git a/src/me/mrCookieSlime/Slimefun/commands/SlimefunTabCompleter.java b/src/me/mrCookieSlime/Slimefun/commands/SlimefunTabCompleter.java index ca644427c..2e8601421 100644 --- a/src/me/mrCookieSlime/Slimefun/commands/SlimefunTabCompleter.java +++ b/src/me/mrCookieSlime/Slimefun/commands/SlimefunTabCompleter.java @@ -22,7 +22,7 @@ public class SlimefunTabCompleter implements TabCompleter { return createReturnList(Slimefun.listIDs(), args[2]); } else if (args[0].equalsIgnoreCase("research")) { - List researches = new ArrayList(); + List researches = new ArrayList<>(); for (Research res : Research.list()) { researches.add(res.getName().toUpperCase().replace(" ", "_")); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java index d2c86fb2c..57b6a1410 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java @@ -119,7 +119,7 @@ public class DamageListener implements Listener { if (!e.getEntity().getCanPickupItems() && Talisman.checkFor(e, SlimefunItem.getByID("HUNTER_TALISMAN")) && !(e.getEntity() instanceof Player)) { - List newDrops = new ArrayList(); + List newDrops = new ArrayList<>(); for (ItemStack drop : e.getDrops()) { newDrops.add(drop); } diff --git a/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java b/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java index 7cf52335f..29bb56c8b 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/TeleporterListener.java @@ -15,7 +15,7 @@ import org.bukkit.event.player.PlayerInteractEvent; public class TeleporterListener implements Listener { - BlockFace[] faces = {BlockFace.NORTH, BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST, BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST}; + private final BlockFace[] faces = {BlockFace.NORTH, BlockFace.NORTH_EAST, BlockFace.EAST, BlockFace.SOUTH_EAST, BlockFace.SOUTH, BlockFace.SOUTH_WEST, BlockFace.WEST, BlockFace.NORTH_WEST}; public TeleporterListener(SlimefunStartup plugin) { plugin.getServer().getPluginManager().registerEvents(this, plugin);