diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java index 6c48f7042..46257a952 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingManager.java @@ -189,10 +189,10 @@ public class CraftingManager implements ICraftingManager { } runningSteps = craftingTasks.stream() - .map(ICraftingTask::getSteps) - .flatMap(List::stream) - .filter(ICraftingStep::hasStartedProcessing) - .collect(Collectors.toList()); + .map(ICraftingTask::getSteps) + .flatMap(List::stream) + .filter(ICraftingStep::hasStartedProcessing) + .collect(Collectors.toList()); if (craftingTasksChanged) { network.getNetwork().markCraftingMonitorForUpdate(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index ab092b5b5..0081b7ab1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -111,16 +111,16 @@ public class CraftingPattern implements ICraftingPattern { oreInputs.add(Collections.singletonList(Comparer.stripTags(input))); } else if (isOredict()) { List oredict = Arrays.stream(ids) - .mapToObj(OreDictionary::getOreName) - .map(OreDictionary::getOres) - .flatMap(List::stream) - .map(ItemStack::copy) - .map(Comparer::stripTags) - .map(s -> { - s.setCount(input.getCount()); - return s; - }) - .collect(Collectors.toList()); + .mapToObj(OreDictionary::getOreName) + .map(OreDictionary::getOres) + .flatMap(List::stream) + .map(ItemStack::copy) + .map(Comparer::stripTags) + .map(s -> { + s.setCount(input.getCount()); + return s; + }) + .collect(Collectors.toList()); // Add original stack as first, should prevent some issues oredict.add(0, Comparer.stripTags(input.copy())); oreInputs.add(oredict); @@ -286,13 +286,13 @@ public class CraftingPattern implements ICraftingPattern { } if (other.getId().equals(this.getId()) - && other.isOredict() == this.isOredict() - && other.isBlocking() == this.isBlocking() - && other.isProcessing() == this.isProcessing() - && other.getOreInputs().size() == this.getOreInputs().size() - && other.getOutputs().size() == this.getOutputs().size()) { + && other.isOredict() == this.isOredict() + && other.isBlocking() == this.isBlocking() + && other.isProcessing() == this.isProcessing() + && other.getOreInputs().size() == this.getOreInputs().size() + && other.getOutputs().size() == this.getOutputs().size()) { boolean same = true; - for (int i = 0; i < other.getOreInputs().size(); i++) { + for (int i = 0; i < other.getOreInputs().size(); i++) { same &= other.getOreInputs().get(i).size() == this.getOreInputs().get(i).size(); } int j = 0; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java index 00f6fd9b4..8b3537193 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/task/CraftingStep.java @@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternProvider; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep; -import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; import com.raoulvdberge.refinedstorage.api.util.IComparer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java index a50e359e5..29267477c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java @@ -166,6 +166,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNeighborhoodA return holder.world().getTileEntity(holder.pos().offset(holder.getDirection())); } + @Nullable public IItemHandler getDrops() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java index 08a59b328..accb28fb3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java @@ -162,15 +162,15 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable, if (item.getItem() instanceof ItemBlock) { ((ItemBlock) item.getItem()).placeBlockAt( - took, - FakePlayerFactory.getMinecraft((WorldServer) holder.world()), - holder.world(), - front, - holder.getDirection(), - 0, - 0, - 0, - state + took, + FakePlayerFactory.getMinecraft((WorldServer) holder.world()), + holder.world(), + front, + holder.getDirection(), + 0, + 0, + 0, + state ); } else { holder.world().setBlockState(front, state, 1 | 2); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java index d4ad3ec02..e958f7ed8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java @@ -112,8 +112,8 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC if (!state) { network.getCraftingManager().getTasks().stream() - .filter(task -> task.getPattern().getContainer().getPosition().equals(holder.pos())) - .forEach(task -> network.getCraftingManager().cancel(task)); + .filter(task -> task.getPattern().getContainer().getPosition().equals(holder.pos())) + .forEach(task -> network.getCraftingManager().cancel(task)); } network.getCraftingManager().rebuild(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java index 1080acd0e..38084788c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java @@ -52,7 +52,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi if (network == null || !canUpdate()) { return; } - + if (type == IType.ITEMS) { IImportingBehavior behavior = ImportingBehaviorItemHandler.INSTANCE; if (IntegrationCyclopsCore.isLoaded() && SlotlessItemHandlerHelper.isSlotless(getFacingTile(), holder.getDirection().getOpposite())) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java index ce738eb3b..d9a093545 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java @@ -86,8 +86,8 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode { @Override public int getEnergyUsage() { return Math.min( - RS.INSTANCE.config.interdimensionalUpgradeUsage, - RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage() + RS.INSTANCE.config.interdimensionalUpgradeUsage, + RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage() ); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemCyclops.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemCyclops.java index 76888d1e5..d13b19e47 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemCyclops.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemCyclops.java @@ -58,7 +58,7 @@ public class StorageItemCyclops extends StorageItemExternal { @Override public int getStored() { - return getStacks(cyclopsInv.get()).stream().mapToInt(s -> s.getCount()).sum(); + return getStacks(cyclopsInv.get()).stream().mapToInt(ItemStack::getCount).sum(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java index ebb2cbb72..931deeb01 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/util/StackListFluid.java @@ -18,7 +18,6 @@ public class StackListFluid implements IStackList { private List removeTracker = new LinkedList<>(); @Override - @Nullable public void add(@Nonnull FluidStack stack, int size) { for (FluidStack otherStack : stacks.get(stack.getFluid())) { if (stack.isFluidEqual(otherStack)) { @@ -32,7 +31,6 @@ public class StackListFluid implements IStackList { } @Override - @Nullable public boolean remove(@Nonnull FluidStack stack, int size) { for (FluidStack otherStack : stacks.get(stack.getFluid())) { if (stack.isFluidEqual(otherStack)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java index 4fd4459fe..f8b4ebfde 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerDestructor.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeDestructor; import com.raoulvdberge.refinedstorage.container.slot.SlotFilterType; import com.raoulvdberge.refinedstorage.tile.TileDestructor; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java index bbdcc13c2..92ec589ec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerFluidInterface.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidInterface; import com.raoulvdberge.refinedstorage.container.slot.SlotFilterFluid; import com.raoulvdberge.refinedstorage.tile.TileFluidInterface; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java index 27c558c18..42a0a78ee 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerGrid.java @@ -85,7 +85,7 @@ public class ContainerGrid extends ContainerBase { } } - addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, getPlayer(), (NetworkNodeGrid) grid, 0, 130 + 4, headerAndSlots + 22)); + addSlotToContainer(craftingResultSlot = new SlotGridCraftingResult(this, getPlayer(), grid, 0, 130 + 4, headerAndSlots + 22)); } else if (grid.getType() == GridType.PATTERN) { int x = 8; int y = headerAndSlots + 4; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java index ab7f4cbf3..3b71b8954 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerInterface.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeInterface; import com.raoulvdberge.refinedstorage.container.slot.SlotFilter; import com.raoulvdberge.refinedstorage.container.slot.SlotOutput; import com.raoulvdberge.refinedstorage.tile.TileInterface; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java index dc8fec732..3438e9ca8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/ContainerWirelessTransmitter.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.container; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeWirelessTransmitter; import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilterType.java b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilterType.java index 95445fd7a..02c42a463 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilterType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/container/slot/SlotFilterType.java @@ -1,6 +1,5 @@ package com.raoulvdberge.refinedstorage.container.slot; -import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.tile.config.IType; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java index 1eb63d614..f36062a71 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/craftingtweaks/IntegrationCraftingTweaks.java @@ -37,8 +37,8 @@ public final class IntegrationCraftingTweaks { public static class GetGridStartFunction implements Function { @Override public Integer apply(ContainerGrid containerGrid) { - for(int i = 0; i < containerGrid.inventorySlots.size(); i++) { - if(containerGrid.inventorySlots.get(i) instanceof SlotGridCrafting) { + for (int i = 0; i < containerGrid.inventorySlots.size(); i++) { + if (containerGrid.inventorySlots.get(i) instanceof SlotGridCrafting) { return i; } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index f7954922f..3930315ff 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java @@ -152,7 +152,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { // First argument: the fluid stack to extract // There is no args.checkFluidStack(), we have to deal with this ourselves Map fluidMap = args.checkTable(0); - if(!fluidMap.containsKey("name") || !(fluidMap.get("name") instanceof String) || ((String) fluidMap.get("name")).length() == 0) { + if (!fluidMap.containsKey("name") || !(fluidMap.get("name") instanceof String) || ((String) fluidMap.get("name")).length() == 0) { throw new IllegalArgumentException("no fluid name"); } String fluid = (String) fluidMap.get("name"); @@ -162,7 +162,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { // With the amount ready, we can actually try to create a fluid stack for the given fluid FluidStack stack = FluidRegistry.getFluidStack(fluid, amount); - if(stack == null) { + if (stack == null) { throw new IllegalArgumentException("invalid fluid stack, does not exist"); } @@ -171,19 +171,19 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { // Get the tile-entity on the specified side TileEntity targetEntity = node.getNetwork().getNetworkWorld().getTileEntity(node.getPos().offset(facing)); - if(targetEntity == null || !targetEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite())) { + if (targetEntity == null || !targetEntity.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite())) { throw new IllegalArgumentException("No fluid tank on the given side"); } FluidStack extractedSim = node.getNetwork().extractFluid(stack, amount, true); - if(extractedSim == null || extractedSim.amount <= 0) { + if (extractedSim == null || extractedSim.amount <= 0) { return new Object[]{null, "could not extract the specified fluid"}; } // Simulate inserting the fluid and see how much we were able to insert IFluidHandler handler = targetEntity.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, facing.getOpposite()); int filledAmountSim = handler.fill(extractedSim, false); - if(filledAmountSim <= 0) { + if (filledAmountSim <= 0) { return new Object[]{0}; } @@ -191,7 +191,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { FluidStack extracted = node.getNetwork().extractFluid(stack, amount, false); handler.fill(extracted, true); - return new Object[] { filledAmountSim }; + return new Object[]{filledAmountSim}; } @Callback(doc = "function(stack:table):table -- Gets a fluid from the network.") @@ -202,18 +202,18 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { // There is no args.checkFluidStack(), we have to deal with this ourselves Map fluidMap = args.checkTable(0); - if(!fluidMap.containsKey("name") || !(fluidMap.get("name") instanceof String) || ((String) fluidMap.get("name")).length() == 0) { + if (!fluidMap.containsKey("name") || !(fluidMap.get("name") instanceof String) || ((String) fluidMap.get("name")).length() == 0) { throw new IllegalArgumentException("no fluid name"); } String fluid = (String) fluidMap.get("name"); FluidStack needle = FluidRegistry.getFluidStack(fluid, 1000); - if(needle == null) { + if (needle == null) { throw new IllegalArgumentException("invalid fluid stack, does not exist"); } - return new Object[]{ node.getNetwork().getFluidStorageCache().getList().get(needle) }; + return new Object[]{node.getNetwork().getFluidStorageCache().getList().get(needle)}; } @Callback(doc = "function():table -- Gets a list of all fluids in this network.") @@ -245,7 +245,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { // Get the tile-entity on the specified side TileEntity targetEntity = node.getNetwork().getNetworkWorld().getTileEntity(node.getPos().offset(facing)); - if(targetEntity == null || !targetEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite())) { + if (targetEntity == null || !targetEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing.getOpposite())) { throw new IllegalArgumentException("No inventory on the given side"); } @@ -273,7 +273,7 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { ItemStack extracted = node.getNetwork().extractItem(stack, count, false); ItemHandlerHelper.insertItemStacked(handler, extracted, false); - return new Object[] { transferableAmount }; + return new Object[]{transferableAmount}; } @Callback(doc = "function(stack:table[, compareMeta:boolean[, compareNBT:boolean[, compareOreDict:boolean]]]):table -- Gets an item from the network.") diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java b/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java index f5f1bef02..5bd873cfb 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/CapabilityProviderEnergy.java @@ -10,6 +10,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; +import javax.annotation.Nonnull; import javax.annotation.Nullable; public class CapabilityProviderEnergy implements ICapabilityProvider { @@ -20,13 +21,13 @@ public class CapabilityProviderEnergy implements ICapabilityProvider { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityEnergy.ENERGY || (IntegrationTesla.isLoaded() && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)); } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityEnergy.ENERGY) { return CapabilityEnergy.ENERGY.cast(new ItemEnergyForge(stack, ItemEnergyItem.CAPACITY)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStartResponse.java b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStartResponse.java index f5332da99..d44b6c717 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStartResponse.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/network/MessageGridCraftingStartResponse.java @@ -1,4 +1,3 @@ - package com.raoulvdberge.refinedstorage.network; import com.raoulvdberge.refinedstorage.proxy.ProxyClient; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java index 9f2555949..4747f9537 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/CapabilityNetworkNodeProxy.java @@ -1,7 +1,5 @@ package com.raoulvdberge.refinedstorage.proxy; -import javax.annotation.Nonnull; - import com.google.common.base.Preconditions; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeProxy; @@ -12,6 +10,8 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.CapabilityManager; +import javax.annotation.Nonnull; + public class CapabilityNetworkNodeProxy { @CapabilityInject(INetworkNodeProxy.class) public static Capability NETWORK_NODE_PROXY_CAPABILITY = null; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/PropertyObject.java b/src/main/java/com/raoulvdberge/refinedstorage/render/PropertyObject.java index 659c99cdd..48bbd001c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/PropertyObject.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/PropertyObject.java @@ -1,11 +1,10 @@ package com.raoulvdberge.refinedstorage.render; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; import net.minecraftforge.common.property.IUnlistedProperty; import java.util.Objects; +import java.util.function.Function; +import java.util.function.Predicate; public class PropertyObject implements IUnlistedProperty { private final String name; @@ -21,7 +20,7 @@ public class PropertyObject implements IUnlistedProperty { } public PropertyObject(String name, Class clazz) { - this(name, clazz, Predicates.alwaysTrue(), input -> Objects.toString(input)); + this(name, clazz, v -> true, Objects::toString); } @Override @@ -31,7 +30,7 @@ public class PropertyObject implements IUnlistedProperty { @Override public boolean isValid(T value) { - return validator.apply(value); + return validator.test(value); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java index b88ca6e45..e4dde6a24 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileBase.java @@ -107,6 +107,7 @@ public abstract class TileBase extends TileEntity { return oldState.getBlock() != newState.getBlock(); } + @Nullable public IItemHandler getDrops() { return null; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java index 7169d313a..d6db43202 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileController.java @@ -741,7 +741,7 @@ public class TileController extends TileBase implements ITickable, INetworkMaste } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityEnergy.ENERGY) { return CapabilityEnergy.ENERGY.cast(energy); } @@ -763,7 +763,7 @@ public class TileController extends TileBase implements ITickable, INetworkMaste } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityEnergy.ENERGY || (energyTesla != null && (capability == TeslaCapabilities.CAPABILITY_HOLDER || capability == TeslaCapabilities.CAPABILITY_CONSUMER)) || capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java index 052c3921c..cd7d5e7ea 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java @@ -148,12 +148,12 @@ public class TileDiskDrive extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getDisks()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java index 1b796eee9..b387b89dd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java @@ -66,7 +66,7 @@ public class TileDiskManipulator extends TileNode { } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(facing == EnumFacing.DOWN ? getNode().getOutputDisks() : getNode().getInputDisks()); } @@ -75,7 +75,7 @@ public class TileDiskManipulator extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java index 28fab5e53..d60cddaa6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java @@ -37,12 +37,12 @@ public class TileFluidInterface extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY) { return CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY.cast(getNode().getTank()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java index 9f629cbb3..a6ca6fcb5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java @@ -18,7 +18,7 @@ public class TileInterface extends TileNode { } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getItems()); } @@ -27,7 +27,7 @@ public class TileInterface extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java index 11564e87c..6fc42381d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java @@ -48,12 +48,12 @@ public class TileNetworkTransmitter extends TileNode capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getNetworkCard()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java index fcbf4dc22..a3eea0bf3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java @@ -84,6 +84,8 @@ public abstract class TileNode extends TileBase implement getNode().setActive(tag.getBoolean(NBT_ACTIVE)); } + @Override + @Nullable public IItemHandler getDrops() { return getNode().getDrops(); } @@ -148,7 +150,7 @@ public abstract class TileNode extends TileBase implement public abstract N createNode(); @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing side) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) { return true; } @@ -157,7 +159,7 @@ public abstract class TileNode extends TileBase implement } @Override - public T getCapability(Capability capability, @Nullable EnumFacing side) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing side) { if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) { return CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY.cast(this); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java index d3ba62ee6..85d563145 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileProcessingPatternEncoder.java @@ -19,6 +19,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; +import javax.annotation.Nonnull; import javax.annotation.Nullable; public class TileProcessingPatternEncoder extends TileBase { @@ -150,12 +151,13 @@ public class TileProcessingPatternEncoder extends TileBase { } @Override + @Nullable public IItemHandler getDrops() { return patterns; } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(patterns); } @@ -164,7 +166,7 @@ public class TileProcessingPatternEncoder extends TileBase { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java index 1dde43530..ffd569529 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java @@ -61,7 +61,7 @@ public class TileReader extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (super.hasCapability(capability, facing)) { return true; } @@ -96,7 +96,7 @@ public class TileReader extends TileNode { } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { T foundCapability = super.getCapability(capability, facing); if (foundCapability == null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java index af362e924..84f0c89c4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java @@ -43,7 +43,7 @@ public class TileSolderer extends TileNode { } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) { return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(getNode().getItems()); } @@ -52,7 +52,7 @@ public class TileSolderer extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java index db4d81530..be07319d8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java @@ -35,7 +35,7 @@ public class TileWriter extends TileNode { } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (super.hasCapability(capability, facing)) { return true; } @@ -70,7 +70,7 @@ public class TileWriter extends TileNode { } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { T foundCapability = super.getCapability(capability, facing); if (foundCapability == null) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java index 39f2f2218..c1a5d993c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/config/IType.java @@ -26,8 +26,8 @@ public interface IType { ((IType) tile.getNode()).setType(value); tile.getWorld().playerEntities.stream() - .filter(p -> p.openContainer instanceof ContainerBase && ((ContainerBase) p.openContainer).getTile().getPos().equals(tile.getPos())) - .forEach(p -> p.openContainer.detectAndSendChanges()); + .filter(p -> p.openContainer instanceof ContainerBase && ((ContainerBase) p.openContainer).getTile().getPos().equals(tile.getPos())) + .forEach(p -> p.openContainer.detectAndSendChanges()); } } }); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java index c0983dab6..1575b49ea 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/WirelessFluidGrid.java @@ -1,4 +1,3 @@ - package com.raoulvdberge.refinedstorage.tile.grid; import com.raoulvdberge.refinedstorage.RS; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index b7a1ef8b4..c4c36ca64 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -519,13 +519,13 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, } @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityEnergy.ENERGY || super.hasCapability(capability, facing); } @Nullable @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if (capability == CapabilityEnergy.ENERGY) { return CapabilityEnergy.ENERGY.cast(energyStorage); }