mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-19 19:59:58 +00:00
Closer.
This commit is contained in:
1 parent
d5250cacc1
commit
fa1e27774b
6 files changed
+61
-18
No files matched your search
@@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.conduit.IConduitBundle;
|
||||
import crazypants.enderio.conduit.item.FilterRegister;
|
||||
import crazypants.enderio.conduit.item.IItemConduit;
|
||||
import crazypants.enderio.conduit.item.IItemFilter;
|
||||
import crazypants.enderio.conduit.item.ItemFilter;
|
||||
@@ -69,13 +70,13 @@ public class ExternalConnectionContainer extends Container {
|
||||
x = 10;
|
||||
y = 67;
|
||||
FilterUpgradeInventory fi = new FilterUpgradeInventory(itemConduit, dir, false);
|
||||
addSlotToContainer(new FilterSlot(fi, 0, x, y));
|
||||
addSlotToContainer(new FilterSlot(fi, 0, x, y, false));
|
||||
slotLocations.add(new Point(x, y));
|
||||
|
||||
x = 10;
|
||||
y = 67;
|
||||
fi = new FilterUpgradeInventory(itemConduit, dir, true);
|
||||
addSlotToContainer(new FilterSlot(fi, 0, x, y));
|
||||
addSlotToContainer(new FilterSlot(fi, 0, x, y, true));
|
||||
slotLocations.add(new Point(x, y));
|
||||
|
||||
x = 10;
|
||||
@@ -175,6 +176,10 @@ public class ExternalConnectionContainer extends Container {
|
||||
@Override
|
||||
public ItemStack slotClick(int par1, int par2, int par3, EntityPlayer par4EntityPlayer) {
|
||||
if(par4EntityPlayer.worldObj != null) {
|
||||
if(par1 >= startFilterSlot && itemConduit != null) {
|
||||
itemConduit.setInputFilter(dir, inputFilter);
|
||||
itemConduit.setOutputFilter(dir, outputFilter);
|
||||
}
|
||||
// if(itemConduit != null) {
|
||||
// itemConduit.setInputFilter(dir, inputFilter);
|
||||
// itemConduit.setOutputFilter(dir, outputFilter);
|
||||
@@ -199,8 +204,11 @@ public class ExternalConnectionContainer extends Container {
|
||||
|
||||
private class FilterSlot extends Slot {
|
||||
|
||||
public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4) {
|
||||
boolean isInput;
|
||||
|
||||
public FilterSlot(IInventory par1iInventory, int par2, int par3, int par4, boolean isInput) {
|
||||
super(par1iInventory, par2, par3, par4);
|
||||
this.isInput = isInput;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -208,6 +216,7 @@ public class ExternalConnectionContainer extends Container {
|
||||
filterChanged();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -96,7 +96,7 @@ public class FilterUpgradeInventory implements IInventory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markDirty() {
|
||||
public void markDirty() {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -41,12 +41,37 @@ public class FilterRegister {
|
||||
}
|
||||
|
||||
public static IItemFilter getFilterForUpgrade(ItemStack stack) {
|
||||
if(stack != null && stack.getItem() == Items.paper) {
|
||||
return new ItemFilter(true);
|
||||
} else if(stack != null && stack.getItem() == Items.stick) {
|
||||
return new ItemFilter(false);
|
||||
if(stack == null) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
|
||||
IItemFilter res = null;
|
||||
if(stack != null && stack.getItem() == Items.paper) {
|
||||
res = new ItemFilter(true);
|
||||
} else if(stack != null && stack.getItem() == Items.stick) {
|
||||
res = new ItemFilter(false);
|
||||
}
|
||||
if(res != null && stack.stackTagCompound != null && stack.stackTagCompound.hasKey("filter")) {
|
||||
res.readFromNBT(stack.stackTagCompound.getCompoundTag("filter"));
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
public static void writeFilterToStack(IItemFilter filter, ItemStack stack) {
|
||||
if(stack == null || filter == null) {
|
||||
return;
|
||||
}
|
||||
NBTTagCompound filterRoot = new NBTTagCompound();
|
||||
filter.writeToNBT(filterRoot);
|
||||
if(stack.stackTagCompound == null) {
|
||||
stack.stackTagCompound = new NBTTagCompound();
|
||||
}
|
||||
stack.stackTagCompound.setTag("filter", filterRoot);
|
||||
stack.setStackDisplayName("Configured");
|
||||
|
||||
//System.out.println("FilterRegister.writeFilterToStack: " + stack.stackTagCompound);
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -23,4 +23,5 @@ public interface IItemFilter {
|
||||
List<Slot> getSlots();
|
||||
|
||||
int getSlotCount();
|
||||
|
||||
}
|
||||
@@ -187,6 +187,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
if(network != null) {
|
||||
network.routesChanged();
|
||||
}
|
||||
setClientStateDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -194,7 +195,8 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
outputFilters.put(dir, filter);
|
||||
if(network != null) {
|
||||
network.routesChanged();
|
||||
}
|
||||
}
|
||||
setClientStateDirty();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -571,7 +573,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
|
||||
for (Entry<ForgeDirection, ItemStack> entry : inputFilterUpgrades.entrySet()) {
|
||||
if(entry.getValue() != null) {
|
||||
ItemStack up = entry.getValue();
|
||||
ItemStack up = entry.getValue();
|
||||
IItemFilter filter = getInputFilter(entry.getKey());
|
||||
FilterRegister.writeFilterToStack(filter, up);
|
||||
|
||||
NBTTagCompound itemRoot = new NBTTagCompound();
|
||||
up.writeToNBT(itemRoot);
|
||||
nbtRoot.setTag("inputFilterUpgrades." + entry.getKey().name(), itemRoot);
|
||||
@@ -580,7 +585,10 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
|
||||
for (Entry<ForgeDirection, ItemStack> entry : outputFilterUpgrades.entrySet()) {
|
||||
if(entry.getValue() != null) {
|
||||
ItemStack up = entry.getValue();
|
||||
ItemStack up = entry.getValue();
|
||||
IItemFilter filter = getOutputFilter(entry.getKey());
|
||||
FilterRegister.writeFilterToStack(filter, up);
|
||||
|
||||
NBTTagCompound itemRoot = new NBTTagCompound();
|
||||
up.writeToNBT(itemRoot);
|
||||
nbtRoot.setTag("outputFilterUpgrades." + entry.getKey().name(), itemRoot);
|
||||
@@ -655,8 +663,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
|
||||
ItemFilter filter = new ItemFilter();
|
||||
filter.readFromNBT(filterTag);
|
||||
inputFilters.put(dir, filter);
|
||||
System.out.println("ItemConduit.readFromNBT: input=" + filter);
|
||||
inputFilters.put(dir, filter);
|
||||
}
|
||||
|
||||
key = "speedUpgrades." + dir.name();
|
||||
@@ -669,7 +676,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
key = "inputFilterUpgrades." + dir.name();
|
||||
if(nbtRoot.hasKey(key)) {
|
||||
NBTTagCompound upTag = (NBTTagCompound) nbtRoot.getTag(key);
|
||||
ItemStack ups = ItemStack.loadItemStackFromNBT(upTag);
|
||||
ItemStack ups = ItemStack.loadItemStackFromNBT(upTag);
|
||||
inputFilterUpgrades.put(dir, ups);
|
||||
}
|
||||
|
||||
@@ -685,8 +692,7 @@ public class ItemConduit extends AbstractConduit implements IItemConduit {
|
||||
NBTTagCompound filterTag = (NBTTagCompound) nbtRoot.getTag(key);
|
||||
ItemFilter filter = new ItemFilter();
|
||||
filter.readFromNBT(filterTag);
|
||||
outputFilters.put(dir, filter);
|
||||
System.out.println("ItemConduit.readFromNBT: output=" + filter);
|
||||
outputFilters.put(dir, filter);
|
||||
}
|
||||
|
||||
key = "extRM." + dir.name();
|
||||
|
||||
@@ -40,6 +40,8 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
int[] oreIds;
|
||||
|
||||
private boolean isAdvanced;
|
||||
|
||||
private IItemConduit con;
|
||||
|
||||
public ItemFilter() {
|
||||
this(5, false);
|
||||
@@ -265,7 +267,7 @@ public class ItemFilter implements IInventory, IItemFilter {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markDirty() {
|
||||
public void markDirty() {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user