Continue the great refactor of mid 2017 (A lot of stuff still broken, it's a WIP)

This commit is contained in:
Prospector 2017-06-14 08:56:09 -07:00
parent 1fa9f1cf52
commit 40e3062903
123 changed files with 1469 additions and 1486 deletions

View file

@ -38,7 +38,7 @@ import java.util.List;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable {
public class TileCreativeSolarPanel extends TilePowerAcceptor implements IWrenchable {
boolean shouldMakePower = false;
boolean lastTickSate = false;

View file

@ -40,7 +40,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrenchable, IInventoryProvider {
public class TileDragonEggSyphon extends TilePowerAcceptor implements IWrenchable, IInventoryProvider {
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerMaxOutput", comment = "Dragon Egg Siphoner Max Output (Value in EU)")
public static int maxOutput = 128;
@ -49,10 +49,10 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerEnergyPerTick", comment = "Dragon Egg Siphoner Energy Per Tick (Value in EU)")
public static int energyPerTick = 4;
public Inventory inventory = new Inventory(3, "TileDragonEggSiphoner", 64, this);
public Inventory inventory = new Inventory(3, "TileDragonEggSyphon", 64, this);
private long lastOutput = 0;
public TileDragonEggSiphoner() {
public TileDragonEggSyphon() {
super();
}
@ -109,7 +109,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.DRAGON_EGG_SIPHONER, 1);
return new ItemStack(ModBlocks.DRAGON_EGG_SYPHON, 1);
}
public boolean isComplete() {

View file

@ -36,7 +36,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IContainerProvider {
public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IContainerProvider {
@ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorMaxOutput", comment = "Semifluid Generator Max Output (Value in EU)")
public static int maxOutput = 128;
@ -47,13 +47,13 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC
@ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorEnergyPerTick", comment = "Semifluid Generator Energy Per Tick (Value in EU)")
public static int energyPerTick = 8;
public TileSemifluidGenerator() {
super(EFluidGenerator.SEMIFLUID, "TileSemifluidGenerator", tankCapacity, energyPerTick);
public TileSemiFluidGenerator() {
super(EFluidGenerator.SEMIFLUID, "TileSemiFluidGenerator", tankCapacity, energyPerTick);
}
@Override
public ItemStack getWrenchDrop(final EntityPlayer arg0) {
return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1);
return new ItemStack(ModBlocks.SEMI_FLUID_GENERATOR, 1);
}
@Override

View file

@ -45,7 +45,7 @@ import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider {
public class TileSolidFuelGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider, IContainerProvider {
@ConfigRegistry(config = "machines", category = "generator", key = "GeneratorMaxOutput", comment = "Solid Fuel Generator Max Output (Value in EU)")
public static int maxOutput = 32;
@ -54,7 +54,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@ConfigRegistry(config = "machines", category = "generator", key = "GeneratorEnergyOutput", comment = "Solid Fuel Generator Energy Output Amount (Value in EU)")
public static int outputAmount = 10;
public Inventory inventory = new Inventory(2, "TileGenerator", 64, this);
public Inventory inventory = new Inventory(2, "TileSolidFuelGenerator", 64, this);
public int fuelSlot = 0;
public int burnTime;
public int totalBurnTime = 0;
@ -64,7 +64,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
public boolean lastTickBurning;
ItemStack burnItem;
public TileGenerator() {
public TileSolidFuelGenerator() {
super();
}
@ -81,7 +81,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
if (this.getEnergy() < this.getMaxPower()) {
if (this.burnTime > 0) {
this.burnTime--;
this.addEnergy(TileGenerator.outputAmount);
this.addEnergy(TileSolidFuelGenerator.outputAmount);
this.isBurning = true;
}
} else {
@ -90,7 +90,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
if (this.burnTime == 0) {
this.updateState();
this.burnTime = this.totalBurnTime = TileGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot));
this.burnTime = this.totalBurnTime = TileSolidFuelGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot));
if (this.burnTime > 0) {
this.updateState();
this.burnItem = this.getStackInSlot(this.fuelSlot);
@ -204,7 +204,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) {
return TileGenerator.getItemBurnTime(itemStackIn) != 0;
return TileSolidFuelGenerator.getItemBurnTime(itemStackIn) != 0;
}
@Override