diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 6f124e0ea..f6c24a1d3 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -53,7 +53,7 @@ public class ConfigTechReborn { public static int CentrifugeInputTick; public static int DragonEggSiphonerOutput; public static int HeatGeneratorOutput; - public static int AverageEuOutTickTime; + public static int $$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime; public static int ExtraOutputPerLesuBlock; public static int BaseLesuOutput; public static int LesuStoragePerBlock; @@ -333,7 +333,7 @@ public class ConfigTechReborn { ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000, "Set the max charge for the ThermalGenerator").getInt(); - AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100, + $$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100, "Set the average EU-out tick time").getInt(); LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000, diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 82560a0db..740d02dc3 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -46,8 +46,6 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { public static int maxOutput = 8192; @ConfigRegistry(config = "machines", category = "aesu", key = "AesuMaxEnergy", comment = "AESU Max Energy (Value in EU)") public static int maxEnergy = 100000000; -// @ConfigRegistry(config = "machines", category = "aesu", key = "AesuWrenchDropRate", comment = "AESU Wrench Drop Rate") - public static float wrenchDropRate = 1.0F; public Inventory inventory = new Inventory(4, "TileAesu", 64, this); private int OUTPUT = 64; // The current output @@ -62,7 +60,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { @Override public void updateEntity() { super.updateEntity(); - if (ticks == ConfigTechReborn.AverageEuOutTickTime) { + if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) { euChange = -1; ticks = 0; @@ -94,7 +92,7 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { @Override public float getWrenchDropRate() { - return wrenchDropRate; + return 1.0F; } @Override diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 67ceaabe9..42080134b 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -51,8 +51,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor public static int maxInput = 128; @ConfigRegistry(config = "machines", category = "assembling_machine", key = "AssemblingMachineMaxEnergy", comment = "Assembling Machine Max Energy (Value in EU)") public static int maxEnergy = 10000; - @ConfigRegistry(config = "machines", category = "assembling_machine", key = "AssemblingMachineTier", comment = "Assembling Machine Tier") - public static int tier = 2; // @ConfigRegistry(config = "machines", category = "assembling_machine", key = "AssemblingMachineWrenchDropRate", comment = "Assembling Machine Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -61,7 +59,7 @@ public class TileAssemblingMachine extends TilePowerAcceptor public RecipeCrafter crafter; public TileAssemblingMachine() { - super(tier); + super(); // Input slots final int[] inputs = new int[2]; inputs[0] = 0; diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index 1a8bbb58f..b463a8bcb 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -49,8 +49,6 @@ public class TileChemicalReactor extends TilePowerAcceptor public static int maxInput = 128; @ConfigRegistry(config = "machines", category = "chemical_reactor", key = "ChemicalReactorMaxEnergy", comment = "Chemical Reactor Max Energy (Value in EU)") public static int maxEnergy = 10000; - @ConfigRegistry(config = "machines", category = "chemical_reactor", key = "ChemicalReactorTier", comment = "Chemical Reactor Tier") - public static int tier = 2; // @ConfigRegistry(config = "machines", category = "chemical_reactor", key = "ChemicalReactorWrenchDropRate", comment = "Chemical Reactor Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -59,7 +57,7 @@ public class TileChemicalReactor extends TilePowerAcceptor public RecipeCrafter crafter; public TileChemicalReactor() { - super(tier); + super(); // Input slots final int[] inputs = new int[2]; inputs[0] = 0; diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 9a1f599e5..b6c89bd4d 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -54,8 +54,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor public static int maxInput = 128; @ConfigRegistry(config = "machines", category = "industrial_electrolyzer", key = "IndustrialElectrolyzerMaxEnergy", comment = "Industrial Electrolyzer Max Energy (Value in EU)") public static int maxEnergy = 1000; - @ConfigRegistry(config = "machines", category = "industrial_electrolyzer", key = "IndustrialElectrolyzerTier", comment = "Industrial Electrolyzer Tier") - public static int tier = 2; // @ConfigRegistry(config = "machines", category = "industrial_electrolyzer", key = "IndustrialElectrolyzerWrenchDropRate", comment = "Industrial Electrolyzer Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -64,7 +62,7 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor public RecipeCrafter crafter; public TileIndustrialElectrolyzer() { - super(tier); + super(); // Input slots final int[] inputs = new int[2]; inputs[0] = 0; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 4ceda8c6e..db6f9eb42 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -53,8 +53,6 @@ public class TileMatterFabricator extends TilePowerAcceptor public static int maxEnergy = 100000000; @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorFabricationRate", comment = "Matter Fabricator Fabrication Rate") public static int fabricationRate = 10000; - @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorTier", comment = "Matter Fabricator Tier") - public static int tier = 6; // @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorWrenchDropRate", comment = "Matter Fabricator Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -62,7 +60,7 @@ public class TileMatterFabricator extends TilePowerAcceptor private int amplifier = 0; public TileMatterFabricator() { - super(tier); + super(); // TODO configs } diff --git a/src/main/java/techreborn/tiles/TilePlayerDectector.java b/src/main/java/techreborn/tiles/TilePlayerDectector.java index ab7e04c3d..e3a2b477e 100644 --- a/src/main/java/techreborn/tiles/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/TilePlayerDectector.java @@ -43,14 +43,12 @@ public class TilePlayerDectector extends TilePowerAcceptor { public static int maxInput = 32; @ConfigRegistry(config = "machines", category = "player_detector", key = "PlayerDetectorMaxEnergy", comment = "Player Detector Max Energy (Value in EU)") public static int maxEnergy = 10000; - @ConfigRegistry(config = "machines", category = "player_detector", key = "PlayerDetectorTier", comment = "Player Detector Tier") - public static int tier = 1; public String owenerUdid = ""; boolean redstone = false; public TilePlayerDectector() { - super(tier); + super(); } @Override diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 84a0a44a2..460289da9 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -58,8 +58,6 @@ public class TileRollingMachine extends TilePowerAcceptor public static int runTime = 250; @ConfigRegistry(config = "machines", category = "rolling_machine", key = "RollingMachineMaxEnergy", comment = "Rolling Machine Max Energy (Value in EU)") public static int maxEnergy = 10000; - @ConfigRegistry(config = "machines", category = "rolling_machine", key = "RollingMachineTier", comment = "Rolling Machine Tier") - public static int tier = 1; // @ConfigRegistry(config = "machines", category = "rolling_machine", key = "RollingMachineWrenchDropRate", comment = "Rolling Machi Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -71,7 +69,7 @@ public class TileRollingMachine extends TilePowerAcceptor private int outputSlot; public TileRollingMachine() { - super(tier); + super(); outputSlot = 0; } diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 834f9ed5b..5b1868d31 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -58,8 +58,6 @@ public class TileScrapboxinator extends TilePowerAcceptor public static int cost = 20; @ConfigRegistry(config = "machines", category = "scrapboxinator", key = "ScrapboxinatorRunTime", comment = "Scrapboxinator Run Time") public static int runTime = 200; - @ConfigRegistry(config = "machines", category = "scrapboxinator", key = "ScrapboxinatorTier", comment = "Scrapboxinator Tier") - public static int tier = 1; // @ConfigRegistry(config = "machines", category = "scrapboxinator", key = "ScrapboxinatorWrenchDropRate", comment = "Scrapboxinator Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -70,7 +68,7 @@ public class TileScrapboxinator extends TilePowerAcceptor public int output = 1; public TileScrapboxinator() { - super(tier); + super(); } public int gaugeProgressScaled(final int scale) { diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java index a5b8844eb..b01b4444b 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java @@ -53,8 +53,6 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn public static int maxOutput = 1000000; @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorMaxEnergy", comment = "Fusion Reactor Max Energy (Value in EU)") public static int maxEnergy = 100000000; - @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorTier", comment = "Fusion Reactor Tier") - public static int tier = 4; // @ConfigRegistry(config = "machines", category = "fusion_reactor", key = "FusionReactorWrenchDropRate", comment = "Fusion Reactor Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -72,7 +70,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn boolean hasStartedCrafting = false; public TileEntityFusionController() { - super(tier); + super(); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java index ca6d35fd8..17a44614c 100644 --- a/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileBaseFluidGenerator.java @@ -62,8 +62,8 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement */ double pendingWithdraw = 0.0; - public TileBaseFluidGenerator(EFluidGenerator type, int tier, String tileName, int tankCapacity, int euTick) { - super(tier); + public TileBaseFluidGenerator(EFluidGenerator type, String tileName, int tankCapacity, int euTick) { + super(); recipes = GeneratorRecipeHelper.getFluidRecipesForGenerator(type); @@ -72,11 +72,6 @@ public abstract class TileBaseFluidGenerator extends TilePowerAcceptor implement this.euTick = euTick; } - public TileBaseFluidGenerator(EFluidGenerator type, EnumPowerTier tier, String tileName, int tankCapacity, - int euTick) { - this(type, tier.ordinal(), tileName, tankCapacity, euTick); - } - protected long lastOutput = 0; private FluidGeneratorRecipe currentRecipe; diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index 80529f967..e0d322357 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -46,11 +46,9 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont public static int tankCapacity = 10000; @ConfigRegistry(config = "machines", category = "diesel_generator", key = "DieselGeneratorEnergyPerTick", comment = "Diesel Generator Energy Per Tick (Value in EU)") public static int energyPerTick = 20; - @ConfigRegistry(config = "machines", category = "diesel_generator", key = "DieselGeneratorTier", comment = "Diesel Generator Tier") - public static int tier = 2; public TileDieselGenerator() { - super(EFluidGenerator.DIESEL, tier, "TileDieselGenerator", tankCapacity, energyPerTick); + super(EFluidGenerator.DIESEL, "TileDieselGenerator", tankCapacity, energyPerTick); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index 5c7e36e4a..b7f9c3d16 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -26,17 +26,30 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.api.generator.EFluidGenerator; 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; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileGasTurbine extends TileBaseFluidGenerator implements IContainerProvider { + @ConfigRegistry(config = "machines", category = "gas_generator", key = "GasGeneratorMaxOutput", comment = "Gas Generator Max Output (Value in EU)") + public static int maxOutput = 128; + @ConfigRegistry(config = "machines", category = "gas_generator", key = "GasGeneratorMaxEnergy", comment = "Gas Generator Max Energy (Value in EU)") + public static int maxEnergy = 1000000; + @ConfigRegistry(config = "machines", category = "gas_generator", key = "GasGeneratorTankCapacity", comment = "Gas Generator Tank Capacity") + public static int tankCapacity = 10000; + @ConfigRegistry(config = "machines", category = "gas_generator", key = "GasGeneratorEnergyPerTick", comment = "Gas Generator Energy Per Tick (Value in EU)") + public static int energyPerTick = 16; + public TileGasTurbine() { - super(EFluidGenerator.GAS, ConfigTechReborn.ThermalGeneratorTier, "TileGasTurbine", 1000 * 10, 16); + super(EFluidGenerator.GAS, "TileGasTurbine", tankCapacity, energyPerTick); } @Override @@ -46,9 +59,15 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer @Override public double getBaseMaxPower() { - return ConfigTechReborn.ThermalGeneratorCharge; + return maxEnergy; } + @Override + public double getBaseMaxOutput() { + return maxOutput; + } + + @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("gasturbine").player(player.inventory).inventory(8, 84).hotbar(8, 142) diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 876a24806..581e1f921 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -35,14 +35,25 @@ import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.client.container.IContainerProvider; import techreborn.client.container.builder.BuiltContainer; import techreborn.client.container.builder.ContainerBuilder; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileGenerator 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 = 128; + @ConfigRegistry(config = "machines", category = "generator", key = "GeneratorMaxEnergy", comment = "Solid Fuel Generator Max Energy (Value in EU)") + public static int maxEnergy = 10000; + @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 int fuelSlot = 0; public int burnTime; @@ -130,7 +141,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public double getBaseMaxPower() { - return 10000; + return maxEnergy; } @Override @@ -145,7 +156,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public double getBaseMaxOutput() { - return 64; + return maxOutput; } @Override @@ -198,6 +209,6 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public int[] getSlotsForFace(EnumFacing side) { - return new int[]{fuelSlot}; + return new int[] { fuelSlot }; } } diff --git a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java index 493075b0e..3582ad11e 100644 --- a/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileHeatGenerator.java @@ -32,18 +32,26 @@ import net.minecraft.util.math.BlockPos; import reborncore.common.IWrenchable; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; -import techreborn.config.ConfigTechReborn; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable { - public static final int euTick = ConfigTechReborn.HeatGeneratorOutput; + @ConfigRegistry(config = "machines", category = "heat_generator", key = "HeatGeneratorMaxOutput", comment = "Heat Generator Max Output (Value in EU)") + public static int maxOutput = 128; + @ConfigRegistry(config = "machines", category = "heat_generator", key = "HeatGeneratorMaxEnergy", comment = "Heat Generator Max Energy (Value in EU)") + public static int maxEnergy = 10000; + @ConfigRegistry(config = "machines", category = "heat_generator", key = "HeatGeneratorEnergyPerTick", comment = "Heat Generator Energy Per Tick (Value in EU)") + public static int energyPerTick = 5; + + private long lastOutput = 0; public TileHeatGenerator() { super(1); } - - private long lastOutput = 0; @Override public void updateEntity() { @@ -51,36 +59,32 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable if (!world.isRemote) { for (final EnumFacing direction : EnumFacing.values()) { - if(direction.equals(EnumFacing.UP)) + if (direction.equals(EnumFacing.UP)) continue; if (this.world - .getBlockState(new BlockPos(this.getPos().getX() + direction.getFrontOffsetX(), - this.getPos().getY() + direction.getFrontOffsetY(), - this.getPos().getZ() + direction.getFrontOffsetZ())) - .getBlock() == Blocks.LAVA) { - if(tryAddingEnergy(euTick)) + .getBlockState(new BlockPos(this.getPos().getX() + direction.getFrontOffsetX(), + this.getPos().getY() + direction.getFrontOffsetY(), + this.getPos().getZ() + direction.getFrontOffsetZ())) + .getBlock() == Blocks.LAVA) { + if (tryAddingEnergy(energyPerTick)) this.lastOutput = this.world.getTotalWorldTime(); } } if (this.world.getTotalWorldTime() - this.lastOutput < 30 && !this.isActive()) this.world.setBlockState(this.getPos(), - this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, true)); + this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, true)); else if (this.world.getTotalWorldTime() - this.lastOutput > 30 && this.isActive()) this.world.setBlockState(this.getPos(), - this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, false)); + this.world.getBlockState(this.getPos()).withProperty(BlockMachineBase.ACTIVE, false)); } } - - private boolean tryAddingEnergy(int amount) - { - if(this.getMaxPower() - this.getEnergy() >= amount) - { + + private boolean tryAddingEnergy(int amount) { + if (this.getMaxPower() - this.getEnergy() >= amount) { addEnergy(amount); return true; - } - else if(this.getMaxPower() - this.getEnergy() > 0) - { + } else if (this.getMaxPower() - this.getEnergy() > 0) { addEnergy(this.getMaxPower() - this.getEnergy()); return true; } @@ -118,7 +122,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable @Override public double getBaseMaxPower() { - return 10000; + return maxEnergy; } @Override @@ -133,7 +137,7 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable @Override public double getBaseMaxOutput() { - return 64; + return maxOutput; } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileLightningRod.java b/src/main/java/techreborn/tiles/generator/TileLightningRod.java index a1d795b33..8fb518771 100644 --- a/src/main/java/techreborn/tiles/generator/TileLightningRod.java +++ b/src/main/java/techreborn/tiles/generator/TileLightningRod.java @@ -34,11 +34,23 @@ import net.minecraftforge.oredict.OreDictionary; import reborncore.common.IWrenchable; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; -import techreborn.config.ConfigTechReborn; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { + @ConfigRegistry(config = "machines", category = "lightning_rod", key = "LightningRodMaxOutput", comment = "Lightning Rod Max Output (Value in EU)") + public static int maxOutput = 2048; + @ConfigRegistry(config = "machines", category = "lightning_rod", key = "LightningRodMaxEnergy", comment = "Lightning Rod Max Energy (Value in EU)") + public static int maxEnergy = 1000000; + @ConfigRegistry(config = "machines", category = "lightning_rod", key = "LightningRodChanceOfStrike", comment = "Chance of lightning striking a rod (Range: 0-70)") + public static int chanceOfStrike = 24; + @ConfigRegistry(config = "machines", category = "lightning_rod", key = "LightningRodBaseStrikeEnergy", comment = "Base amount of energy per strike (Value in EU)") + public static int baseEnergyStrike = 32768; + private int onStatusHoldTicks = -1; public TileLightningRod() { @@ -61,16 +73,16 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { final float weatherStrength = this.world.getThunderStrength(1.0F); if (weatherStrength > 0.2F) { //lightStrikeChance = (MAX - (CHANCE * WEATHER_STRENGTH) - final float lightStrikeChance = (100F - ConfigTechReborn.LightningRodChance) * 20F; + final float lightStrikeChance = (100F - chanceOfStrike) * 20F; final float totalChance = lightStrikeChance * this.getLightningStrikeMultiplier() * (1.1F - weatherStrength); if (this.world.rand.nextInt((int) Math.floor(totalChance)) == 0) { final EntityLightningBolt lightningBolt = new EntityLightningBolt(this.world, - this.pos.getX() + 0.5F, - this.world.provider.getAverageGroundLevel(), - this.pos.getZ() + 0.5F, false); + this.pos.getX() + 0.5F, + this.world.provider.getAverageGroundLevel(), + this.pos.getZ() + 0.5F, false); this.world.addWeatherEffect(lightningBolt); this.world.spawnEntity(lightningBolt); - this.addEnergy(32768 * (0.3F + weatherStrength)); + this.addEnergy(baseEnergyStrike * (0.3F + weatherStrength)); ((BlockMachineBase) this.getBlockType()).setActive(true, this.world, this.pos); this.onStatusHoldTicks = 400; } @@ -104,7 +116,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxPower() { - return 327680; + return maxEnergy; } @Override @@ -119,7 +131,7 @@ public class TileLightningRod extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxOutput() { - return 2048; + return maxOutput; } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java index 0a34ef27e..6fde5481e 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java @@ -26,17 +26,29 @@ package techreborn.tiles.generator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.api.generator.EFluidGenerator; 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; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) 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; + @ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorMaxEnergy", comment = "Semifluid Generator Max Energy (Value in EU)") + public static int maxEnergy = 1000000; + @ConfigRegistry(config = "machines", category = "semifluid_generator", key = "SemifluidGeneratorTankCapacity", comment = "Semifluid Generator Tank Capacity") + public static int tankCapacity = 10000; + @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, ConfigTechReborn.ThermalGeneratorTier, "TileSemifluidGenerator", 1000 * 10, 8); + super(EFluidGenerator.SEMIFLUID, "TileSemifluidGenerator", tankCapacity, energyPerTick); } @Override @@ -44,16 +56,15 @@ public class TileSemifluidGenerator extends TileBaseFluidGenerator implements IC return new ItemStack(ModBlocks.SEMIFLUID_GENERATOR, 1); } - @Override public double getBaseMaxPower() { - return ConfigTechReborn.ThermalGeneratorCharge; + return maxEnergy; } @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("semifluidgenerator").player(player.inventory).inventory(8, 84).hotbar(8, 142) - .addInventory().tile(this).slot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).syncEnergyValue() - .addInventory().create(); + .addInventory().tile(this).slot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).syncEnergyValue() + .addInventory().create(); } } diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index 40fcdd192..205f36239 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -29,16 +29,28 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.common.IWrenchable; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.blocks.generator.BlockSolarPanel; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; import java.util.List; /** * Created by modmuss50 on 25/02/2016. */ + +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { + @ConfigRegistry(config = "machines", category = "solar_panel", key = "SolarPanelMaxOutput", comment = "Solar Panel Max Output (Value in EU)") + public static int maxOutput = 32; + @ConfigRegistry(config = "machines", category = "solar_panel", key = "SolarPanelMaxEnergy", comment = "Solar Panel Max Energy (Value in EU)") + public static int maxEnergy = 1000; + @ConfigRegistry(config = "machines", category = "solar_panel", key = "SolarPanelEnergyPerTick", comment = "Solar Panel Energy Per Tick (Value in EU)") + public static int energyPerTick = 1; + boolean shouldMakePower = false; boolean lastTickSate = false; @@ -57,14 +69,14 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { } if (this.shouldMakePower) { - this.powerToAdd = 10; + this.powerToAdd = energyPerTick; this.addEnergy(this.powerToAdd); } else { this.powerToAdd = 0; } this.world.setBlockState(this.getPos(), - this.world.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, this.isSunOut())); + this.world.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, this.isSunOut())); } } @@ -81,12 +93,12 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { public boolean isSunOut() { return this.world.canBlockSeeSky(this.pos.up()) && !this.world.isRaining() && !this.world.isThundering() - && this.world.isDaytime(); + && this.world.isDaytime(); } @Override public double getBaseMaxPower() { - return 1000; + return maxEnergy; } @Override @@ -101,7 +113,7 @@ public class TileSolarPanel extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxOutput() { - return 32; + return maxOutput; } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index a3f6e7a5d..c71521fff 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -50,11 +50,9 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon public static int tankCapacity = 10000; @ConfigRegistry(config = "machines", category = "thermal_generator", key = "ThermalGeneratorEnergyPerTick", comment = "Thermal Generator Energy Per Tick (Value in EU)") public static int energyPerTick = 10; - @ConfigRegistry(config = "machines", category = "thermal_generator", key = "ThermalGeneratorTier", comment = "Thermal Generator Tier") - public static int tier = 2; public TileThermalGenerator() { - super(EFluidGenerator.THERMAL, tier, "TileThermalGenerator", tankCapacity, energyPerTick); + super(EFluidGenerator.THERMAL, "TileThermalGenerator", tankCapacity, energyPerTick); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileWaterMill.java b/src/main/java/techreborn/tiles/generator/TileWaterMill.java index 7ca411fa8..2b43388c0 100644 --- a/src/main/java/techreborn/tiles/generator/TileWaterMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWaterMill.java @@ -30,13 +30,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.common.IWrenchable; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; /** * Created by modmuss50 on 25/02/2016. */ + +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { + @ConfigRegistry(config = "machines", category = "water_mill", key = "WaterMillMaxOutput", comment = "Water Mill Max Output (Value in EU)") + public static int maxOutput = 32; + @ConfigRegistry(config = "machines", category = "water_mill", key = "WaterMillMaxEnergy", comment = "Water Mill Max Energy (Value in EU)") + public static int maxEnergy = 1000; + @ConfigRegistry(config = "machines", category = "water_mill", key = "WaterMillEnergyPerTick", comment = "Water Mill Energy Multiplier") + public static int energyMultiplier = 1; + int waterblocks = 0; public TileWaterMill() { @@ -50,7 +62,7 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { this.checkForWater(); } if (this.waterblocks > 0) { - this.addEnergy(this.waterblocks); + this.addEnergy(this.waterblocks * energyMultiplier); } } @@ -65,7 +77,7 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxPower() { - return 1000; + return maxEnergy; } @Override @@ -80,7 +92,7 @@ public class TileWaterMill extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxOutput() { - return 32; + return maxOutput; } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileWindMill.java b/src/main/java/techreborn/tiles/generator/TileWindMill.java index eeec53247..b081e3183 100644 --- a/src/main/java/techreborn/tiles/generator/TileWindMill.java +++ b/src/main/java/techreborn/tiles/generator/TileWindMill.java @@ -29,13 +29,27 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import reborncore.common.IWrenchable; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; /** * Created by modmuss50 on 25/02/2016. */ + +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileWindMill extends TilePowerAcceptor implements IWrenchable { + @ConfigRegistry(config = "machines", category = "wind_mill", key = "WindMillMaxOutput", comment = "Wind Mill Max Output (Value in EU)") + public static int maxOutput = 128; + @ConfigRegistry(config = "machines", category = "wind_mill", key = "WindMillMaxEnergy", comment = "Wind Mill Max Energy (Value in EU)") + public static int maxEnergy = 10000; + @ConfigRegistry(config = "machines", category = "wind_mill", key = "WindMillEnergyPerTick", comment = "Wind Mill Energy Per Tick (Value in EU)") + public static int baseEnergy = 2; + @ConfigRegistry(config = "machines", category = "wind_mill", key = "WindMillEnergyPerTick", comment = "Wind Mill Thunder Multiplier") + public static double thunderMultiplier = 1.25; + int basePower = 16; public TileWindMill() { @@ -48,7 +62,7 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { if (this.pos.getY() > 64) { int actualPower = this.basePower; if (this.world.isThundering()) { - actualPower *= 1.25; + actualPower *= thunderMultiplier; } this.addEnergy(actualPower); // Value taken from // http://wiki.industrial-craft.net/?title=Wind_Mill @@ -58,7 +72,7 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxPower() { - return 10000; + return maxEnergy; } @Override @@ -73,7 +87,7 @@ public class TileWindMill extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxOutput() { - return 128; + return maxOutput; } @Override diff --git a/src/main/java/techreborn/tiles/idsu/TileIDSU.java b/src/main/java/techreborn/tiles/idsu/TileIDSU.java index 52dfe6c2e..92c12f6af 100644 --- a/src/main/java/techreborn/tiles/idsu/TileIDSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileIDSU.java @@ -31,28 +31,29 @@ import net.minecraft.util.EnumFacing; import org.apache.commons.lang3.StringUtils; import reborncore.common.IWrenchable; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import techreborn.config.ConfigTechReborn; import techreborn.init.ModBlocks; +import techreborn.lib.ModInfo; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileIDSU extends TilePowerAcceptor implements IWrenchable { + @ConfigRegistry(config = "machines", category = "idsu", key = "IdsuMaxInput", comment = "IDSU Max Input (Value in EU)") + public static int maxInput = 8192; + @ConfigRegistry(config = "machines", category = "idsu", key = "IdsuMaxOutput", comment = "IDSU Max Output (Value in EU)") + public static int maxOutput = 8192; + @ConfigRegistry(config = "machines", category = "idsu", key = "IdsuMaxEnergy", comment = "IDSU Max Energy (Value in EU)") + public static int maxEnergy = 100000000; + public String ownerUdid; - public int tier; - public int output; - public double maxStorage; private double euLastTick = 0; private double euChange; private int ticks; - public TileIDSU(int tier1, int output1, int maxStorage1) { - super(tier1); - this.tier = tier1; - this.output = output1; - this.maxStorage = maxStorage1; - } - public TileIDSU() { - this(5, 2048, 100000000); + super(); } @Override @@ -78,7 +79,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxPower() { - return 1000000000; + return maxEnergy; } @Override @@ -93,17 +94,16 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { @Override public double getBaseMaxOutput() { - return output; + return maxOutput; } @Override public double getBaseMaxInput() { - return maxStorage; + return maxInput; } - public float getChargeLevel() { - float ret = (float) this.getEnergy() / (float) this.maxStorage; + float ret = (float) this.getEnergy() / (float) maxEnergy; if (ret > 1.0F) { ret = 1.0F; } @@ -128,7 +128,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { public void updateEntity() { super.updateEntity(); - if (ticks == ConfigTechReborn.AverageEuOutTickTime) { + if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) { euChange = -1; ticks = 0; @@ -189,25 +189,4 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable { } return (euChange / ticks); } - - public void handleGuiInputFromClient(int id) { - if (id == 0) { - output += 256; - } - if (id == 1) { - output += 64; - } - if (id == 2) { - output -= 64; - } - if (id == 3) { - output -= 256; - } - if (output > 4096) { - output = 4096; - } - if (output <= -1) { - output = 0; - } - } } diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index 0c4197570..ac326cb25 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -28,14 +28,27 @@ import net.minecraft.block.Block; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import reborncore.common.powerSystem.TilePowerAcceptor; +import reborncore.common.registration.RebornRegistry; +import reborncore.common.registration.impl.ConfigRegistry; import reborncore.common.util.Inventory; import techreborn.blocks.storage.BlockLESU; import techreborn.config.ConfigTechReborn; +import techreborn.lib.ModInfo; import java.util.ArrayList; +@RebornRegistry(modID = ModInfo.MOD_ID) public class TileLesu extends TilePowerAcceptor {// TODO wrench + @ConfigRegistry(config = "machines", category = "lesu", key = "LesuMaxInput", comment = "LESU Max Input (Value in EU)") + public static int maxInput = 8192; + @ConfigRegistry(config = "machines", category = "lesu", key = "LesuMaxOutput", comment = "LESU Base Output (Value in EU)") + public static int baseOutput = 16; + @ConfigRegistry(config = "machines", category = "lesu", key = "LesuMaxEnergyPerBlock", comment = "LESU Max Energy Per Block (Value in EU)") + public static int storagePerBlock = 1000000; + @ConfigRegistry(config = "machines", category = "lesu", key = "LesuExtraIO", comment = "LESU Extra I/O Multiplier") + public static int extraIOPerBlock = 8; + public int connectedBlocks = 0; public Inventory inventory = new Inventory(2, "TileAesu", 64, this); private ArrayList countedNetworks = new ArrayList<>(); @@ -78,10 +91,10 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench } } } - maxStorage = ((connectedBlocks + 1) * ConfigTechReborn.LesuStoragePerBlock); - output = (connectedBlocks * ConfigTechReborn.ExtraOutputPerLesuBlock) + ConfigTechReborn.BaseLesuOutput; + maxStorage = ((connectedBlocks + 1) * storagePerBlock); + output = (connectedBlocks * extraIOPerBlock) + baseOutput; - if (ticks == ConfigTechReborn.AverageEuOutTickTime) { + if (ticks == ConfigTechReborn.$$$$$$$$$$$$DONT_DELETE_$$$$$$$$$$$AverageEuOutTickTime) { euChange = -1; ticks = 0; } else { @@ -127,7 +140,7 @@ public class TileLesu extends TilePowerAcceptor {// TODO wrench @Override public double getBaseMaxInput() { - return 8192; + return maxInput; } @Override