Begin the Great Refactor of Mid-2017

This commit is contained in:
Prospector 2017-06-13 16:49:52 -07:00
parent a4a4042eb1
commit 1fa9f1cf52
97 changed files with 328 additions and 1713 deletions

View file

@ -42,7 +42,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileChargeBench extends TilePowerAcceptor
public class TileChargeOMat extends TilePowerAcceptor
implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider {
@ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchMaxInput", comment = "Charge Bench Max Input (Value in EU)")
@ -52,9 +52,9 @@ public class TileChargeBench extends TilePowerAcceptor
// @ConfigRegistry(config = "machines", category = "charge_bench", key = "ChargeBenchWrenchDropRate", comment = "Charge Bench Wrench Drop Rate")
public static float wrenchDropRate = 1.0F;
public Inventory inventory = new Inventory(6, "TileChargeBench", 64, this);
public Inventory inventory = new Inventory(6, "TileChargeOMat", 64, this);
public TileChargeBench() {
public TileChargeOMat() {
super();
}

View file

@ -50,7 +50,7 @@ import techreborn.lib.ModInfo;
import java.util.List;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileCentrifuge extends TilePowerAcceptor
public class TileIndustrialCentrifuge extends TilePowerAcceptor
implements IWrenchable, IInventoryProvider, IListInfoProvider, IRecipeCrafterProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "centrifuge", key = "CentrifugeMaxInput", comment = "Centrifuge Max Input (Value in EU)")
@ -61,10 +61,10 @@ public class TileCentrifuge extends TilePowerAcceptor
public static float wrenchDropRate = 1.0F;
public int tickTime;
public Inventory inventory = new Inventory(11, "TileCentrifuge", 64, this);
public Inventory inventory = new Inventory(11, "TileIndustrialCentrifuge", 64, this);
public RecipeCrafter crafter;
public TileCentrifuge() {
public TileIndustrialCentrifuge() {
super();
// Input slots
final int[] inputs = new int[] { 0, 1 };

View file

@ -51,18 +51,18 @@ import techreborn.init.ModBlocks;
import techreborn.multiblocks.MultiBlockCasing;
import techreborn.tiles.TileMachineCasing;
public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider,
public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements IWrenchable, IInventoryProvider,
ITileRecipeHandler<BlastFurnaceRecipe>, IRecipeCrafterProvider, IContainerProvider {
public static int euTick = 5;
public int tickTime;
public Inventory inventory = new Inventory(4, "TileBlastFurnace", 64, this);
public Inventory inventory = new Inventory(4, "TileIndustrialBlastFurnace", 64, this);
public RecipeCrafter crafter;
public int capacity = 1000;
private int cachedHeat;
public TileBlastFurnace() {
public TileIndustrialBlastFurnace() {
super();
// TODO configs
final int[] inputs = new int[2];
@ -219,8 +219,8 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,
@Override
public boolean canCraft(final TileEntity tile, final BlastFurnaceRecipe recipe) {
if (tile instanceof TileBlastFurnace) {
final TileBlastFurnace blastFurnace = (TileBlastFurnace) tile;
if (tile instanceof TileIndustrialBlastFurnace) {
final TileIndustrialBlastFurnace blastFurnace = (TileIndustrialBlastFurnace) tile;
return blastFurnace.getHeat() >= recipe.neededHeat;
}
return false;