Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 23:28:35 +01:00
Code Issues Projects Releases Wiki Activity

Haphazardly revert implementation of new item system for ESD as it completely broke pulling items for sided inventories

Browse source
This commit is contained in:
Ellpeck 2016-02-06 22:07:12 +01:00
parent e15c09778e
commit 32c10c5beb
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityInputter.java
View file

@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.tile;
import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor; import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor; import de.ellpeck.actuallyadditions.mod.network.gui.INumberReactor;
import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
import de.ellpeck.actuallyadditions.mod.util.WorldUtil; import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@ -22,8 +21,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler;
public class TileEntityInputter extends TileEntityInventoryBase implements IButtonReactor, INumberReactor{ public class TileEntityInputter extends TileEntityInventoryBase implements IButtonReactor, INumberReactor{
@ -82,8 +79,9 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
this.markDirty(); this.markDirty();
} }
//TODO Fix for new item system
private boolean newPull(){ private boolean newPull(){
for(EnumFacing facing : EnumFacing.values()){ /*for(EnumFacing facing : EnumFacing.values()){
IItemHandler handler = this.placeToPull.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing); IItemHandler handler = this.placeToPull.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing);
if(handler != null){ if(handler != null){
for(int i = Math.max(this.lastPullStart, 0); i < Math.min(this.slotToPullEnd, handler.getSlots()); i++){ for(int i = Math.max(this.lastPullStart, 0); i < Math.min(this.slotToPullEnd, handler.getSlots()); i++){
@ -110,12 +108,12 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
} }
} }
} }
} }*/
return false; return false;
} }
private boolean newPut(){ private boolean newPut(){
if(this.slots[0] != null){ /*if(this.slots[0] != null){
for(EnumFacing facing : EnumFacing.values()){ for(EnumFacing facing : EnumFacing.values()){
IItemHandler handler = this.placeToPut.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing); IItemHandler handler = this.placeToPut.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, facing);
if(handler != null){ if(handler != null){
@ -131,7 +129,7 @@ public class TileEntityInputter extends TileEntityInventoryBase implements IButt
} }
} }
} }
} }*/
return false; return false;
} }

1
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPhantomItemface.java
View file

@ -18,6 +18,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.Capability;
//TODO completely adapt to new item system?
public class TileEntityPhantomItemface extends TileEntityPhantomface{ public class TileEntityPhantomItemface extends TileEntityPhantomface{
public TileEntityPhantomItemface(){ public TileEntityPhantomItemface(){

2
src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java
View file

@ -246,7 +246,7 @@ public class WorldUtil{
return blocks; return blocks;
} }
//TODO make this work for the stupid new system //TODO make this work for the stupid new item system
public static boolean addToInventory(IInventory inventory, ArrayList<ItemStack> stacks, boolean actuallyDo, boolean shouldAlwaysWork){ public static boolean addToInventory(IInventory inventory, ArrayList<ItemStack> stacks, boolean actuallyDo, boolean shouldAlwaysWork){
return addToInventory(inventory, stacks, EnumFacing.UP, actuallyDo, shouldAlwaysWork); return addToInventory(inventory, stacks, EnumFacing.UP, actuallyDo, shouldAlwaysWork);