From 1ccd192790f06224544af2cd20fa023b86739184 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 11 Apr 2017 19:12:32 +0100 Subject: [PATCH] Update to work with major RC changes. --- src/main/java/techreborn/tiles/TileAesu.java | 8 ++++---- src/main/java/techreborn/tiles/TileAlloySmelter.java | 8 ++++---- src/main/java/techreborn/tiles/TileAssemblingMachine.java | 8 ++++---- src/main/java/techreborn/tiles/TileCentrifuge.java | 8 ++++---- src/main/java/techreborn/tiles/TileChargeBench.java | 8 ++++---- src/main/java/techreborn/tiles/TileChemicalReactor.java | 8 ++++---- src/main/java/techreborn/tiles/TileChunkLoader.java | 8 ++++---- .../java/techreborn/tiles/TileIndustrialElectrolyzer.java | 8 ++++---- src/main/java/techreborn/tiles/TileMatterFabricator.java | 8 ++++---- src/main/java/techreborn/tiles/TilePlayerDectector.java | 8 ++++---- src/main/java/techreborn/tiles/TilePump.java | 8 ++++---- src/main/java/techreborn/tiles/TileRollingMachine.java | 8 ++++---- src/main/java/techreborn/tiles/TileScrapboxinator.java | 8 ++++---- .../tiles/fusionReactor/TileEntityFusionController.java | 8 ++++---- .../tiles/generator/TileBaseFluidGenerator.java | 6 +++--- .../techreborn/tiles/generator/TileCreativePanel.java | 8 ++++---- .../techreborn/tiles/generator/TileDieselGenerator.java | 6 +++--- .../techreborn/tiles/generator/TileDragonEggSiphoner.java | 8 ++++---- .../java/techreborn/tiles/generator/TileGasTurbine.java | 4 ++-- .../java/techreborn/tiles/generator/TileGenerator.java | 8 ++++---- .../techreborn/tiles/generator/TileHeatGenerator.java | 8 ++++---- .../java/techreborn/tiles/generator/TileLightningRod.java | 8 ++++---- .../tiles/generator/TileSemifluidGenerator.java | 4 ++-- .../java/techreborn/tiles/generator/TileSolarPanel.java | 8 ++++---- .../techreborn/tiles/generator/TileThermalGenerator.java | 6 +++--- .../java/techreborn/tiles/generator/TileWaterMill.java | 8 ++++---- .../java/techreborn/tiles/generator/TileWindMill.java | 8 ++++---- src/main/java/techreborn/tiles/idsu/TileIDSU.java | 8 ++++---- src/main/java/techreborn/tiles/lesu/TileLesu.java | 8 ++++---- .../techreborn/tiles/multiblock/TileBlastFurnace.java | 8 ++++---- .../tiles/multiblock/TileImplosionCompressor.java | 8 ++++---- .../tiles/multiblock/TileIndustrialGrinder.java | 8 ++++---- .../tiles/multiblock/TileIndustrialSawmill.java | 8 ++++---- .../techreborn/tiles/multiblock/TileVacuumFreezer.java | 8 ++++---- .../java/techreborn/tiles/storage/TileEnergyStorage.java | 8 ++++---- src/main/java/techreborn/tiles/teir1/TileCompressor.java | 8 ++++---- .../java/techreborn/tiles/teir1/TileElectricFurnace.java | 8 ++++---- src/main/java/techreborn/tiles/teir1/TileExtractor.java | 8 ++++---- src/main/java/techreborn/tiles/teir1/TileGrinder.java | 8 ++++---- src/main/java/techreborn/tiles/teir1/TileRecycler.java | 8 ++++---- .../techreborn/tiles/transformers/TileMVTransformer.java | 6 +++--- .../techreborn/tiles/transformers/TileTransformer.java | 8 ++++---- 42 files changed, 160 insertions(+), 160 deletions(-) diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 7522266df..8af727b44 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -151,7 +151,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return TileAesu.MAX_STORAGE; } @@ -166,17 +166,17 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return OUTPUT; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 4096 * 2; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.EXTREME; } } diff --git a/src/main/java/techreborn/tiles/TileAlloySmelter.java b/src/main/java/techreborn/tiles/TileAlloySmelter.java index 7a9b111a1..4faffdfc6 100644 --- a/src/main/java/techreborn/tiles/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/TileAlloySmelter.java @@ -152,7 +152,7 @@ public class TileAlloySmelter extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -167,17 +167,17 @@ public class TileAlloySmelter extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 17656a315..bd856a351 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -114,7 +114,7 @@ implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvi } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -129,17 +129,17 @@ implements IWrenchable, ISidedInventory, IInventoryProvider, IRecipeCrafterProvi } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 128; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 58154c987..685cf180a 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -162,7 +162,7 @@ public class TileCentrifuge extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -177,17 +177,17 @@ public class TileCentrifuge extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileChargeBench.java b/src/main/java/techreborn/tiles/TileChargeBench.java index b3a361c42..ef400c989 100644 --- a/src/main/java/techreborn/tiles/TileChargeBench.java +++ b/src/main/java/techreborn/tiles/TileChargeBench.java @@ -124,7 +124,7 @@ implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -139,17 +139,17 @@ implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 512; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 4ba3c98a1..016a5b13e 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -145,7 +145,7 @@ public class TileChemicalReactor extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -160,17 +160,17 @@ public class TileChemicalReactor extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 128; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 018d2460c..db3fdf6f5 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -82,7 +82,7 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -97,17 +97,17 @@ public class TileChunkLoader extends TilePowerAcceptor implements IWrenchable, I } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 4fa13280a..da6cb113a 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -154,7 +154,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000; } @@ -169,17 +169,17 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 128; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 2694341ac..437c79169 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -172,7 +172,7 @@ public class TileMatterFabricator extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 100000000; } @@ -187,17 +187,17 @@ public class TileMatterFabricator extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 4096; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.EXTREME; } diff --git a/src/main/java/techreborn/tiles/TilePlayerDectector.java b/src/main/java/techreborn/tiles/TilePlayerDectector.java index 2dad81b92..e8c2c2b12 100644 --- a/src/main/java/techreborn/tiles/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/TilePlayerDectector.java @@ -44,7 +44,7 @@ public class TilePlayerDectector extends TilePowerAcceptor { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -59,17 +59,17 @@ public class TilePlayerDectector extends TilePowerAcceptor { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TilePump.java b/src/main/java/techreborn/tiles/TilePump.java index 81379e0e2..ccfbd3a83 100644 --- a/src/main/java/techreborn/tiles/TilePump.java +++ b/src/main/java/techreborn/tiles/TilePump.java @@ -108,7 +108,7 @@ public class TilePump extends TilePowerAcceptor { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -123,17 +123,17 @@ public class TilePump extends TilePowerAcceptor { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 48af5fd34..de3aca965 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -62,7 +62,7 @@ public class TileRollingMachine extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -77,17 +77,17 @@ public class TileRollingMachine extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 1403bd00f..a52c22548 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -186,7 +186,7 @@ implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -201,17 +201,17 @@ implements IWrenchable, IInventoryProvider, ISidedInventory, IContainerProvider } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index e1199b310..b6273f9f5 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -64,7 +64,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 100000000; } @@ -79,7 +79,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { if (!this.hasStartedCrafting) { return 0; } @@ -87,7 +87,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public double getMaxInput() { + public double getBaseMaxInput() { if (this.hasStartedCrafting) { return 0; } @@ -95,7 +95,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.EXTREME; } diff --git a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java index a431dc37a..5c8f6ebcc 100644 --- a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java @@ -147,17 +147,17 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return euTick; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.values()[this.tier]; } diff --git a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java b/src/main/java/techreborn/tiles/generator/TileCreativePanel.java index 522b0c790..5c351cd09 100644 --- a/src/main/java/techreborn/tiles/generator/TileCreativePanel.java +++ b/src/main/java/techreborn/tiles/generator/TileCreativePanel.java @@ -61,7 +61,7 @@ public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000000; } @@ -76,17 +76,17 @@ public class TileCreativePanel extends TilePowerAcceptor implements IWrenchable } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 16192; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 748f67631..405918369 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -49,17 +49,17 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return ConfigTechReborn.ThermalGeneratorCharge; } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java index 2e6c88d44..73ec70c93 100644 --- a/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java +++ b/src/main/java/techreborn/tiles/generator/TileDragonEggSiphoner.java @@ -114,7 +114,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000; } @@ -129,17 +129,17 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return euTick; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.HIGH; } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 024b778ac..a929ad422 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -48,12 +48,12 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return ConfigTechReborn.ThermalGeneratorCharge; } diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 76e431005..2ca3629fa 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -130,7 +130,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -145,17 +145,17 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 64; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index 073d5825d..b40ac9934 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -118,7 +118,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -133,17 +133,17 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 64; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index 301d95cbe..7535c52af 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -106,7 +106,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 327680; } @@ -121,17 +121,17 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 2048; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.HIGH; } diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 74f66abdc..b2c153b13 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -48,12 +48,12 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return ConfigTechReborn.ThermalGeneratorCharge; } diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 7afbc848c..68b1dfc88 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -88,7 +88,7 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000; } @@ -103,17 +103,17 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 32; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index 84b8b0aa8..38b2f8254 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -73,17 +73,17 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return ConfigTechReborn.ThermalGeneratorCharge; } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 128; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/TileWaterMill.java index 3014024ae..8942230bb 100644 --- a/src/main/java/techreborn/tiles/generator/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWaterMill.java @@ -67,7 +67,7 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000; } @@ -82,17 +82,17 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 32; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/generator/TileWindMill.java b/src/main/java/techreborn/tiles/generator/TileWindMill.java index c1116f653..0f0f9fd57 100644 --- a/src/main/java/techreborn/tiles/generator/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWindMill.java @@ -60,7 +60,7 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -75,17 +75,17 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 128; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 0; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 1fc09b2e6..36517e9d0 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -78,7 +78,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 1000000000; } @@ -93,17 +93,17 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return output; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return maxStorage; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.EXTREME; } diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 5b2ce3ccd..836fa69e8 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -105,7 +105,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return maxStorage; } @@ -120,17 +120,17 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return output; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 8192; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.EXTREME; } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java index f52bb927d..44ad435c9 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileBlastFurnace.java @@ -197,7 +197,7 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -212,17 +212,17 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable, } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 128; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.HIGH; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index 8f450988f..b86f707eb 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -140,7 +140,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 64000; } @@ -155,17 +155,17 @@ public class TileImplosionCompressor extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 698fc4972..aee05c4bb 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -200,7 +200,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 10000; } @@ -215,17 +215,17 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index 82534f4ce..2c8804c91 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -214,7 +214,7 @@ implements IWrenchable, IInventoryProvider, IContainerProvider { } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 64000; } @@ -229,17 +229,17 @@ implements IWrenchable, IInventoryProvider, IContainerProvider { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index c49ff8a73..dfd6ba507 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -75,7 +75,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return 64000; } @@ -90,17 +90,17 @@ public class TileVacuumFreezer extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 64; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index 3167f1312..6976f5e0b 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -123,7 +123,7 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return maxStorage; } @@ -147,17 +147,17 @@ public class TileEnergyStorage extends TilePowerAcceptor implements IWrenchable, } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return maxOutput; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return maxInput; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return tier; } diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index cdae469a4..c669d0e7f 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -122,7 +122,7 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -137,17 +137,17 @@ public class TileCompressor extends TilePowerAcceptor implements IWrenchable, II } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 3345672f6..42d58d7bd 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -198,7 +198,7 @@ public class TileElectricFurnace extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -213,17 +213,17 @@ public class TileElectricFurnace extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index 4a3906695..42eb62273 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -118,7 +118,7 @@ public class TileExtractor extends TilePowerAcceptor } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -133,17 +133,17 @@ public class TileExtractor extends TilePowerAcceptor } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 357cfacea..ee7011409 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -121,7 +121,7 @@ implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerPr } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -136,17 +136,17 @@ implements IWrenchable, IInventoryProvider, IRecipeCrafterProvider, IContainerPr } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.LOW; } diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index 0bef33488..4739a415b 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -182,7 +182,7 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return this.capacity; } @@ -197,17 +197,17 @@ public class TileRecycler extends TilePowerAcceptor implements IWrenchable, IInv } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 0; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 32; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.MEDIUM; } diff --git a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java index e2da1f53f..3e4d9896d 100644 --- a/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileMVTransformer.java @@ -38,17 +38,17 @@ public class TileMVTransformer extends TileTransformer { } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return 128; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return 512; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return EnumPowerTier.HIGH; } } diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index 39f1db2e5..875d249f4 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -82,7 +82,7 @@ public class TileTransformer extends TilePowerAcceptor implements IWrenchable, I } @Override - public double getMaxPower() { + public double getBaseMaxPower() { return maxStorage; } @@ -107,17 +107,17 @@ public class TileTransformer extends TilePowerAcceptor implements IWrenchable, I } @Override - public double getMaxOutput() { + public double getBaseMaxOutput() { return maxOutput; } @Override - public double getMaxInput() { + public double getBaseMaxInput() { return maxInput; } @Override - public EnumPowerTier getTier() { + public EnumPowerTier getBaseTier() { return tier; } }