Automation fixes, upgrades fixes.

This commit is contained in:
Dragon2488 2016-07-27 17:51:03 +07:00
parent be4f10b975
commit a5a9460707
14 changed files with 203 additions and 154 deletions

View file

@ -267,4 +267,19 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
return inventory;
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1, 2};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0 || index == 1;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 2;
}
}

View file

@ -36,7 +36,7 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,I
@Override
public void update() {
super.updateEntity();
super.update();
crafter.updateEntity();
upgrades.tick();
//charge(3); TODO
@ -95,23 +95,20 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,I
// }
// }
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2} : new int[]{0, 1, 2};
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1, 2};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0 || index == 1;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 2;
}
public int getProgressScaled(int scale) {
if (crafter.currentTickTime != 0 && crafter.currentNeededTicks != 0) {

View file

@ -65,39 +65,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
return new ItemStack(ModBlocks.AssemblyMachine, 1);
}
public boolean isComplete() {
return false;
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2} : new int[]{0, 1, 2};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2;
}
// @Override
// public void addWailaInfo(List<String> info)
// {
// super.addWailaInfo(info);
// info.add("Power Stored " + energy.getEnergyStored() +" EU");
// if(crafter.currentRecipe !=null){
// info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
// }
// }
public int getProgressScaled(int scale) {
if (crafter.currentTickTime != 0) {
return crafter.currentTickTime * scale / crafter.currentNeededTicks;
@ -130,4 +97,19 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
return RebornContainer.getContainerFromClass(ContainerAssemblingMachine.class, this);
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1, 2};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0 || index == 1;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 2;
}
}

View file

@ -138,23 +138,20 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,I
tagCompound.setInteger("tickTime", tickTime);
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2, 3} : new int[]{0, 1, 2, 3};
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1, 2, 3};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex >= 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0 || index == 1;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2 || slotIndex == 3;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 2 || index == 3;
}
public int getProgressScaled(int scale) {
if (crafter.currentTickTime != 0) {

View file

@ -1,28 +1,21 @@
package techreborn.tiles.multiblock;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import reborncore.common.IWrenchable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.recipe.IRecipeCrafterProvider;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.misc.Location;
import reborncore.common.IWrenchable;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.tile.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.api.Reference;
import techreborn.blocks.BlockMachineCasing;
import techreborn.init.ModBlocks;
import techreborn.tiles.TileMachineCasing;
import static techreborn.tiles.multiblock.MultiblockChecker.CASING_NORMAL;
import static techreborn.tiles.multiblock.MultiblockChecker.CASING_REINFORCED;
import static techreborn.tiles.multiblock.MultiblockChecker.ZERO_OFFSET;
@ -97,20 +90,19 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
return tagCompound;
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2, 3} : new int[]{0, 1, 2, 3};
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex < 2 && isItemValidForSlot(slotIndex, itemStack);
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2 || slotIndex == 3;
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
public int getProgressScaled(int scale) {

View file

@ -147,23 +147,20 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha
return new FluidTankInfo[]{tank.getInfo()};
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2, 3, 4, 5} : new int[]{0, 1, 2, 3, 4, 5};
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 2, 3};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex >= 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4 || slotIndex == 5;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 2 || index == 3;
}
public int getProgressScaled(int scale) {
if (crafter.currentTickTime != 0) {
@ -232,4 +229,6 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha
return crafter;
}
}

View file

