Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts: # src/main/java/techreborn/client/container/ContainerAlloySmelter.java # src/main/java/techreborn/client/container/ContainerAssemblingMachine.java # src/main/java/techreborn/client/container/ContainerCentrifuge.java # src/main/java/techreborn/items/tools/ItemNanosaber.java
This commit is contained in:
commit
5782d2d032
10 changed files with 81 additions and 120 deletions
|
@ -17,7 +17,7 @@ import techreborn.api.Reference;
|
|||
import techreborn.client.container.ContainerAssemblingMachine;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
||||
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider {
|
||||
public class TileAssemblingMachine extends TilePowerAcceptor implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvider {
|
||||
|
||||
public int tickTime;
|
||||
public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64, this);
|
||||
|
@ -126,11 +126,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor implements IWrencha
|
|||
return crafter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RebornContainer getContainer() {
|
||||
return RebornContainer.getContainerFromClass(ContainerAssemblingMachine.class, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getSlotsForFace(EnumFacing side) {
|
||||
return new int[] { 0, 1, 2 };
|
||||
|
|
|
@ -24,7 +24,7 @@ import techreborn.init.ModBlocks;
|
|||
import java.util.List;
|
||||
|
||||
public class TileCentrifuge extends TilePowerAcceptor
|
||||
implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider {
|
||||
implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider {
|
||||
|
||||
public int tickTime;
|
||||
public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this);
|
||||
|
@ -161,8 +161,4 @@ public class TileCentrifuge extends TilePowerAcceptor
|
|||
return crafter;
|
||||
}
|
||||
|
||||
@Override
|
||||
public RebornContainer getContainer() {
|
||||
return RebornContainer.getContainerFromClass(ContainerCentrifuge.class, this);
|
||||
}
|
||||
}
|
|
@ -26,10 +26,8 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
|
|||
|
||||
public TileCompressor() {
|
||||
super(1);
|
||||
int[] inputs = new int[1];
|
||||
inputs[0] = 0;
|
||||
int[] outputs = new int[1];
|
||||
outputs[0] = 1;
|
||||
int[] inputs = new int[] { 0 };
|
||||
int[] outputs = new int[] { 1 };
|
||||
crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, inventory, inputs, outputs);
|
||||
upgradeHandler = new UpgradeHandler(crafter, inventory, 2, 3, 4, 5);
|
||||
}
|
||||
|
@ -78,15 +76,13 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
||||
if (slotIndex == 2)
|
||||
return false;
|
||||
return isItemValidForSlot(slotIndex, itemStack);
|
||||
public boolean canInsertItem(int Index, ItemStack itemStack, EnumFacing side) {
|
||||
return Index == 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
|
||||
return slotIndex == 1;
|
||||
public boolean canExtractItem(int Index, ItemStack itemStack, EnumFacing side) {
|
||||
return Index == 1;
|
||||
}
|
||||
|
||||
public int getProgressScaled(int scale) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue