mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-19 03:39:14 +00:00
Added recipe for PRC, energy type is now controlled by server (closes #1369)
This commit is contained in:
1 parent
75f09adba2
commit
5fd89a7959
4 files changed
+31
-24
No files matched your search
@@ -165,29 +165,6 @@ public class ClientProxy extends CommonProxy
|
||||
MekanismClient.holidays = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Holidays", true).getBoolean(true);
|
||||
MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1D).getDouble(1D);
|
||||
MekanismClient.machineEffects = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MachineEffects", true).getBoolean(true);
|
||||
|
||||
String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J").getString();
|
||||
|
||||
if(s != null)
|
||||
{
|
||||
if(s.trim().equalsIgnoreCase("j") || s.trim().equalsIgnoreCase("joules"))
|
||||
{
|
||||
Mekanism.activeType = EnergyType.J;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("rf") || s.trim().equalsIgnoreCase("te") || s.trim().equalsIgnoreCase("thermal expansion"))
|
||||
{
|
||||
Mekanism.activeType = EnergyType.RF;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("eu") || s.trim().equalsIgnoreCase("ic2"))
|
||||
{
|
||||
Mekanism.activeType = EnergyType.EU;
|
||||
}
|
||||
else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft"))
|
||||
{
|
||||
Mekanism.activeType = EnergyType.MJ;
|
||||
}
|
||||
}
|
||||
|
||||
Mekanism.configuration.save();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user