Remove old upgrade handler to make way for the new one.
This commit is contained in:
parent
8c3be8366a
commit
34978f7ffe
10 changed files with 25 additions and 166 deletions
|
@ -46,7 +46,6 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.utils.upgrade.UpgradeHandler;
|
||||
|
||||
public class TileAlloySmelter extends TilePowerAcceptor
|
||||
implements IWrenchable, IInventoryProvider, ISidedInventory, IRecipeCrafterProvider, IContainerProvider {
|
||||
|
@ -55,7 +54,6 @@ public class TileAlloySmelter extends TilePowerAcceptor
|
|||
public Inventory inventory = new Inventory(8, "TileAlloySmelter", 64, this);
|
||||
public RecipeCrafter crafter;
|
||||
public int capacity = 1000;
|
||||
UpgradeHandler upgrades;
|
||||
|
||||
public TileAlloySmelter() {
|
||||
super(1);
|
||||
|
@ -66,14 +64,12 @@ public class TileAlloySmelter extends TilePowerAcceptor
|
|||
final int[] outputs = new int[1];
|
||||
outputs[0] = 2;
|
||||
this.crafter = new RecipeCrafter(Reference.alloySmelteRecipe, this, 2, 1, this.inventory, inputs, outputs);
|
||||
this.upgrades = new UpgradeHandler(this.crafter, this.inventory, 4, 5, 6, 7);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update() {
|
||||
super.update();
|
||||
this.crafter.updateEntity();
|
||||
this.upgrades.tick();
|
||||
this.charge(3);
|
||||
}
|
||||
|
||||
|
|
|
@ -39,13 +39,11 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.utils.upgrade.UpgradeHandler;
|
||||
|
||||
public class TileCompressor extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider {
|
||||
|
||||
public Inventory inventory = new Inventory(6, "TileCompressor", 64, this);
|
||||
|
||||
public UpgradeHandler upgradeHandler;
|
||||
public RecipeCrafter crafter;
|
||||
|
||||
public int capacity = 1000;
|
||||
|
@ -55,7 +53,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
|
|||
final int[] inputs = new int[] { 0 };
|
||||
final int[] outputs = new int[] { 1 };
|
||||
this.crafter = new RecipeCrafter(Reference.compressorRecipe, this, 2, 1, this.inventory, inputs, outputs);
|
||||
this.upgradeHandler = new UpgradeHandler(this.crafter, this.inventory, 2, 3, 4, 5);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -63,7 +61,6 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II
|
|||
if (!this.world.isRemote) {
|
||||
super.update();
|
||||
this.crafter.updateEntity();
|
||||
this.upgradeHandler.tick();
|
||||
this.charge(3);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -40,14 +40,12 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
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;
|
||||
|
@ -59,7 +57,6 @@ public class TileExtractor extends TilePowerAcceptor
|
|||
final int[] outputs = new int[1];
|
||||
outputs[0] = 1;
|
||||
this.crafter = new RecipeCrafter(Reference.extractorRecipe, this, 2, 1, this.inventory, inputs, outputs);
|
||||
this.upgradeHandler = new UpgradeHandler(this.crafter, this.inventory, 2, 3, 4, 5);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -67,7 +64,6 @@ public class TileExtractor extends TilePowerAcceptor
|
|||
if (!this.world.isRemote) {
|
||||
super.update();
|
||||
this.crafter.updateEntity();
|
||||
this.upgradeHandler.tick();
|
||||
this.charge(3);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -42,14 +42,12 @@ import techreborn.client.container.IContainerProvider;
|
|||
import techreborn.client.container.builder.BuiltContainer;
|
||||
import techreborn.client.container.builder.ContainerBuilder;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.utils.upgrade.UpgradeHandler;
|
||||
|
||||
public class TileGrinder extends TilePowerAcceptor
|
||||
implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerProvider {
|
||||
|
||||
public Inventory inventory = new Inventory(6, "TileGrinder", 64, this);
|
||||
|
||||
public UpgradeHandler upgradeHandler;
|
||||
public RecipeCrafter crafter;
|
||||
|
||||
public int capacity = 1000;
|
||||
|
@ -61,14 +59,12 @@ implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerPr
|
|||
final int[] outputs = new int[1];
|
||||
outputs[0] = 1;
|
||||
this.crafter = new RecipeCrafter(Reference.grinderRecipe, this, 2, 1, this.inventory, inputs, outputs);
|
||||
this.upgradeHandler = new UpgradeHandler(this.crafter, this.inventory, 2, 3, 4, 5);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void update() {
|
||||
if (!this.world.isRemote) {
|
||||
super.update();
|
||||
this.upgradeHandler.tick();
|
||||
//charge(3); TODO
|
||||
this.charge(3);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue