Update to support new RC teir calculations

This commit is contained in:
modmuss50 2017-06-09 14:53:24 +01:00
parent 2b7868c651
commit c7419ee8ac
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
41 changed files with 11 additions and 279 deletions

View file

@ -156,11 +156,6 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.values()[this.tier];
}
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
return false;

View file

@ -45,10 +45,6 @@ public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable
int powerToAdd;
public TileCreativePanel() {
super(1);
}
@Override
public void updateEntity() {
super.updateEntity();

View file

@ -26,7 +26,6 @@ package techreborn.tiles.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import techreborn.api.generator.EFluidGenerator;
@ -69,11 +68,6 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont
return maxOutput;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("dieselgenerator").player(player.inventory).inventory(8, 84).hotbar(8, 142)

View file

@ -29,7 +29,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable;
import reborncore.common.blocks.BlockMachineBase;
@ -49,14 +48,12 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
public static int maxEnergy = 1000;
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerEnergyPerTick", comment = "Dragon Egg Siphoner Energy Per Tick (Value in EU)")
public static int energyPerTick = 4;
@ConfigRegistry(config = "machines", category = "dragon_egg_siphoner", key = "DragonEggSiphonerTier", comment = "Dragon Egg Siphoner Tier")
public static int tier = 2;
public Inventory inventory = new Inventory(3, "TileDragonEggSiphoner", 64, this);
private long lastOutput = 0;
public TileDragonEggSiphoner() {
super(tier);
super();
}
@Override
@ -144,11 +141,6 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public Inventory getInventory() {
return inventory;

View file

@ -26,9 +26,6 @@ package techreborn.tiles.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
@ -47,11 +44,6 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer
return new ItemStack(ModBlocks.GAS_TURBINE, 1);
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public double getBaseMaxPower() {
return ConfigTechReborn.ThermalGeneratorCharge;

View file

@ -31,7 +31,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.ForgeModContainer;
import reborncore.api.power.EnumPowerTier;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.IWrenchable;
import reborncore.common.blocks.BlockMachineBase;
@ -55,7 +54,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
ItemStack burnItem;
public TileGenerator() {
super(1);
super();
}
public static int getItemBurnTime(final ItemStack stack) {
@ -154,11 +153,6 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
@Override
public ItemStack getWrenchDrop(final EntityPlayer p0) {
return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR);

View file

@ -29,7 +29,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.IWrenchable;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.TilePowerAcceptor;
@ -142,11 +141,6 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
// @Override
// public void addWailaInfo(List<String> info)
// {

View file

@ -31,12 +31,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.IWrenchable;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
@ -130,11 +127,6 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable {
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.HIGH;
}
@Override
public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) {
return false;

View file

@ -26,9 +26,6 @@ package techreborn.tiles.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.api.generator.EFluidGenerator;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
@ -47,10 +44,6 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC
return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1);
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
@Override
public double getBaseMaxPower() {

View file

@ -27,11 +27,8 @@ package techreborn.tiles.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.IWrenchable;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.blocks.generator.BlockSolarPanel;
import techreborn.init.ModBlocks;
@ -112,11 +109,6 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable {
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
@Override
public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) {
return false;

View file

@ -29,7 +29,6 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.FluidUtils;
@ -93,11 +92,6 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon
return maxOutput;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("thermalgenerator").player(player.inventory).inventory(8, 84).hotbar(8, 142)

View file

@ -28,11 +28,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.IWrenchable;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.init.ModBlocks;
/**
@ -91,11 +88,6 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable {
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
@Override
public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) {
return false;

View file

@ -27,11 +27,8 @@ package techreborn.tiles.generator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.IWrenchable;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.init.ModBlocks;
/**
@ -84,11 +81,6 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable {
return 0;
}
@Override
public EnumPowerTier getBaseTier() {
return EnumPowerTier.LOW;
}
@Override
public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) {
return false;