diff --git a/src/main/java/com/drmangotea/tfmg/config/MachineConfig.java b/src/main/java/com/drmangotea/tfmg/config/MachineConfig.java index 914a49ea..125b0bd4 100644 --- a/src/main/java/com/drmangotea/tfmg/config/MachineConfig.java +++ b/src/main/java/com/drmangotea/tfmg/config/MachineConfig.java @@ -25,6 +25,11 @@ public class MachineConfig extends ConfigBase { public final ConfigInt accumulatorMaxAmpOutput = i(20, 1, "accumulatorMaxAmpOutput", Comments.accumulatorMaxAmpOutput); public final ConfigInt accumulatorChargingRate = i(100, 1, "accumulatorChargingRate", Comments.accumulatorChargingRate); + public final ConfigGroup converter = group(1, "converter", "Converter"); + public final ConfigInt converterStorage = i(100000, 1, "converterStorage", Comments.converterStorage); + public final ConfigInt converterVoltage = i(12, 1, "converterVoltage", Comments.converterVoltage); + public final ConfigInt converterChargingRate = i(1000, 1, "converterChargingRate", Comments.converterChargingRate); + public final ConfigGroup firebox = group(1, "firebox", "Firebox"); public final ConfigBool fireboxExhaustRequirement = b(true, "fireboxExhaustRequirement", Comments.fireboxExhaustRequirement); public final ConfigInt fireboxFuelConsumption = i(100, 1, "fireboxFuelConsumption", Comments.fireboxFuelConsumption); @@ -67,6 +72,9 @@ public class MachineConfig extends ConfigBase { static String accumulatorVoltage = "Determines the voltage accumulators output."; static String accumulatorMaxAmpOutput = "Sets the maximum amperage an accumulator can provide."; static String accumulatorChargingRate = "Sets the maximum charging rate of accumulators."; + static String converterStorage = "Determines the storage space of converters."; + static String converterVoltage = "Determines the voltage converters output."; + static String converterChargingRate = "Sets the maximum charging rate of converters."; static String fireboxExhaustRequirement = "If set to true,fireboxes will require exhaust management."; static String fireboxFuelConsumption = "Determines the amount of fuel a firebox needs to run for 3 seconds."; static String graphiteElectrodeCurrent = "The minimum electric current that will make graphite electrodes superheated."; diff --git a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java index d69b8f12..cbb1383f 100644 --- a/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java @@ -161,7 +161,7 @@ public class ConverterBlockEntity extends ElectricBlockEntity { if (getBlockState().getValue(INPUT)) { - if (getData().getVoltage() > TFMGConfigs.common().machines.accumulatorVoltage.get()) { + if (getData().getVoltage() > TFMGConfigs.common().machines.converterVoltage.get()) { energy.receiveEnergy((int) (getChargingRate() / TFMGConfigs.common().machines.FEtoWattTickConversionRate.get()), false); } @@ -201,12 +201,12 @@ public class ConverterBlockEntity extends ElectricBlockEntity { } public int getMaxCapacity() { - return TFMGConfigs.common().machines.accumulatorStorage.get(); + return TFMGConfigs.common().machines.converterStorage.get(); } //in FE per tick public int getMaxChargingRate() { - return TFMGConfigs.common().machines.accumulatorChargingRate.get()*10; + return TFMGConfigs.common().machines.converterChargingRate.get(); } @Override