Fixed some coverables not dropping covers.
This commit is contained in:
@@ -24,6 +24,7 @@ import net.minecraftforge.fluids.FluidStack;
|
|||||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
import net.minecraftforge.items.ItemHandlerHelper;
|
import net.minecraftforge.items.ItemHandlerHelper;
|
||||||
|
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
|
||||||
|
|
||||||
public class NetworkNodeExporter extends NetworkNode implements IComparable, IType, ICoverable {
|
public class NetworkNodeExporter extends NetworkNode implements IComparable, IType, ICoverable {
|
||||||
public static final String ID = "exporter";
|
public static final String ID = "exporter";
|
||||||
@@ -217,7 +218,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IItemHandler getDrops() {
|
public IItemHandler getDrops() {
|
||||||
return upgrades;
|
return new CombinedInvWrapper(upgrades, coverManager.getAsInventory());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ import net.minecraftforge.common.util.Constants;
|
|||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
|
||||||
|
import javax.annotation.Nullable;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
@@ -351,6 +352,12 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
|
|||||||
return fluidStorages;
|
return fluidStorages;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public IItemHandler getDrops() {
|
||||||
|
return coverManager.getAsInventory();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public CoverManager getCoverManager() {
|
public CoverManager getCoverManager() {
|
||||||
return coverManager;
|
return coverManager;
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import net.minecraftforge.fluids.Fluid;
|
|||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.fluids.capability.IFluidHandler;
|
import net.minecraftforge.fluids.capability.IFluidHandler;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandler;
|
||||||
|
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
|
||||||
|
|
||||||
public class NetworkNodeImporter extends NetworkNode implements IComparable, IFilterable, IType, ICoverable {
|
public class NetworkNodeImporter extends NetworkNode implements IComparable, IFilterable, IType, ICoverable {
|
||||||
public static final String ID = "importer";
|
public static final String ID = "importer";
|
||||||
@@ -216,7 +217,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public IItemHandler getDrops() {
|
public IItemHandler getDrops() {
|
||||||
return upgrades;
|
return new CombinedInvWrapper(upgrades, coverManager.getAsInventory());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagList;
|
|||||||
import net.minecraft.util.EnumBlockRenderType;
|
import net.minecraft.util.EnumBlockRenderType;
|
||||||
import net.minecraft.util.EnumFacing;
|
import net.minecraft.util.EnumFacing;
|
||||||
import net.minecraftforge.common.property.IExtendedBlockState;
|
import net.minecraftforge.common.property.IExtendedBlockState;
|
||||||
import net.minecraftforge.items.IItemHandler;
|
import net.minecraftforge.items.IItemHandlerModifiable;
|
||||||
import net.minecraftforge.items.ItemStackHandler;
|
import net.minecraftforge.items.ItemStackHandler;
|
||||||
|
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
@@ -112,7 +112,7 @@ public class CoverManager {
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IItemHandler getAsInventory() {
|
public IItemHandlerModifiable getAsInventory() {
|
||||||
ItemStackHandler handler = new ItemStackHandler(covers.size());
|
ItemStackHandler handler = new ItemStackHandler(covers.size());
|
||||||
|
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user