From 58b90f66c3e70d1d717b2e2f4411b18069cdcb7b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 21 Nov 2016 13:45:23 +0100 Subject: [PATCH] Added push/pull caps to all machines --- .../mod/tile/TileEntityAtomicReconstructor.java | 2 +- .../actuallyadditions/mod/tile/TileEntityBioReactor.java | 2 +- .../actuallyadditions/mod/tile/TileEntityCanolaPress.java | 2 +- .../actuallyadditions/mod/tile/TileEntityCoalGenerator.java | 2 +- .../actuallyadditions/mod/tile/TileEntityCoffeeMachine.java | 4 ++-- .../mod/tile/TileEntityDirectionalBreaker.java | 2 +- .../actuallyadditions/mod/tile/TileEntityDisplayStand.java | 2 +- .../actuallyadditions/mod/tile/TileEntityEnergizer.java | 2 +- .../actuallyadditions/mod/tile/TileEntityEnervator.java | 2 +- .../ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java | 2 +- .../actuallyadditions/mod/tile/TileEntityFireworkBox.java | 2 +- .../actuallyadditions/mod/tile/TileEntityFurnaceDouble.java | 2 +- .../actuallyadditions/mod/tile/TileEntityFurnaceSolar.java | 2 +- .../ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java | 2 +- .../actuallyadditions/mod/tile/TileEntityHeatCollector.java | 2 +- .../actuallyadditions/mod/tile/TileEntityItemRepairer.java | 4 ++-- .../mod/tile/TileEntityLavaFactoryController.java | 2 +- .../actuallyadditions/mod/tile/TileEntityLeafGenerator.java | 2 +- .../ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java | 2 +- .../actuallyadditions/mod/tile/TileEntityOilGenerator.java | 2 +- .../actuallyadditions/mod/tile/TileEntityPlayerInterface.java | 2 +- .../actuallyadditions/mod/tile/TileEntityShockSuppressor.java | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java index 298eaa442..285a87005 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityAtomicReconstructor.java @@ -30,7 +30,7 @@ import net.minecraft.world.World; public class TileEntityAtomicReconstructor extends TileEntityInventoryBase implements ICustomEnergyReceiver, IEnergyDisplay, IAtomicReconstructor{ public static final int ENERGY_USE = 1000; - public final EnergyStorage storage = new EnergyStorage(300000); + public final EnergyStorage storage = new EnergyStorage(300000, 5000); public int counter; private int currentTime; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java index e911282f2..2a2c89a49 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBioReactor.java @@ -27,7 +27,7 @@ import java.util.List; public class TileEntityBioReactor extends TileEntityInventoryBase implements ISharingEnergyProvider{ - public final EnergyStorage storage = new EnergyStorage(200000); + public final EnergyStorage storage = new EnergyStorage(200000, 800); public int burnTime; public int maxBurnTime; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java index 2fcb22af7..9a840a108 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCanolaPress.java @@ -30,7 +30,7 @@ public class TileEntityCanolaPress extends TileEntityInventoryBase implements IC public static final int PRODUCE = 80; public static final int ENERGY_USE = 35; private static final int TIME = 30; - public final EnergyStorage storage = new EnergyStorage(40000); + public final EnergyStorage storage = new EnergyStorage(40000, 100); public final FluidTank tank = new FluidTank(2*Util.BUCKET){ @Override public boolean canFill(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index 87dcc8dec..c76e815e1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -22,7 +22,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityCoalGenerator extends TileEntityInventoryBase implements ISharingEnergyProvider{ public static final int PRODUCE = 30; - public final EnergyStorage storage = new EnergyStorage(60000); + public final EnergyStorage storage = new EnergyStorage(60000, 80); public int maxBurnTime; public int currentBurnTime; private int lastEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java index 1993889a9..f4ca82862 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoffeeMachine.java @@ -35,12 +35,12 @@ public class TileEntityCoffeeMachine extends TileEntityInventoryBase implements public static final int SLOT_COFFEE_BEANS = 0; public static final int SLOT_INPUT = 1; public static final int SLOT_OUTPUT = 2; - public static final int CACHE_USE = 15; + public static final int CACHE_USE = 35; public static final int ENERGY_USED = 150; public static final int WATER_USE = 500; public static final int COFFEE_CACHE_MAX_AMOUNT = 300; private static final int TIME_USED = 500; - public final EnergyStorage storage = new EnergyStorage(300000); + public final EnergyStorage storage = new EnergyStorage(300000, 250); public final FluidTank tank = new FluidTank(4*Util.BUCKET){ @Override public boolean canDrain(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java index 33f0ea8ab..5ce5ea785 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDirectionalBreaker.java @@ -28,7 +28,7 @@ public class TileEntityDirectionalBreaker extends TileEntityInventoryBase implem public static final int RANGE = 8; public static final int ENERGY_USE = 5; - public final EnergyStorage storage = new EnergyStorage(10000); + public final EnergyStorage storage = new EnergyStorage(10000, 20); private int lastEnergy; private int currentTime; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java index 0fa8a6977..35d5e68ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityDisplayStand.java @@ -22,7 +22,7 @@ import net.minecraft.util.EnumFacing; public class TileEntityDisplayStand extends TileEntityInventoryBase implements IEnergyDisplay, ICustomEnergyReceiver{ - public final EnergyStorage storage = new EnergyStorage(800000); + public final EnergyStorage storage = new EnergyStorage(80000, 1000); private int oldEnergy; public TileEntityDisplayStand(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java index 86ab94938..bd72e2101 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnergizer.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityEnergizer extends TileEntityInventoryBase implements ICustomEnergyReceiver{ - public final EnergyStorage storage = new EnergyStorage(500000); + public final EnergyStorage storage = new EnergyStorage(50000, 1000); private int lastEnergy; public TileEntityEnergizer(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java index 73218bfef..4f63bdf1c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityEnervator.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityEnervator extends TileEntityInventoryBase implements ISharingEnergyProvider{ - public final EnergyStorage storage = new EnergyStorage(500000); + public final EnergyStorage storage = new EnergyStorage(50000, 1000); private int lastEnergy; public TileEntityEnervator(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java index 671a4f6fd..d90142956 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFarmer.java @@ -35,7 +35,7 @@ import java.util.List; public class TileEntityFarmer extends TileEntityInventoryBase implements ICustomEnergyReceiver{ public static final int USE_PER_OPERATION = 1500; - public final EnergyStorage storage = new EnergyStorage(100000); + public final EnergyStorage storage = new EnergyStorage(100000, 1000); private int waitTime; private int checkX; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java index 12a7d278d..3d6f748d3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFireworkBox.java @@ -24,7 +24,7 @@ import net.minecraft.world.World; public class TileEntityFireworkBox extends TileEntityBase implements ICustomEnergyReceiver, IEnergyDisplay{ public static final int USE_PER_SHOT = 300; - public final EnergyStorage storage = new EnergyStorage(20000); + public final EnergyStorage storage = new EnergyStorage(20000, 200); private int timeUntilNextFirework; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java index f28c27497..4ebaf4c7d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceDouble.java @@ -33,7 +33,7 @@ public class TileEntityFurnaceDouble extends TileEntityInventoryBase implements public static final int SLOT_OUTPUT_2 = 3; public static final int ENERGY_USE = 25; private static final int SMELT_TIME = 80; - public final EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000, 80); public int firstSmeltTime; public int secondSmeltTime; public boolean isAutoSplit; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java index 502013e76..8a0ba58f5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFurnaceSolar.java @@ -19,7 +19,7 @@ import net.minecraft.util.math.BlockPos; public class TileEntityFurnaceSolar extends TileEntityBase implements ISharingEnergyProvider, IEnergyDisplay{ public static final int PRODUCE = 8; - public final EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000, 100); private int oldEnergy; public TileEntityFurnaceSolar(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java index 2c8cc0a9d..62ceb0c3c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityGrinder.java @@ -36,7 +36,7 @@ public class TileEntityGrinder extends TileEntityInventoryBase implements ICusto public static final int SLOT_OUTPUT_2_1 = 4; public static final int SLOT_OUTPUT_2_2 = 5; public static final int ENERGY_USE = 40; - public final EnergyStorage storage = new EnergyStorage(60000); + public final EnergyStorage storage = new EnergyStorage(60000, 100); public int firstCrushTime; public int secondCrushTime; public boolean isDouble; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java index 2145244f6..ccb738c9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityHeatCollector.java @@ -25,7 +25,7 @@ public class TileEntityHeatCollector extends TileEntityBase implements ISharingE public static final int ENERGY_PRODUCE = 40; public static final int BLOCKS_NEEDED = 4; - public final EnergyStorage storage = new EnergyStorage(30000); + public final EnergyStorage storage = new EnergyStorage(30000, 80); private int oldEnergy; public TileEntityHeatCollector(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java index 44da7774c..8532226ab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityItemRepairer.java @@ -24,8 +24,8 @@ public class TileEntityItemRepairer extends TileEntityInventoryBase implements I public static final int SLOT_INPUT = 0; public static final int SLOT_OUTPUT = 1; - public static final int ENERGY_USE = 5000; - public final EnergyStorage storage = new EnergyStorage(300000); + public static final int ENERGY_USE = 3500; + public final EnergyStorage storage = new EnergyStorage(300000, 6000); public int nextRepairTick; private int lastEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java index 8100c444b..f49ce27ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLavaFactoryController.java @@ -27,7 +27,7 @@ public class TileEntityLavaFactoryController extends TileEntityBase implements I public static final int HAS_LAVA = 1; public static final int HAS_AIR = 2; public static final int ENERGY_USE = 150000; - public final EnergyStorage storage = new EnergyStorage(3000000); + public final EnergyStorage storage = new EnergyStorage(300000, 2000); private int currentWorkTime; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java index 98be57113..f2b215787 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLeafGenerator.java @@ -25,7 +25,7 @@ public class TileEntityLeafGenerator extends TileEntityBase implements ISharingE public static final int RANGE = 7; public static final int ENERGY_PRODUCED = 300; - public final EnergyStorage storage = new EnergyStorage(35000); + public final EnergyStorage storage = new EnergyStorage(35000, 450); private int nextUseCounter; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java index ad76ea697..907ed6d78 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityMiner.java @@ -34,7 +34,7 @@ public class TileEntityMiner extends TileEntityInventoryBase implements ICustomE public static final int ENERGY_USE_PER_BLOCK = 1500; public static final int DEFAULT_RANGE = 2; - public final EnergyStorage storage = new EnergyStorage(200000); + public final EnergyStorage storage = new EnergyStorage(200000, 2000); public int layerAt = -1; public boolean onlyMineOres; private int oldLayerAt; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java index afd7e7cfd..bc25f7163 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityOilGenerator.java @@ -25,7 +25,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class TileEntityOilGenerator extends TileEntityBase implements ISharingEnergyProvider, ISharingFluidHandler{ - public final EnergyStorage storage = new EnergyStorage(50000); + public final EnergyStorage storage = new EnergyStorage(50000, 150); public final FluidTank tank = new FluidTank(2*Util.BUCKET){ @Override public boolean canDrain(){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java index 1900c5fd8..30fb4b1b4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityPlayerInterface.java @@ -27,7 +27,7 @@ import java.util.UUID; public class TileEntityPlayerInterface extends TileEntityInventoryBase implements ICustomEnergyReceiver, IEnergyDisplay{ public static final int DEFAULT_RANGE = 32; - private final EnergyStorage storage = new EnergyStorage(30000); + private final EnergyStorage storage = new EnergyStorage(30000, 50); public UUID connectedPlayer; public String playerName; private int oldEnergy; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java index 93b3e076e..9f987e4bf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityShockSuppressor.java @@ -24,7 +24,7 @@ public class TileEntityShockSuppressor extends TileEntityBase implements ICustom public static final int USE_PER = 300; public static final int RANGE = 5; - public EnergyStorage storage = new EnergyStorage(300000); + public EnergyStorage storage = new EnergyStorage(300000, 400); private int oldEnergy; public TileEntityShockSuppressor(){