From 0ca9e5fb14799343b1e7a3c347b184f9450ff9e7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 5 Aug 2016 17:04:13 +0200 Subject: [PATCH] J8 fixes --- .../java/refinedstorage/RefinedStorage.java | 2 +- .../autocrafting/BasicCraftingTask.java | 2 +- .../apiimpl/network/NetworkNodeGraph.java | 16 +++++----- .../apiimpl/network/WirelessGridHandler.java | 4 +-- .../apiimpl/solderer/SoldererRegistry.java | 2 +- .../apiimpl/storage/GroupedStorage.java | 11 +++---- .../apiimpl/storage/NBTStorage.java | 2 +- .../refinedstorage/block/BlockController.java | 4 +-- .../java/refinedstorage/block/BlockGrid.java | 2 +- .../refinedstorage/block/BlockStorage.java | 4 +-- .../container/slot/SlotSpecimen.java | 4 +-- src/main/java/refinedstorage/gui/GuiBase.java | 8 ++--- .../java/refinedstorage/gui/grid/GuiGrid.java | 2 +- .../integration/jei/RecipeMakerSolderer.java | 4 +-- .../refinedstorage/item/ItemBlockStorage.java | 4 +-- .../java/refinedstorage/item/ItemCore.java | 2 +- .../refinedstorage/item/ItemGridFilter.java | 6 ++-- .../java/refinedstorage/item/ItemPattern.java | 6 ++-- .../refinedstorage/item/ItemProcessor.java | 2 +- .../refinedstorage/item/ItemStorageDisk.java | 8 ++--- .../refinedstorage/item/ItemStoragePart.java | 2 +- .../java/refinedstorage/item/ItemUpgrade.java | 2 +- .../refinedstorage/item/ItemWirelessGrid.java | 15 +++------- .../network/MessageGridUpdate.java | 2 +- .../network/MessageHandlerPlayerToServer.java | 7 +---- .../network/MessageTileDataParameter.java | 2 +- .../MessageTileDataParameterUpdate.java | 2 +- .../refinedstorage/tile/TileController.java | 30 ++++++++----------- .../java/refinedstorage/tile/TileCrafter.java | 9 ++---- .../tile/TileCraftingMonitor.java | 2 +- .../java/refinedstorage/tile/TileNode.java | 2 +- .../java/refinedstorage/tile/TileStorage.java | 2 +- .../tile/config/IPrioritizable.java | 20 ++++++------- .../tile/data/TileDataManager.java | 8 ++--- .../tile/data/TileDataParameter.java | 13 ++++---- .../externalstorage/ItemHandlerStorage.java | 2 +- .../externalstorage/TileExternalStorage.java | 2 +- .../refinedstorage/tile/grid/TileGrid.java | 4 +-- .../tile/grid/WirelessGrid.java | 2 +- 39 files changed, 98 insertions(+), 125 deletions(-) diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java index 67c7ba9c6..96f39cba7 100755 --- a/src/main/java/refinedstorage/RefinedStorage.java +++ b/src/main/java/refinedstorage/RefinedStorage.java @@ -44,7 +44,7 @@ public final class RefinedStorage { } }; - public List items = new ArrayList(); + public List items = new ArrayList<>(); public int controllerBaseUsage; public int cableUsage; diff --git a/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java b/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java index 6f0f1f723..2cf382c64 100755 --- a/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java +++ b/src/main/java/refinedstorage/apiimpl/autocrafting/BasicCraftingTask.java @@ -26,7 +26,7 @@ public class BasicCraftingTask implements ICraftingTask { private boolean satisfied[]; private boolean checked[]; private boolean childTasks[]; - private List itemsTook = new ArrayList(); + private List itemsTook = new ArrayList<>(); private boolean updatedOnce; public BasicCraftingTask(ICraftingPattern pattern) { diff --git a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java b/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java index ad97744d2..fbba0e23a 100755 --- a/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java +++ b/src/main/java/refinedstorage/apiimpl/network/NetworkNodeGraph.java @@ -15,8 +15,8 @@ import java.util.*; public class NetworkNodeGraph implements INetworkNodeGraph { private TileController controller; - private List nodes = new ArrayList(); - private Set nodeHashes = new HashSet(); + private List nodes = new ArrayList<>(); + private Set nodeHashes = new HashSet<>(); public NetworkNodeGraph(TileController controller) { this.controller = controller; @@ -40,11 +40,11 @@ public class NetworkNodeGraph implements INetworkNodeGraph { World world = getWorld(); - List newNodes = new ArrayList(); - Set newNodeHashes = new HashSet(); + List newNodes = new ArrayList<>(); + Set newNodeHashes = new HashSet<>(); - Set checked = new HashSet(); - Queue toCheck = new ArrayDeque(); + Set checked = new HashSet<>(); + Queue toCheck = new ArrayDeque<>(); checked.add(start); toCheck.add(start); @@ -110,8 +110,8 @@ public class NetworkNodeGraph implements INetworkNodeGraph { } } - List oldNodes = new ArrayList(nodes); - Set oldNodeHashes = new HashSet(nodeHashes); + List oldNodes = new ArrayList<>(nodes); + Set oldNodeHashes = new HashSet<>(nodeHashes); this.nodes = newNodes; this.nodeHashes = newNodeHashes; diff --git a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java index 5aee28fce..aabf4d052 100755 --- a/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/WirelessGridHandler.java @@ -20,8 +20,8 @@ public class WirelessGridHandler implements IWirelessGridHandler { private INetworkMaster network; - private List consumers = new ArrayList(); - private List consumersToRemove = new ArrayList(); + private List consumers = new ArrayList<>(); + private List consumersToRemove = new ArrayList<>(); public WirelessGridHandler(INetworkMaster network) { this.network = network; diff --git a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java index 6a08d30c3..971b5aade 100755 --- a/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java +++ b/src/main/java/refinedstorage/apiimpl/solderer/SoldererRegistry.java @@ -11,7 +11,7 @@ import java.util.ArrayList; import java.util.List; public class SoldererRegistry implements ISoldererRegistry { - private List recipes = new ArrayList(); + private List recipes = new ArrayList<>(); @Override public void addRecipe(@Nonnull ISoldererRecipe recipe) { diff --git a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java index be2aa0b27..a2b26d99b 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/GroupedStorage.java @@ -6,7 +6,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import refinedstorage.api.autocrafting.ICraftingPattern; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.network.INetworkNode; import refinedstorage.api.network.NetworkUtils; import refinedstorage.api.storage.CompareUtils; import refinedstorage.api.storage.IGroupedStorage; @@ -21,7 +20,7 @@ import java.util.List; public class GroupedStorage implements IGroupedStorage { private INetworkMaster network; - private List storages = new ArrayList(); + private List storages = new ArrayList<>(); private Multimap stacks = ArrayListMultimap.create(); public GroupedStorage(INetworkMaster network) { @@ -32,11 +31,9 @@ public class GroupedStorage implements IGroupedStorage { public void rebuild() { storages.clear(); - for (INetworkNode node : network.getNodeGraph().all()) { - if (node.canUpdate() && node instanceof IStorageProvider) { - ((IStorageProvider) node).addStorages(storages); - } - } + network.getNodeGraph().all().stream() + .filter(node -> node.canUpdate() && node instanceof IStorageProvider) + .forEach(node -> ((IStorageProvider) node).addStorages(storages)); stacks.clear(); diff --git a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java b/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java index d71a68137..a2c0cff6d 100755 --- a/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java +++ b/src/main/java/refinedstorage/apiimpl/storage/NBTStorage.java @@ -38,7 +38,7 @@ public abstract class NBTStorage implements IStorage { private int capacity; private TileEntity tile; - private List stacks = new ArrayList(); + private List stacks = new ArrayList<>(); /** * @param tag The NBT tag we are reading from and writing the amount stored to, has to be initialized with {@link NBTStorage#createNBT()} if it doesn't exist yet diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index a7826fed7..549f59587 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -36,7 +36,7 @@ public class BlockController extends BlockBase { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { for (int i = 0; i <= 1; i++) { subItems.add(ItemBlockController.createStackWithNBT(new ItemStack(item, 1, i))); } @@ -122,7 +122,7 @@ public class BlockController extends BlockBase { @Override public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { - List drops = new ArrayList(); + List drops = new ArrayList<>(); ItemStack stack = new ItemStack(RefinedStorageBlocks.CONTROLLER, 1, RefinedStorageBlocks.CONTROLLER.getMetaFromState(state)); diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index e653dd5b6..41e5841eb 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -32,7 +32,7 @@ public class BlockGrid extends BlockNode { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { for (int i = 0; i <= 2; i++) { subItems.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index 02e4b7a5b..719d88895 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -34,7 +34,7 @@ public class BlockStorage extends BlockNode { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { + public void getSubBlocks(Item item, CreativeTabs tab, List subItems) { for (int i = 0; i <= 4; ++i) { subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); } @@ -91,7 +91,7 @@ public class BlockStorage extends BlockNode { public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) { TileStorage storage = (TileStorage) world.getTileEntity(pos); - List drops = new ArrayList(); + List drops = new ArrayList<>(); ItemStack stack = new ItemStack(RefinedStorageBlocks.STORAGE, 1, RefinedStorageBlocks.STORAGE.getMetaFromState(state)); stack.setTagCompound(new NBTTagCompound()); diff --git a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java index e936b08c4..9d4930a92 100755 --- a/src/main/java/refinedstorage/container/slot/SlotSpecimen.java +++ b/src/main/java/refinedstorage/container/slot/SlotSpecimen.java @@ -67,9 +67,7 @@ public class SlotSpecimen extends SlotItemHandler { Field f = ((ItemBlockSpecial) item).getClass().getDeclaredField("block"); f.setAccessible(true); return ((Block) f.get(item)).getDefaultState(); - } catch (IllegalAccessException e) { - // NO OP - } catch (NoSuchFieldException e) { + } catch (IllegalAccessException | NoSuchFieldException e) { // NO OP } } else if (item instanceof ItemBlock) { diff --git a/src/main/java/refinedstorage/gui/GuiBase.java b/src/main/java/refinedstorage/gui/GuiBase.java index 229140985..17824d823 100755 --- a/src/main/java/refinedstorage/gui/GuiBase.java +++ b/src/main/java/refinedstorage/gui/GuiBase.java @@ -21,7 +21,7 @@ public abstract class GuiBase extends GuiContainer { protected static final int SIDE_BUTTON_WIDTH = 20; protected static final int SIDE_BUTTON_HEIGHT = 20; - private List sideButtons = new ArrayList(); + private List sideButtons = new ArrayList<>(); private int lastButtonId = 0; private int lastSideButtonY = 6; @@ -136,11 +136,7 @@ public abstract class GuiBase extends GuiContainer { protected void actionPerformed(GuiButton button) throws IOException { super.actionPerformed(button); - for (SideButton sideButton : sideButtons) { - if (sideButton.getId() == button.id) { - sideButton.actionPerformed(); - } - } + sideButtons.stream().filter(b -> b.getId() == button.id).findFirst().ifPresent(s -> s.actionPerformed()); } public GuiButton addButton(int x, int y, int w, int h) { diff --git a/src/main/java/refinedstorage/gui/grid/GuiGrid.java b/src/main/java/refinedstorage/gui/grid/GuiGrid.java index 942dcd223..7ffcf2973 100755 --- a/src/main/java/refinedstorage/gui/grid/GuiGrid.java +++ b/src/main/java/refinedstorage/gui/grid/GuiGrid.java @@ -40,7 +40,7 @@ public class GuiGrid extends GuiBase { public static GuiTextField SEARCH_FIELD; private ContainerGrid container; - private List items = new ArrayList(); + private List items = new ArrayList<>(); private IGrid grid; private int slotNumber; diff --git a/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java b/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java index 769458340..727e66d01 100755 --- a/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java +++ b/src/main/java/refinedstorage/integration/jei/RecipeMakerSolderer.java @@ -9,10 +9,10 @@ import java.util.List; public final class RecipeMakerSolderer { public static List getRecipes() { - List recipes = new ArrayList(); + List recipes = new ArrayList<>(); for (ISoldererRecipe recipe : RefinedStorageAPI.SOLDERER_REGISTRY.getRecipes()) { - List inputs = new ArrayList(); + List inputs = new ArrayList<>(); inputs.add(recipe.getRow(0)); inputs.add(recipe.getRow(1)); diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index 8cb21a1a7..1de4ade44 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -55,10 +55,10 @@ public class ItemBlockStorage extends ItemBlockBase { InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), processor); } - return new ActionResult(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageBlocks.MACHINE_CASING)); + return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageBlocks.MACHINE_CASING)); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } private static boolean isValid(ItemStack stack) { diff --git a/src/main/java/refinedstorage/item/ItemCore.java b/src/main/java/refinedstorage/item/ItemCore.java index 9028b7aee..26515b552 100755 --- a/src/main/java/refinedstorage/item/ItemCore.java +++ b/src/main/java/refinedstorage/item/ItemCore.java @@ -18,7 +18,7 @@ public class ItemCore extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 2; ++i) { list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/refinedstorage/item/ItemGridFilter.java b/src/main/java/refinedstorage/item/ItemGridFilter.java index 001377a19..24a3fbd9e 100755 --- a/src/main/java/refinedstorage/item/ItemGridFilter.java +++ b/src/main/java/refinedstorage/item/ItemGridFilter.java @@ -28,15 +28,15 @@ public class ItemGridFilter extends ItemBase { public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote) { if (player.isSneaking()) { - return new ActionResult(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.GRID_FILTER)); + return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.GRID_FILTER)); } player.openGui(RefinedStorage.INSTANCE, RefinedStorageGui.GRID_FILTER, world, hand.ordinal(), 0, 0); - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } @Override diff --git a/src/main/java/refinedstorage/item/ItemPattern.java b/src/main/java/refinedstorage/item/ItemPattern.java index df3db4a88..ec129af2c 100755 --- a/src/main/java/refinedstorage/item/ItemPattern.java +++ b/src/main/java/refinedstorage/item/ItemPattern.java @@ -45,7 +45,7 @@ public class ItemPattern extends ItemBase { } public static void combineItems(List tooltip, ItemStack... stacks) { - Set combinedIndices = new HashSet(); + Set combinedIndices = new HashSet<>(); for (int i = 0; i < stacks.length; ++i) { if (stacks[i] != null && !combinedIndices.contains(i)) { @@ -73,10 +73,10 @@ public class ItemPattern extends ItemBase { @Override public ActionResult onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand) { if (!world.isRemote && player.isSneaking()) { - return new ActionResult(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.PATTERN)); + return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.PATTERN)); } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } public static void addInput(ItemStack pattern, ItemStack stack) { diff --git a/src/main/java/refinedstorage/item/ItemProcessor.java b/src/main/java/refinedstorage/item/ItemProcessor.java index b60613ff1..3e4d807e4 100755 --- a/src/main/java/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/refinedstorage/item/ItemProcessor.java @@ -23,7 +23,7 @@ public class ItemProcessor extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i <= 6; ++i) { list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index 23ce83613..1558ee515 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -39,7 +39,7 @@ public class ItemStorageDisk extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i < 5; ++i) { list.add(NBTStorage.createStackWithNBT(new ItemStack(item, 1, i))); } @@ -75,7 +75,7 @@ public class ItemStorageDisk extends ItemBase { Item item = it.next(); if (item != RefinedStorageItems.STORAGE_DISK) { - List stacks = new ArrayList(); + List stacks = new ArrayList<>(); item.getSubItems(item, CreativeTabs.INVENTORY, stacks); @@ -113,10 +113,10 @@ public class ItemStorageDisk extends ItemBase { InventoryHelper.spawnItemStack(world, player.getPosition().getX(), player.getPosition().getY(), player.getPosition().getZ(), storagePart); } - return new ActionResult(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.STORAGE_HOUSING)); + return new ActionResult<>(EnumActionResult.SUCCESS, new ItemStack(RefinedStorageItems.STORAGE_HOUSING)); } - return new ActionResult(EnumActionResult.PASS, disk); + return new ActionResult<>(EnumActionResult.PASS, disk); } @Override diff --git a/src/main/java/refinedstorage/item/ItemStoragePart.java b/src/main/java/refinedstorage/item/ItemStoragePart.java index 509378f43..b643e9780 100755 --- a/src/main/java/refinedstorage/item/ItemStoragePart.java +++ b/src/main/java/refinedstorage/item/ItemStoragePart.java @@ -20,7 +20,7 @@ public class ItemStoragePart extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i <= 3; ++i) { list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index 863a1b337..7d12b0e5d 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -25,7 +25,7 @@ public class ItemUpgrade extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { for (int i = 0; i <= 5; ++i) { list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/refinedstorage/item/ItemWirelessGrid.java b/src/main/java/refinedstorage/item/ItemWirelessGrid.java index fa1db8e04..18bb0ed4a 100755 --- a/src/main/java/refinedstorage/item/ItemWirelessGrid.java +++ b/src/main/java/refinedstorage/item/ItemWirelessGrid.java @@ -9,7 +9,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.IItemPropertyGetter; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -48,18 +47,12 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle public ItemWirelessGrid() { super(3200); - addPropertyOverride(new ResourceLocation("connected"), new IItemPropertyGetter() { - @Override - public float apply(ItemStack stack, World world, EntityLivingBase entity) { - return (entity != null && isValid(stack) && getDimensionId(stack) == entity.dimension) ? 1.0f : 0.0f; - } - }); - setRegistryName(RefinedStorage.ID, "wireless_grid"); setMaxDamage(3200); setMaxStackSize(1); setHasSubtypes(true); setCreativeTab(RefinedStorage.INSTANCE.tab); + addPropertyOverride(new ResourceLocation("connected"), (stack, world, entity) -> (entity != null && isValid(stack) && getDimensionId(stack) == entity.dimension) ? 1.0f : 0.0f); } @Override @@ -93,7 +86,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle } @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { + public void getSubItems(Item item, CreativeTabs tab, List list) { list.add(new ItemStack(item, 1, TYPE_NORMAL)); ItemStack fullyCharged = new ItemStack(item, 1, TYPE_NORMAL); @@ -149,7 +142,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle if (tile instanceof TileController) { if (((TileController) tile).getWirelessGridHandler().onOpen(player, hand)) { - return new ActionResult(EnumActionResult.SUCCESS, stack); + return new ActionResult<>(EnumActionResult.SUCCESS, stack); } else { player.addChatComponentMessage(new TextComponentTranslation("misc.refinedstorage:wireless_grid.out_of_range")); } @@ -158,7 +151,7 @@ public class ItemWirelessGrid extends ItemEnergyContainer implements ISpecialEle } } - return new ActionResult(EnumActionResult.PASS, stack); + return new ActionResult<>(EnumActionResult.PASS, stack); } public static int getDimensionId(ItemStack stack) { diff --git a/src/main/java/refinedstorage/network/MessageGridUpdate.java b/src/main/java/refinedstorage/network/MessageGridUpdate.java index bcf87f8ec..587bcfeb0 100755 --- a/src/main/java/refinedstorage/network/MessageGridUpdate.java +++ b/src/main/java/refinedstorage/network/MessageGridUpdate.java @@ -14,7 +14,7 @@ import java.util.List; public class MessageGridUpdate implements IMessage, IMessageHandler { private INetworkMaster network; - private List items = new ArrayList(); + private List items = new ArrayList<>(); public MessageGridUpdate() { } diff --git a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java index 42dd45673..de261d388 100755 --- a/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java +++ b/src/main/java/refinedstorage/network/MessageHandlerPlayerToServer.java @@ -10,12 +10,7 @@ public abstract class MessageHandlerPlayerToServer implement public IMessage onMessage(final T message, MessageContext context) { final EntityPlayerMP player = context.getServerHandler().playerEntity; - player.getServerWorld().addScheduledTask(new Runnable() { - @Override - public void run() { - handle(message, player); - } - }); + player.getServerWorld().addScheduledTask(() -> handle(message, player)); return null; } diff --git a/src/main/java/refinedstorage/network/MessageTileDataParameter.java b/src/main/java/refinedstorage/network/MessageTileDataParameter.java index 021183a6c..c57daa17f 100755 --- a/src/main/java/refinedstorage/network/MessageTileDataParameter.java +++ b/src/main/java/refinedstorage/network/MessageTileDataParameter.java @@ -32,7 +32,7 @@ public class MessageTileDataParameter implements IMessage, IMessageHandler patterns = new ArrayList(); + private List patterns = new ArrayList<>(); - private Stack craftingTasks = new Stack(); - private List craftingTasksToAddAsLast = new ArrayList(); - private List craftingTasksToAdd = new ArrayList(); - private List craftingTasksToCancel = new ArrayList(); + private Stack craftingTasks = new Stack<>(); + private List craftingTasksToAddAsLast = new ArrayList<>(); + private List craftingTasksToAdd = new ArrayList<>(); + private List craftingTasksToCancel = new ArrayList<>(); private EnergyStorage energy = new EnergyStorage(RefinedStorage.INSTANCE.controllerCapacity); private IControllerEnergyIC2 energyEU; @@ -122,7 +122,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR private RedstoneMode redstoneMode = RedstoneMode.IGNORE; - private List clientNodes = new ArrayList(); + private List clientNodes = new ArrayList<>(); public TileController() { dataManager.addWatchedParameter(REDSTONE_MODE); @@ -318,7 +318,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public List getPatterns(ItemStack pattern, int flags) { - List patterns = new ArrayList(); + List patterns = new ArrayList<>(); for (ICraftingPattern craftingPattern : getPatterns()) { for (ItemStack output : craftingPattern.getOutputs()) { @@ -391,11 +391,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageToClient() { - for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { - if (isWatchingGrid(player)) { - sendStorageToClient((EntityPlayerMP) player); - } - } + worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream().filter(player -> isWatchingGrid(player)).forEach(player -> { + sendStorageToClient(player); + }); } @Override @@ -405,11 +403,9 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR @Override public void sendStorageDeltaToClient(ItemStack stack, int delta) { - for (EntityPlayer player : worldObj.getMinecraftServer().getPlayerList().getPlayerList()) { - if (isWatchingGrid(player)) { - RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), (EntityPlayerMP) player); - } - } + worldObj.getMinecraftServer().getPlayerList().getPlayerList().stream().filter(player -> isWatchingGrid(player)).forEach(player -> { + RefinedStorage.INSTANCE.network.sendTo(new MessageGridDelta(this, stack, delta), player); + }); } private boolean isWatchingGrid(EntityPlayer player) { diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 4c2b5334f..753721bed 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -9,7 +9,6 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageItems; import refinedstorage.api.autocrafting.ICraftingPatternContainer; -import refinedstorage.api.autocrafting.ICraftingTask; import refinedstorage.api.network.INetworkMaster; import refinedstorage.inventory.ItemHandlerBasic; import refinedstorage.inventory.ItemHandlerUpgrade; @@ -50,11 +49,9 @@ public class TileCrafter extends TileNode implements ICraftingPatternContainer { @Override public void onConnectionChange(INetworkMaster network, boolean state) { if (!state) { - for (ICraftingTask task : network.getCraftingTasks()) { - if (task.getPattern().getContainerPosition().equals(pos)) { - network.cancelCraftingTask(task); - } - } + network.getCraftingTasks().stream() + .filter(task -> task.getPattern().getContainerPosition().equals(pos)) + .forEach(network::cancelCraftingTask); } network.rebuildPatterns(); diff --git a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java index 7d62ec87c..ed5ee141a 100755 --- a/src/main/java/refinedstorage/tile/TileCraftingMonitor.java +++ b/src/main/java/refinedstorage/tile/TileCraftingMonitor.java @@ -8,7 +8,7 @@ import java.util.List; // @TODO: Make this work! public class TileCraftingMonitor extends TileNode { - private List tasks = new ArrayList(); + private List tasks = new ArrayList<>(); @Override public int getEnergyUsage() { diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/refinedstorage/tile/TileNode.java index fa3236977..ec4a2e1a8 100755 --- a/src/main/java/refinedstorage/tile/TileNode.java +++ b/src/main/java/refinedstorage/tile/TileNode.java @@ -13,7 +13,7 @@ import refinedstorage.tile.config.RedstoneMode; import refinedstorage.tile.data.TileDataParameter; public abstract class TileNode extends TileBase implements INetworkNode, IRedstoneConfigurable { - public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); + public static final TileDataParameter REDSTONE_MODE = RedstoneMode.createParameter(); private static final String NBT_CONNECTED = "Connected"; diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java index 43fa7a0c8..55f79d572 100755 --- a/src/main/java/refinedstorage/tile/TileStorage.java +++ b/src/main/java/refinedstorage/tile/TileStorage.java @@ -251,7 +251,7 @@ public class TileStorage extends TileNode implements IStorageProvider, IStorageG @Override public int getStored() { - return (int) STORED.getValue(); + return STORED.getValue(); } @Override diff --git a/src/main/java/refinedstorage/tile/config/IPrioritizable.java b/src/main/java/refinedstorage/tile/config/IPrioritizable.java index 54810bb49..bb86fc427 100755 --- a/src/main/java/refinedstorage/tile/config/IPrioritizable.java +++ b/src/main/java/refinedstorage/tile/config/IPrioritizable.java @@ -7,10 +7,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.relauncher.Side; import refinedstorage.gui.GuiStorage; -import refinedstorage.tile.data.*; +import refinedstorage.tile.data.ITileDataConsumer; +import refinedstorage.tile.data.ITileDataProducer; +import refinedstorage.tile.data.TileDataManager; +import refinedstorage.tile.data.TileDataParameter; public interface IPrioritizable { - static TileDataParameter createParameter() { + static TileDataParameter createParameter() { return TileDataManager.createParameter(DataSerializers.VARINT, new ITileDataProducer() { @Override public Integer getValue(T tile) { @@ -21,15 +24,12 @@ public interface IPrioritizable { public void setValue(T tile, Integer value) { ((IPrioritizable) tile).setPriority(value); } - }, new ITileDataListener() { - @Override - public void onChanged(TileDataParameter parameter) { - if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { - GuiScreen gui = Minecraft.getMinecraft().currentScreen; + }, parameter -> { + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) { + GuiScreen gui = Minecraft.getMinecraft().currentScreen; - if (gui instanceof GuiStorage) { - ((GuiStorage) gui).PRIORITY.setText(String.valueOf(parameter.getValue())); - } + if (gui instanceof GuiStorage) { + ((GuiStorage) gui).PRIORITY.setText(String.valueOf(parameter.getValue())); } } }); diff --git a/src/main/java/refinedstorage/tile/data/TileDataManager.java b/src/main/java/refinedstorage/tile/data/TileDataManager.java index af3186f9d..aea7a0cb8 100755 --- a/src/main/java/refinedstorage/tile/data/TileDataManager.java +++ b/src/main/java/refinedstorage/tile/data/TileDataManager.java @@ -17,12 +17,12 @@ import java.util.Map; public class TileDataManager { private static int PARAMETER_ID = 0; - private static Map PARAMETER_MAP = new HashMap(); + private static Map PARAMETER_MAP = new HashMap<>(); - private List parameters = new ArrayList(); + private List parameters = new ArrayList<>(); - private List watchedParameters = new ArrayList(); - private List watchedParametersCache = new ArrayList(); + private List watchedParameters = new ArrayList<>(); + private List watchedParametersCache = new ArrayList<>(); public static TileDataParameter createParameter(DataSerializer serializer, ITileDataProducer producer) { return createParameter(serializer, producer, null); diff --git a/src/main/java/refinedstorage/tile/data/TileDataParameter.java b/src/main/java/refinedstorage/tile/data/TileDataParameter.java index c1a1abd92..66040e933 100755 --- a/src/main/java/refinedstorage/tile/data/TileDataParameter.java +++ b/src/main/java/refinedstorage/tile/data/TileDataParameter.java @@ -1,16 +1,17 @@ package refinedstorage.tile.data; import net.minecraft.network.datasync.DataSerializer; +import net.minecraft.tileentity.TileEntity; public class TileDataParameter { private int id; private DataSerializer serializer; - private ITileDataProducer valueProducer; - private ITileDataConsumer valueConsumer; - private ITileDataListener listener; + private ITileDataProducer valueProducer; + private ITileDataConsumer valueConsumer; + private ITileDataListener listener; private T value; - public TileDataParameter(int id, DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener listener) { + public TileDataParameter(int id, DataSerializer serializer, ITileDataProducer producer, ITileDataConsumer consumer, ITileDataListener listener) { this.id = id; this.serializer = serializer; this.valueProducer = producer; @@ -26,11 +27,11 @@ public class TileDataParameter { return serializer; } - public ITileDataProducer getValueProducer() { + public ITileDataProducer getValueProducer() { return valueProducer; } - public ITileDataConsumer getValueConsumer() { + public ITileDataConsumer getValueConsumer() { return valueConsumer; } diff --git a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java b/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java index 3f1e5943e..09530a47a 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/ItemHandlerStorage.java @@ -25,7 +25,7 @@ public class ItemHandlerStorage extends ExternalStorage { @Override public List getItems() { - List items = new ArrayList(); + List items = new ArrayList<>(); for (int i = 0; i < handler.getSlots(); ++i) { if (handler.getStackInSlot(i) != null && handler.getStackInSlot(i).getItem() != null) { diff --git a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java index aedb3c872..78c7a073e 100755 --- a/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java +++ b/src/main/java/refinedstorage/tile/externalstorage/TileExternalStorage.java @@ -53,7 +53,7 @@ public class TileExternalStorage extends TileNode implements IStorageProvider, I private int compare = 0; private int mode = IFilterable.WHITELIST; - private List storages = new ArrayList(); + private List storages = new ArrayList<>(); private int lastDrawerCount; public TileExternalStorage() { diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 087b76787..e5a1e70b6 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -141,7 +141,7 @@ public class TileGrid extends TileNode implements IGrid { private InventoryCraftResult result = new InventoryCraftResult(); private ItemHandlerBasic patterns = new ItemHandlerBasic(2, this, new ItemValidatorBasic(RefinedStorageItems.PATTERN)); - private List filteredItems = new ArrayList(); + private List filteredItems = new ArrayList<>(); private ItemHandlerGridFilterInGrid filter = new ItemHandlerGridFilterInGrid(filteredItems); private EnumGridType type; @@ -259,7 +259,7 @@ public class TileGrid extends TileNode implements IGrid { } public void onCraftedShift(ContainerGrid container, EntityPlayer player) { - List craftedItemsList = new ArrayList(); + List craftedItemsList = new ArrayList<>(); int craftedItems = 0; ItemStack crafted = result.getStackInSlot(0); diff --git a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java index 0ec5255ee..8b4155818 100755 --- a/src/main/java/refinedstorage/tile/grid/WirelessGrid.java +++ b/src/main/java/refinedstorage/tile/grid/WirelessGrid.java @@ -34,7 +34,7 @@ public class WirelessGrid implements IGrid { private int sortingDirection; private int searchBoxMode; - private List filteredItems = new ArrayList(); + private List filteredItems = new ArrayList<>(); private ItemHandlerGridFilterInGrid filter = new ItemHandlerGridFilterInGrid(filteredItems) { @Override protected void onContentsChanged(int slot) {