dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some coverables not dropping covers.

Browse Source
This commit is contained in:
raoulvdberge
2018-07-04 12:24:27 +02:00
parent 542f2a61a9
commit 547f918411
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
View File

@@ -24,6 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
public class NetworkNodeExporter extends NetworkNode implements IComparable, IType, ICoverable {
public static final String ID = "exporter";
@@ -217,7 +218,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
@Override
public IItemHandler getDrops() {
return upgrades;
return new CombinedInvWrapper(upgrades, coverManager.getAsInventory());
}
@Override

7
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java
View File

@@ -32,6 +32,7 @@ import net.minecraftforge.common.util.Constants;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.items.IItemHandler;
import javax.annotation.Nullable;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -351,6 +352,12 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
return fluidStorages;
}
@Nullable
@Override
public IItemHandler getDrops() {
return coverManager.getAsInventory();
}
@Override
public CoverManager getCoverManager() {
return coverManager;

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
View File

@@ -27,6 +27,7 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
public class NetworkNodeImporter extends NetworkNode implements IComparable, IFilterable, IType, ICoverable {
public static final String ID = "importer";
@@ -216,7 +217,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
@Override
public IItemHandler getDrops() {
return upgrades;
return new CombinedInvWrapper(upgrades, coverManager.getAsInventory());
}
@Override

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/cover/CoverManager.java
View File

@@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.EnumBlockRenderType;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.ItemStackHandler;
import javax.annotation.Nullable;
@@ -112,7 +112,7 @@ public class CoverManager {
return list;
}
public IItemHandler getAsInventory() {
public IItemHandlerModifiable getAsInventory() {
ItemStackHandler handler = new ItemStackHandler(covers.size());
int i = 0;