tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/aidancbrady/Mekanism into development

Browse source
This commit is contained in:
Aidan C. Brady 2015-03-22 00:48:44 -05:00
parent 9a2d47ad4b c0281d4470
commit d6c48a6e71
6 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -5,7 +5,6 @@ import java.util.Map;
import mekanism.api.util.UnitDisplayUtils.EnergyType;
import mekanism.api.util.UnitDisplayUtils.TempType;
import mekanism.common.block.BlockMachine.MachineType;
public class MekanismConfig
{
@ -66,14 +65,14 @@ public class MekanismConfig
public static class machines
{
private static Map<MachineType, Boolean> config = new HashMap<MachineType, Boolean>();
private static Map<String, Boolean> config = new HashMap<String, Boolean>();
public static boolean isEnabled(MachineType type)
public static boolean isEnabled(String type)
{
return config.get(type) != null && config.get(type);
}
public static void setEntry(MachineType type, boolean enabled)
public static void setEntry(String type, boolean enabled)
{
config.put(type, enabled);
}

4
src/main/java/mekanism/api/transmitters/TransmissionType.java
View file

@ -1,8 +1,8 @@
package mekanism.api.transmitters;
import mekanism.api.gas.IGasTransmitter;
import mekanism.common.util.MekanismUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
public enum TransmissionType
{
@ -33,7 +33,7 @@ public enum TransmissionType
public String localize()
{
return MekanismUtils.localize("transmission." + getTransmission());
return StatCollector.translateToLocal("transmission." + getTransmission());
}
public static boolean checkTransmissionType(TileEntity sideTile, TransmissionType type)

4
src/main/java/mekanism/common/CommonProxy.java
View file

@ -309,7 +309,7 @@ public class CommonProxy
for(MachineType type : MachineType.getValidMachines())
{
machines.setEntry(type, Mekanism.configuration.get("machines", type.name + "Enabled", true).getBoolean(true));
machines.setEntry(type.name, Mekanism.configuration.get("machines", type.name + "Enabled", true).getBoolean(true));
}
usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D);
@ -546,7 +546,7 @@ public class CommonProxy
{
for(MachineType type : MachineType.getValidMachines())
{
if(machines.isEnabled(type))
if(machines.isEnabled(type.name))
{
CraftingManager.getInstance().getRecipeList().removeAll(type.getRecipes());
CraftingManager.getInstance().getRecipeList().addAll(type.getRecipes());

2
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -1194,7 +1194,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
public boolean isEnabled()
{
return machines.isEnabled(this);
return machines.isEnabled(this.name);
}
public void addRecipes(Collection<MekanismRecipe> recipes)

4
src/main/java/mekanism/common/network/PacketConfigSync.java
View file

@ -56,7 +56,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
for(MachineType type : MachineType.getValidMachines())
{
dataStream.writeBoolean(machines.isEnabled(type));
dataStream.writeBoolean(machines.isEnabled(type.name));
}
dataStream.writeDouble(usage.enrichmentChamberUsage);
@ -123,7 +123,7 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
for(MachineType type : MachineType.getValidMachines())
{
machines.setEntry(type, dataStream.readBoolean());
machines.setEntry(type.name, dataStream.readBoolean());
}
usage.enrichmentChamberUsage = dataStream.readDouble();

4
src/main/java/mekanism/generators/common/FusionReactor.java
View file

@ -62,7 +62,7 @@ public class FusionReactor implements IFusionReactor
public static double plasmaHeatCapacity = 100;
public static double caseHeatCapacity = 1;
public static double enthalpyOfVaporization = 10;
public static double thermocoupleEfficiency = 0.1;
public static double thermocoupleEfficiency = 0.05;
public static double steamTransferEfficiency = 0.1;
//Heat transfer metrics
@ -85,7 +85,7 @@ public class FusionReactor implements IFusionReactor
@Override
public void addTemperatureFromEnergyInput(double energyAdded)
{
plasmaTemperature += energyAdded / plasmaHeatCapacity * (isBurning() ? 1 : 100);
plasmaTemperature += energyAdded / plasmaHeatCapacity * (isBurning() ? 1 : 10);
}
public boolean hasHohlraum()