From a7c812bc6e211690bc863b6c58f6fb35ea12836e Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 22 Mar 2015 02:15:59 +0000 Subject: [PATCH 1/2] Reduce paramaters of the reactor for more challenging balance. Now requires 1GJ to ignite, and produces half as much power in passive mode. The product of thermocouple efficiency and the laser input bonus must not be more than 1, (was previously 10) or energy from a laser that is absorbed (multiplied by the bonus coefficient) then propagates through the code and is multiplied by the thermocouple efficiency will come out bigger than it went in. This would make the most efficient usage of a reactor simply shining a laser at it and pulling power out, producting net +49.5kJ/t. This is now rectified, the product of bonus and thermocouple is now 0.5. --- src/main/java/mekanism/generators/common/FusionReactor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index fcffc87a7..20897fd37 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -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() From c0281d447001f2c4e35572ce231194366a268789 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 22 Mar 2015 02:23:45 +0000 Subject: [PATCH 2/2] Fix #2298 --- src/main/java/mekanism/api/MekanismConfig.java | 7 +++---- .../java/mekanism/api/transmitters/TransmissionType.java | 4 ++-- src/main/java/mekanism/common/CommonProxy.java | 4 ++-- src/main/java/mekanism/common/block/BlockMachine.java | 2 +- .../java/mekanism/common/network/PacketConfigSync.java | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index e62bd733d..cf6c2e767 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -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 config = new HashMap(); + private static Map config = new HashMap(); - 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); } diff --git a/src/main/java/mekanism/api/transmitters/TransmissionType.java b/src/main/java/mekanism/api/transmitters/TransmissionType.java index 0c145b837..956bf3986 100644 --- a/src/main/java/mekanism/api/transmitters/TransmissionType.java +++ b/src/main/java/mekanism/api/transmitters/TransmissionType.java @@ -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) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index a6febf658..1d7c5615d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -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()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index b2dfe458b..09d28e0d0 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -1189,7 +1189,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 recipes) diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 476ef1c53..8c75e2cce 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -56,7 +56,7 @@ public class PacketConfigSync implements IMessageHandler