Update to support RC changes

This commit is contained in:
modmuss50 2017-06-12 20:06:15 +01:00
parent f3726fd174
commit 0cf3e43992
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
28 changed files with 29 additions and 169 deletions

View file

@ -40,16 +40,22 @@ import net.minecraftforge.fluids.IFluidBlock;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.Tank;
import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo;
import java.util.List;
/**
* Created by modmuss50 on 08/05/2016.
*/
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TilePump extends TilePowerAcceptor {
@ConfigRegistry(config = "machines", category = "pump", key = "PumpEUCost", comment = "Pump cost for one block of fluid (Value in EU)")
public static int pumpExtractEU = 20;
public Tank tank = new Tank("TilePump", 10000, this);
public TilePump() {
@ -59,11 +65,11 @@ public class TilePump extends TilePowerAcceptor {
@Override
public void updateEntity() {
super.updateEntity();
if (!world.isRemote && world.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(ConfigTechReborn.pumpExtractEU)) {
if (!world.isRemote && world.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(pumpExtractEU)) {
FluidStack fluidStack = drainBlock(world, pos.down(), false);
if (fluidStack != null) {
tank.fill(drainBlock(world, pos.down(), true), true);
useEnergy(ConfigTechReborn.pumpExtractEU);
useEnergy(pumpExtractEU);
}
tank.compareAndUpdate();
}
@ -73,7 +79,7 @@ public class TilePump extends TilePowerAcceptor {
public void addInfo(List<String> info, boolean isRealTile) {
super.addInfo(info, isRealTile);
info.add(TextFormatting.LIGHT_PURPLE + "Eu per extract " + TextFormatting.GREEN
+ PowerSystem.getLocaliszedPower(ConfigTechReborn.pumpExtractEU));
+ PowerSystem.getLocaliszedPower(pumpExtractEU));
info.add(TextFormatting.LIGHT_PURPLE + "Speed: " + TextFormatting.GREEN
+ "1000mb/5 sec");
}

View file

@ -49,7 +49,6 @@ import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.config.ConfigTechReborn;
import techreborn.init.ModBlocks;
public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrenchable, IInventoryProvider,
@ -62,7 +61,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha
public MultiblockChecker multiblockChecker;
public TileIndustrialGrinder() {
super(ConfigTechReborn.CentrifugeTier);
super();
// TODO configs
final int[] inputs = new int[2];