maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.20.1' into 1.20.1

Browse Source
This commit is contained in:
PouffyDev
2025-07-10 19:20:36 +01:00
parent efacca8e33 a58cddd7ab
commit c5f5c8b3d1
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/drmangotea/tfmg/config/MachineConfig.java
View File

@@ -25,6 +25,11 @@ public class MachineConfig extends ConfigBase {
public final ConfigInt accumulatorMaxAmpOutput = i(20, 1, "accumulatorMaxAmpOutput", Comments.accumulatorMaxAmpOutput); public final ConfigInt accumulatorMaxAmpOutput = i(20, 1, "accumulatorMaxAmpOutput", Comments.accumulatorMaxAmpOutput);
public final ConfigInt accumulatorChargingRate = i(100, 1, "accumulatorChargingRate", Comments.accumulatorChargingRate); 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 ConfigGroup firebox = group(1, "firebox", "Firebox");
public final ConfigBool fireboxExhaustRequirement = b(true, "fireboxExhaustRequirement", Comments.fireboxExhaustRequirement); public final ConfigBool fireboxExhaustRequirement = b(true, "fireboxExhaustRequirement", Comments.fireboxExhaustRequirement);
public final ConfigInt fireboxFuelConsumption = i(100, 1, "fireboxFuelConsumption", Comments.fireboxFuelConsumption); 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 accumulatorVoltage = "Determines the voltage accumulators output.";
static String accumulatorMaxAmpOutput = "Sets the maximum amperage an accumulator can provide."; static String accumulatorMaxAmpOutput = "Sets the maximum amperage an accumulator can provide.";
static String accumulatorChargingRate = "Sets the maximum charging rate of accumulators."; 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 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 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."; static String graphiteElectrodeCurrent = "The minimum electric current that will make graphite electrodes superheated.";

6
src/main/java/com/drmangotea/tfmg/content/electricity/utilities/converter/ConverterBlockEntity.java
View File

@@ -161,7 +161,7 @@ public class ConverterBlockEntity extends ElectricBlockEntity {
if (getBlockState().getValue(INPUT)) { 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); energy.receiveEnergy((int) (getChargingRate() / TFMGConfigs.common().machines.FEtoWattTickConversionRate.get()), false);
} }
@@ -201,12 +201,12 @@ public class ConverterBlockEntity extends ElectricBlockEntity {
} }
public int getMaxCapacity() { public int getMaxCapacity() {
return TFMGConfigs.common().machines.accumulatorStorage.get(); return TFMGConfigs.common().machines.converterStorage.get();
} }
//in FE per tick //in FE per tick
public int getMaxChargingRate() { public int getMaxChargingRate() {
return TFMGConfigs.common().machines.accumulatorChargingRate.get()*10; return TFMGConfigs.common().machines.converterChargingRate.get();
} }
@Override @Override