diff options
4 files changed, 32 insertions, 28 deletions
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java index 9ba3e458b6..9a11c9dadc 100644 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java +++ b/src/Java/gtPlusPlus/core/block/machine/Machine_ModularityTable.java @@ -51,10 +51,10 @@ public class Machine_ModularityTable extends BlockContainer @SideOnly(Side.CLIENT) public void registerBlockIcons(final IIconRegister p_149651_1_) { - this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting"); - this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting"); - this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting"); - this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "cover_crafting"); + this.blockIcon = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side"); + this.textureTop = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_top"); + this.textureBottom = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_output"); + this.textureFront = p_149651_1_.registerIcon(CORE.MODID + ":" + "TileEntities/" + "ModularTable_side"); } /** diff --git a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java index 998750e3e3..484edc2b0f 100644 --- a/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java +++ b/src/Java/gtPlusPlus/core/inventories/modulartable/InventoryModularOutput.java @@ -80,7 +80,14 @@ public class InventoryModularOutput implements IInventory { @Override public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; + int slotNew = 0; + if (slot >= 2){ + slotNew = (slot-9); + if (slotNew < 0 || slotNew > 2){ + slotNew = 0; + } + } + return this.inventory[slotNew]; } @Override @@ -179,10 +186,17 @@ public class InventoryModularOutput implements IInventory { */ @Override public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { + int slotNew = 0; + if (slot >= 2){ + slotNew = (slot-9); + if (slotNew < 0 || slotNew > 2){ + slotNew = 0; + } + } // Don't want to be able to store the inventory item within itself // Bad things will happen, like losing your inventory // Actually, this needs a custom Slot to work - if (slot == 0){ + if (slotNew == 0){ return TileEntityModularityTable.isValidUpgrade(itemstack); } return TileEntityModularityTable.isValidModularPiece(itemstack); diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java index 3996b1c215..248817636f 100644 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java +++ b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityModularityTable.java @@ -243,7 +243,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI return this.inventoryGrid.getStackInSlot(slot); } else if (slot < (this.inventoryGrid.getSizeInventory()+this.inventoryOutputs.getSizeInventory())){ - return this.inventoryOutputs.getStackInSlot(slot-9); + return this.inventoryOutputs.getStackInSlot(slot); } else { return null; @@ -256,7 +256,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI return this.inventoryGrid.decrStackSize(slot, count); } else if (slot < (this.inventoryGrid.getSizeInventory()+this.inventoryOutputs.getSizeInventory())){ - return this.inventoryOutputs.decrStackSize(slot-9, count); + return this.inventoryOutputs.decrStackSize(slot, count); } else { return null; @@ -274,7 +274,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI this.inventoryGrid.setInventorySlotContents(slot, stack); } else if (slot < (this.inventoryGrid.getSizeInventory()+this.inventoryOutputs.getSizeInventory())){ - this.inventoryOutputs.setInventorySlotContents(slot-9, stack); + this.inventoryOutputs.setInventorySlotContents(slot, stack); } } @@ -312,7 +312,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI return this.inventoryGrid.isItemValidForSlot(slot, itemstack); } else if (slot < (this.inventoryGrid.getSizeInventory()+this.inventoryOutputs.getSizeInventory())){ - return this.inventoryOutputs.isItemValidForSlot(slot-9, itemstack); + return this.inventoryOutputs.isItemValidForSlot(slot, itemstack); } else { return false; @@ -321,20 +321,7 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI @Override public int[] getAccessibleSlotsFromSide(int side) { - int[] accessibleSides = new int[this.getSizeInventory()]; - /*if (side == 0){ - - } - else if (side == 1){ - for (int r=0; r<this.inventoryOutputs.getSizeInventory(); r++){ - accessibleSides[r]=9+r; - } - } - else if (side > 1){ - for (int r=0; r<this.inventoryGrid.getSizeInventory(); r++){ - accessibleSides[r]=r; - } - } */ + int[] accessibleSides = new int[this.getSizeInventory()]; for (int r=0; r<this.getSizeInventory(); r++){ accessibleSides[r]=r; } @@ -346,12 +333,15 @@ public class TileEntityModularityTable extends TileEntityBase implements ISidedI public boolean canInsertItem(int slot, ItemStack item, int side) { Utils.LOG_INFO("Slot:"+slot+" | side? "+side); - if (slot <= 8){ - return this.inventoryGrid.isItemValidForSlot(slot, item); + if (side == 1){ + return this.inventoryOutputs.isItemValidForSlot(0, item); } - else { + if (slot >= 9){ return this.inventoryOutputs.isItemValidForSlot(slot, item); } + else { + return this.inventoryGrid.isItemValidForSlot(slot, item); + } } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index ba748e13d7..9fcecf8e2f 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -260,7 +260,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if(mInventory[SLOT_ROTOR].getItem() instanceof GT_MetaGenerated_Tool_01 && ((GT_MetaGenerated_Tool) mInventory[SLOT_ROTOR].getItem()).getToolStats(mInventory[SLOT_ROTOR]).getSpeedMultiplier()>0 && GT_MetaGenerated_Tool.getPrimaryMaterial(mInventory[SLOT_ROTOR]).mToolSpeed>0 ) { - long damageValue = (10L*(long) Math.min(-mTier / mDamageFactorLow, Math.pow(-mTier, this.mDamageFactorHigh))); + long damageValue = ((10L*(long) Math.min(-mTier / mDamageFactorLow, Math.pow(-mTier, this.mDamageFactorHigh)))/10); if (damageValue <= 1){ if (this.mOptimalAirFlow > 0){ |