This commit is contained in:
Raoul Van den Berge
2016-12-18 00:54:53 +01:00
parent 600c62c48b
commit 97db100839
11 changed files with 14 additions and 44 deletions

View File

@@ -96,7 +96,7 @@ public interface ICraftingPattern {
* Returns the actual outputted {@link ItemStack} * Returns the actual outputted {@link ItemStack}
* *
* @param requested an item requested * @param requested an item requested
* @param compare the {@link IComparer} flags * @param compare the {@link IComparer} flags
* @return the actual {@link ItemStack} with quantity * @return the actual {@link ItemStack} with quantity
*/ */
ItemStack getActualOutput(ItemStack requested, int compare); ItemStack getActualOutput(ItemStack requested, int compare);

View File

@@ -6,7 +6,6 @@ import java.util.List;
* Represents a graph of all the nodes connected to a network. * Represents a graph of all the nodes connected to a network.
*/ */
public interface INetworkNodeGraph { public interface INetworkNodeGraph {
/**
/** /**
* Rebuilds the network graph. * Rebuilds the network graph.
*/ */
@@ -17,13 +16,6 @@ public interface INetworkNodeGraph {
*/ */
List<INetworkNode> all(); List<INetworkNode> all();
/**
* Replaces an old node with a new one.
*
* @param node the node to replace
*/
void replace(INetworkNode node);
/** /**
* Disconnects and notifies all connected nodes. * Disconnects and notifies all connected nodes.
*/ */

View File

@@ -47,7 +47,7 @@ public interface ISoldererRegistry {
* Remove existing recipes from the solderer * Remove existing recipes from the solderer
* *
* @param result the result * @param result the result
* @param rows none or the three rows that give the result * @param rows none or the three rows that give the result
* @return a list of removed {@link ISoldererRecipe}s * @return a list of removed {@link ISoldererRecipe}s
*/ */
List<ISoldererRecipe> removeRecipe(@Nonnull ItemStack result, ItemStack... rows); List<ISoldererRecipe> removeRecipe(@Nonnull ItemStack result, ItemStack... rows);

View File

@@ -8,8 +8,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStep; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStep;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStepCraft;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingStepProcess;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.task.CraftingTask;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;

View File

@@ -5,7 +5,6 @@ import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingStep;
import com.raoulvdberge.refinedstorage.api.network.INetworkMaster; import com.raoulvdberge.refinedstorage.api.network.INetworkMaster;
import com.raoulvdberge.refinedstorage.api.util.IComparer; import com.raoulvdberge.refinedstorage.api.util.IComparer;
import com.raoulvdberge.refinedstorage.api.util.IStackList; import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;
@@ -99,8 +98,8 @@ public class CraftingStepProcess extends CraftingStep {
/** /**
* Insert or simulate insertion of {@link ItemStack}s into an {@link IItemHandler} * Insert or simulate insertion of {@link ItemStack}s into an {@link IItemHandler}
* *
* @param dest target {@link IItemHandler} * @param dest target {@link IItemHandler}
* @param stacks a {@link Deque} of {@link ItemStack}s * @param stacks a {@link Deque} of {@link ItemStack}s
* @param simulate simulate or actually insert the {@link ItemStack}s * @param simulate simulate or actually insert the {@link ItemStack}s
* @return true when all can be inserted, false otherwise * @return true when all can be inserted, false otherwise
*/ */

View File

@@ -1,11 +1,9 @@
package com.raoulvdberge.refinedstorage.apiimpl.network; package com.raoulvdberge.refinedstorage.apiimpl.network;
import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPatternContainer;
import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware; import com.raoulvdberge.refinedstorage.api.network.INetworkNeighborhoodAware;
import com.raoulvdberge.refinedstorage.api.network.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.INetworkNode;
import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph; import com.raoulvdberge.refinedstorage.api.network.INetworkNodeGraph;
import com.raoulvdberge.refinedstorage.api.storage.IStorageProvider;
import com.raoulvdberge.refinedstorage.item.ItemBlockController; import com.raoulvdberge.refinedstorage.item.ItemBlockController;
import com.raoulvdberge.refinedstorage.tile.TileController; import com.raoulvdberge.refinedstorage.tile.TileController;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@@ -100,23 +98,6 @@ public class NetworkNodeGraph implements INetworkNodeGraph {
return nodes; return nodes;
} }
@Override
public void replace(INetworkNode node) {
nodes.remove(node);
nodes.add(node);
if (node instanceof ICraftingPatternContainer) {
controller.rebuildPatterns();
}
if (node instanceof IStorageProvider) {
controller.getItemStorageCache().invalidate();
controller.getFluidStorageCache().invalidate();
}
controller.getDataManager().sendParameterToWatchers(TileController.NODES);
}
@Override @Override
public void disconnectAll() { public void disconnectAll() {
List<INetworkNode> oldNodes = new ArrayList<>(nodes); List<INetworkNode> oldNodes = new ArrayList<>(nodes);

View File

@@ -64,7 +64,7 @@ public class StackListItem implements IStackList<ItemStack> {
ItemStack removed = ItemHandlerHelper.copyStackWithSize(otherStack, Math.min(size, otherStack.getCount())); ItemStack removed = ItemHandlerHelper.copyStackWithSize(otherStack, Math.min(size, otherStack.getCount()));
this.removeTracker.add(removed); this.removeTracker.add(removed);
boolean success = otherStack.getCount() - size >= 0; boolean success = otherStack.getCount() - size >= 0;
otherStack.shrink(size); otherStack.shrink(size);
if (otherStack.isEmpty()) { if (otherStack.isEmpty()) {

View File

@@ -22,7 +22,7 @@ public class ContainerExporter extends ContainerBase {
public void initSlots() { public void initSlots() {
this.inventorySlots.clear(); this.inventorySlots.clear();
this.inventoryItemStacks.clear(); this.inventoryItemStacks.clear();
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
addSlotToContainer(new SlotItemHandler(exporter.getUpgrades(), i, 187, 6 + (i * 18))); addSlotToContainer(new SlotItemHandler(exporter.getUpgrades(), i, 187, 6 + (i * 18)));
} }

View File

@@ -31,7 +31,7 @@ public class RecipeTransferHandlerPattern implements IRecipeTransferHandler<Cont
if (guiIngredient != null && guiIngredient.getDisplayedIngredient() != null) { if (guiIngredient != null && guiIngredient.getDisplayedIngredient() != null) {
ItemStack ingredient = guiIngredient.getDisplayedIngredient().copy(); ItemStack ingredient = guiIngredient.getDisplayedIngredient().copy();
if (guiIngredient.isInput()) { if (guiIngredient.isInput()) {
inputs.add(ingredient); inputs.add(ingredient);
} else { } else {
outputs.add(ingredient); outputs.add(ingredient);
} }

View File

@@ -52,12 +52,12 @@ public class ModelDiskManipulator implements IModel {
} }
return new BakedModelDiskManipulator( return new BakedModelDiskManipulator(
baseModelConnected.bake(state, format, bakedTextureGetter), baseModelConnected.bake(state, format, bakedTextureGetter),
baseModelDisconnected.bake(state, format, bakedTextureGetter), baseModelDisconnected.bake(state, format, bakedTextureGetter),
diskModel.bake(state, format, bakedTextureGetter), diskModel.bake(state, format, bakedTextureGetter),
diskModelNearCapacity.bake(state, format, bakedTextureGetter), diskModelNearCapacity.bake(state, format, bakedTextureGetter),
diskModelFull.bake(state, format, bakedTextureGetter), diskModelFull.bake(state, format, bakedTextureGetter),
diskModelDisconnected.bake(state, format, bakedTextureGetter) diskModelDisconnected.bake(state, format, bakedTextureGetter)
); );
} }

View File

@@ -89,7 +89,7 @@ public class StorageFluidExternal implements IStorage<FluidStack> {
if (getAccessType() == AccessType.INSERT) { if (getAccessType() == AccessType.INSERT) {
return 0; return 0;
} }
return remainder == null ? size : (size - remainder.amount); return remainder == null ? size : (size - remainder.amount);
} }