potatOS/potatofission
1
0
Fork 0
mirror of https://github.com/turbodiesel4598/NuclearCraft synced 2026-03-12 23:54:42 +01:00
Code Issues Releases Wiki Activity

Compare commits

base: potatOS:a979dead3372d322093649bd343d189bc5eb860e
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10
..
compare: potatOS:b51572d348897e4273dd41db3b2da18056c0b365
Branches Tags
potatOS:1.12.2o
potatOS:1.12.2
potatOS:1.11.2
potatOS:1.10.2
potatOS:1.7.10

No commits in common. "a979dead3372d322093649bd343d189bc5eb860e" and "b51572d348897e4273dd41db3b2da18056c0b365" have entirely different histories.
a979dead33 ... b51572d348

4 changed files with 640 additions and 667 deletions
Show Stats Expand all files Collapse all files

20
src/main/java/nc/config/NCConfig.java
View File

@ -36,6 +36,7 @@ public class NCConfig {
public static final String CATEGORY_FUSION = "fusion";
public static final String CATEGORY_HEAT_EXCHANGER = "heat_exchanger";
public static final String CATEGORY_TURBINE = "turbine";
public static final String CATEGORY_ACCELERATOR = "accelerator";
public static final String CATEGORY_QUANTUM = "quantum";
public static final String CATEGORY_TOOL = "tool";
public static final String CATEGORY_ARMOR = "armor";
@ -237,6 +238,9 @@ public class NCConfig {
public static double turbine_render_rotor_expansion;
public static double turbine_render_rotor_speed;
public static double accelerator_electromagnet_power;
public static double accelerator_supercooler_coolant;
public static int quantum_max_qubits_live;
public static int quantum_max_qubits_code;
public static int quantum_angle_precision;
@ -802,6 +806,11 @@ public class NCConfig {
Property propertyTurbineRenderRotorSpeed = config.get(CATEGORY_TURBINE, "turbine_render_rotor_speed", 1D, Lang.localise("gui.nc.config.turbine_render_rotor_speed.comment"), 0D, 15D);
propertyTurbineRenderRotorSpeed.setLanguageKey("gui.nc.config.turbine_render_rotor_speed");
Property propertyAcceleratorElectromagnetPower = config.get(CATEGORY_ACCELERATOR, "accelerator_electromagnet_power", 1000D, Lang.localise("gui.nc.config.accelerator_electromagnet_power.comment"), 0D, Integer.MAX_VALUE);
propertyAcceleratorElectromagnetPower.setLanguageKey("gui.nc.config.accelerator_electromagnet_power");
Property propertyAcceleratorSupercoolerCoolant = config.get(CATEGORY_ACCELERATOR, "accelerator_supercooler_coolant", 0.125D, Lang.localise("gui.nc.config.accelerator_supercooler_coolant.comment"), 0D, Integer.MAX_VALUE);
propertyAcceleratorSupercoolerCoolant.setLanguageKey("gui.nc.config.accelerator_supercooler_coolant");
Property propertyQuantumMaxQubitsLive = config.get(CATEGORY_QUANTUM, "quantum_max_qubits_live", 7, Lang.localise("gui.nc.config.quantum_max_qubits_live.comment"), 1, 14);
propertyQuantumMaxQubitsLive.setLanguageKey("gui.nc.config.quantum_max_qubits_live");
Property propertyQuantumMaxQubitsCode = config.get(CATEGORY_QUANTUM, "quantum_max_qubits_code", 16, Lang.localise("gui.nc.config.quantum_max_qubits_code.comment"), 1, 32);
@ -1282,6 +1291,11 @@ public class NCConfig {
propertyOrderTurbine.add(propertyTurbineRenderRotorSpeed.getName());
config.setCategoryPropertyOrder(CATEGORY_TURBINE, propertyOrderTurbine);
List<String> propertyOrderAccelerator = new ArrayList<>();
propertyOrderAccelerator.add(propertyAcceleratorElectromagnetPower.getName());
propertyOrderAccelerator.add(propertyAcceleratorSupercoolerCoolant.getName());
config.setCategoryPropertyOrder(CATEGORY_ACCELERATOR, propertyOrderAccelerator);
List<String> propertyOrderQuantum = new ArrayList<>();
propertyOrderQuantum.add(propertyQuantumMaxQubitsLive.getName());
propertyOrderQuantum.add(propertyQuantumMaxQubitsCode.getName());
@ -1625,6 +1639,9 @@ public class NCConfig {
turbine_render_rotor_expansion = propertyTurbineRenderRotorExpansion.getDouble();
turbine_render_rotor_speed = propertyTurbineRenderRotorSpeed.getDouble();
accelerator_electromagnet_power = propertyAcceleratorElectromagnetPower.getDouble();
accelerator_supercooler_coolant = propertyAcceleratorSupercoolerCoolant.getDouble();
quantum_max_qubits_live = propertyQuantumMaxQubitsLive.getInt();
quantum_max_qubits_code = propertyQuantumMaxQubitsCode.getInt();
quantum_angle_precision = propertyQuantumAnglePrecision.getInt();
@ -1967,6 +1984,9 @@ public class NCConfig {
propertyTurbineRenderRotorExpansion.set(turbine_render_rotor_expansion);
propertyTurbineRenderRotorSpeed.set(turbine_render_rotor_speed);
propertyAcceleratorElectromagnetPower.set(accelerator_electromagnet_power);
propertyAcceleratorSupercoolerCoolant.set(accelerator_supercooler_coolant);
propertyQuantumMaxQubitsLive.set(quantum_max_qubits_live);
propertyQuantumMaxQubitsCode.set(quantum_max_qubits_code);
propertyQuantumAnglePrecision.set(quantum_angle_precision);

13
src/main/java/nc/config/NCConfigGuiFactory.java
View File

@ -41,6 +41,7 @@ public class NCConfigGuiFactory implements IModGuiFactory {
list.add(categoryElement(NCConfig.CATEGORY_FUSION, CategoryEntryFusion.class));
list.add(categoryElement(NCConfig.CATEGORY_HEAT_EXCHANGER, CategoryEntryHeatExchanger.class));
list.add(categoryElement(NCConfig.CATEGORY_TURBINE, CategoryEntryTurbine.class));
list.add(categoryElement(NCConfig.CATEGORY_ACCELERATOR, CategoryEntryAccelerator.class));
list.add(categoryElement(NCConfig.CATEGORY_QUANTUM, CategoryEntryQuantum.class));
list.add(categoryElement(NCConfig.CATEGORY_TOOL, CategoryEntryTool.class));
list.add(categoryElement(NCConfig.CATEGORY_ARMOR, CategoryEntryArmor.class));
@ -151,6 +152,18 @@ public class NCConfigGuiFactory implements IModGuiFactory {
}
}
public static class CategoryEntryAccelerator extends CategoryEntry implements IConfigCategory {
public CategoryEntryAccelerator(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {
super(owningScreen, owningEntryList, configElement);
}
@Override
protected GuiScreen buildChildScreen() {
return buildChildScreen(NCConfig.CATEGORY_ACCELERATOR, owningScreen, configElement);
}
}
public static class CategoryEntryQuantum extends CategoryEntry implements IConfigCategory {
public CategoryEntryQuantum(GuiConfig owningScreen, GuiConfigEntries owningEntryList, IConfigElement configElement) {

1272
src/main/resources/assets/nuclearcraft/lang/zh_cn.lang
View File

File diff suppressed because it is too large Load Diff

2
src/main/resources/assets/nuclearcraft/patchouli_books/guide/en_us/entries/multiblocks/turbine.json
View File

@ -98,7 +98,7 @@
"anchor": "examples",
"type": "text",
"title": "Turbine Examples",
"text": "Here is an example of a valid, functional turbine. This turbine is intentionally designed to be inefficient. Designing bigger and more efficient turbines will be left as an exercise to the reader."
"text": "Here is an example of a valid, functional turbine. This turbines are intentionally designed to be inefficient. Designing bigger and more efficient turbines will be left as an exercise to the reader. "
},
{
"type": "multiblock",