@ -188,21 +188,20 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
return new FluidTankInfo[]{tank.getInfo()};
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2, 3, 4} : new int[]{0, 1, 2, 3, 4};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex < 2 && isItemValidForSlot(slotIndex, itemStack);
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 2, 3, 4, 5};
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2 || slotIndex == 3 || slotIndex == 4;
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index >= 2;
}
public int getProgressScaled(int scale) {
if (tickTime != 0) {

View file

@ -1,6 +1,7 @@
package techreborn.tiles.multiblock;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
@ -17,7 +18,7 @@ import techreborn.init.ModBlocks;
import static techreborn.tiles.multiblock.MultiblockChecker.CASING_REINFORCED;
import static techreborn.tiles.multiblock.MultiblockChecker.ZERO_OFFSET;
public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, IRecipeCrafterProvider {
public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, IRecipeCrafterProvider, ISidedInventory {
public Inventory inventory = new Inventory(3, "TileVacuumFreezer", 64, this);
public MultiblockChecker multiblockChecker;
@ -111,4 +112,19 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
return crafter;
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
}

View file

@ -136,4 +136,19 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IEnergyProdu
return inventory;
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return true;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return true;
}
}

View file

@ -13,11 +13,15 @@ import reborncore.common.tile.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.api.Reference;
import techreborn.init.ModBlocks;
import techreborn.utils.upgrade.UpgradeHandler;
public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, ISidedInventory {
public Inventory inventory = new Inventory(6, "TileCompressor", 64, this);
public UpgradeHandler upgradeHandler;
public RecipeCrafter crafter;
public int capacity = 1000;
public TileCompressor() {
@ -26,13 +30,14 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
int[] outputs = new int[1];
outputs[0] = 1;
crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, inventory, inputs, outputs);
upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5);
}
@Override
public void update() {
super.update();
crafter.updateEntity();
// upgrades.tick();
upgradeHandler.tick();
//charge(3); TODO
}
@ -65,23 +70,20 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
return false;
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{0, 1, 2} : new int[]{0, 1, 2};
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
public int getProgressScaled(int scale) {
if (crafter.currentTickTime != 0) {

View file

@ -1,5 +1,6 @@
package techreborn.tiles.teir1;
import ic2.core.upgrade.IUpgradeItem;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;
@ -10,9 +11,11 @@ import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.recipes.RecipeCrafter;
import reborncore.common.tile.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.init.ModBlocks;
import techreborn.utils.upgrade.UpgradeHandler;
public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, ISidedInventory {
@ -34,6 +37,7 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
public void update() {
super.update();
//charge(3); TODO
boolean burning = isBurning();
boolean updateInventory = false;
if (isBurning() && canSmelt()) {
@ -144,22 +148,20 @@ public class TileElectricFurnace extends TilePowerAcceptor implements IWrenchabl
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? SLOTS_BOTTOM : (side == EnumFacing.UP ? SLOTS_TOP : SLOTS_SIDES);
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2)
return false;
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
@Override
public double getMaxPower() {

View file

@ -16,11 +16,15 @@ import reborncore.common.util.Inventory;
import techreborn.api.Reference;
import techreborn.client.container.ContainerExtractor;
import techreborn.init.ModBlocks;
import techreborn.utils.upgrade.UpgradeHandler;
public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInventoryProvider, IRecipeCrafterProvider, IContainerProvider {
public Inventory inventory = new Inventory(6, "TileExtractor", 64, this);
public UpgradeHandler upgradeHandler;
public RecipeCrafter crafter;
public int capacity = 1000;
public TileExtractor() {
@ -29,13 +33,14 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInv
int[] outputs = new int[1];
outputs[0] = 1;
crafter = new RecipeCrafter(Reference.extractorRecipe, this, 2, 1, inventory, inputs, outputs);
upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5);
}
@Override
public void updateEntity() {
super.updateEntity();
public void update() {
super.update();
crafter.updateEntity();
// upgrades.tick();
upgradeHandler.tick();
//charge(3); TODO
}
@ -111,4 +116,20 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInv
public RebornContainer getContainer() {
return RebornContainer.getContainerFromClass(ContainerExtractor.class, this);
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
}

View file

@ -1,5 +1,6 @@
package techreborn.tiles.teir1;
import net.minecraft.inventory.ISidedInventory;
import reborncore.common.IWrenchable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -17,12 +18,16 @@ import reborncore.common.util.Inventory;
import techreborn.api.Reference;
import techreborn.client.container.ContainerGrinder;
import techreborn.init.ModBlocks;
import techreborn.utils.upgrade.UpgradeHandler;
public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInventoryProvider,
IListInfoProvider, IRecipeCrafterProvider, IContainerProvider {
public class TileGrinder extends TilePowerAcceptor implements IWrenchable, IInventoryProvider,
IListInfoProvider, IRecipeCrafterProvider, IContainerProvider, ISidedInventory {
public Inventory inventory = new Inventory(6, "TileGrinder", 64, this);
public UpgradeHandler upgradeHandler;
public RecipeCrafter crafter;
public int capacity = 1000;
public TileGrinder() {
@ -31,12 +36,14 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
int[] outputs = new int[1];
outputs[0] = 1;
crafter = new RecipeCrafter(Reference.grinderRecipe, this, 2, 1, inventory, inputs, outputs);
upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5);
}
@Override
public void update() {
super.update();
crafter.updateEntity();
upgradeHandler.tick();
//charge(3); TODO
}
@ -65,10 +72,6 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
return new ItemStack(ModBlocks.Grinder, 1);
}
public boolean isComplete() {
return false;
}
@Override
public void readFromNBT(NBTTagCompound tagCompound) {
super.readFromNBT(tagCompound);
@ -114,4 +117,19 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
public RebornContainer getContainer() {
return RebornContainer.getContainerFromClass(ContainerGrinder.class, this);
}
@Override
public int[] getSlotsForFace(EnumFacing side) {
return new int[] {0, 1};
}
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return index == 0;
}
@Override
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) {
return index == 1;
}
}

View file

@ -142,21 +142,15 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable,IInve
return new ItemStack(ModBlocks.recycler, 1);
}
public boolean isComplete() {
return false;
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[]{output} : new int[]{input1};
return new int[] {input1, output};
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == output)
return false;
return isItemValidForSlot(slotIndex, itemStack);
return slotIndex == input1;
}
@Override