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

Merge pull request #2165 from Dannerick/myDev1

Browse source 
New config entries
This commit is contained in:
Aidan 2015-03-04 13:46:00 -05:00
commit 0ae83150ab
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -204,7 +204,9 @@ public class CommonProxy
Mekanism.FROM_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(25D); Mekanism.FROM_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToRF", 2.5D).getDouble(25D);
Mekanism.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", .4D).getDouble(.04D); Mekanism.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", .4D).getDouble(.04D);
Mekanism.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "THIS DETERMINES ELECTROLYTIC SEPARATOR USAGE").getDouble(200D); Mekanism.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "THIS DETERMINES ELECTROLYTIC SEPARATOR USAGE").getDouble(200D);
Mekanism.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt(40);
Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D); Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D);
Mekanism.ATOMICDISASSEM_ENERGY_USAGE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AtomicDisassemblerEnergyUsage", 10).getInt(10);
Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt();
//If this is less than 1, upgrades make machines worse. If less than 0, I don't even know. //If this is less than 1, upgrades make machines worse. If less than 0, I don't even know.
Mekanism.maxUpgradeMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt(); Mekanism.maxUpgradeMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt();

2
src/main/java/mekanism/common/Mekanism.java
View file

@ -330,6 +330,8 @@ public class Mekanism
public static double FROM_IC2; public static double FROM_IC2;
public static double FROM_TE; public static double FROM_TE;
public static double FROM_UE = 1/TO_UE; public static double FROM_UE = 1/TO_UE;
public static int ETHENE_BURN_TIME = 40;
public static int ATOMICDISASSEM_ENERGY_USAGE = 10;
public static boolean blacklistBC; public static boolean blacklistBC;
public static boolean blacklistIC2; public static boolean blacklistIC2;

13
src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
View file

@ -9,8 +9,8 @@ import java.util.Set;
import mekanism.api.Coord4D; import mekanism.api.Coord4D;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.ListUtils; import mekanism.api.ListUtils;
import mekanism.common.Mekanism;
import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
@ -28,8 +28,7 @@ import cpw.mods.fml.common.eventhandler.Event.Result;
public class ItemAtomicDisassembler extends ItemEnergized public class ItemAtomicDisassembler extends ItemEnergized
{ {
public double ENERGY_USAGE = 10; public double HOE_USAGE = 10 * Mekanism.ATOMICDISASSEM_ENERGY_USAGE;
public double HOE_USAGE = 100;
public ItemAtomicDisassembler() public ItemAtomicDisassembler()
{ {
@ -80,10 +79,10 @@ public class ItemAtomicDisassembler extends ItemEnergized
{ {
if(block.getBlockHardness(world, x, y, z) != 0.0D) if(block.getBlockHardness(world, x, y, z) != 0.0D)
{ {
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*getEfficiency(itemstack))); setEnergy(itemstack, getEnergy(itemstack) - (Mekanism.ATOMICDISASSEM_ENERGY_USAGE*getEfficiency(itemstack)));
} }
else { else {
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*(getEfficiency(itemstack))/2)); setEnergy(itemstack, getEnergy(itemstack) - (Mekanism.ATOMICDISASSEM_ENERGY_USAGE*(getEfficiency(itemstack))/2));
} }
return true; return true;
@ -125,7 +124,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
for(Coord4D coord : found) for(Coord4D coord : found)
{ {
if(coord.equals(orig) || getEnergy(itemstack) < (ENERGY_USAGE*getEfficiency(itemstack))) if(coord.equals(orig) || getEnergy(itemstack) < (Mekanism.ATOMICDISASSEM_ENERGY_USAGE*getEfficiency(itemstack)))
{ {
continue; continue;
} }
@ -138,7 +137,7 @@ public class ItemAtomicDisassembler extends ItemEnergized
block2.breakBlock(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, block, meta); block2.breakBlock(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, block, meta);
block2.dropBlockAsItem(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, meta, 0); block2.dropBlockAsItem(player.worldObj, coord.xCoord, coord.yCoord, coord.zCoord, meta, 0);
setEnergy(itemstack, getEnergy(itemstack) - (ENERGY_USAGE*getEfficiency(itemstack))); setEnergy(itemstack, getEnergy(itemstack) - (Mekanism.ATOMICDISASSEM_ENERGY_USAGE*getEfficiency(itemstack)));
} }
} }
} }

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

@ -41,7 +41,9 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
dataStream.writeDouble(Mekanism.FROM_TE); dataStream.writeDouble(Mekanism.FROM_TE);
dataStream.writeDouble(Mekanism.TO_TE); dataStream.writeDouble(Mekanism.TO_TE);
dataStream.writeDouble(Mekanism.FROM_H2); dataStream.writeDouble(Mekanism.FROM_H2);
dataStream.writeInt(Mekanism.ETHENE_BURN_TIME);
dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE); dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE);
dataStream.writeInt(Mekanism.ATOMICDISASSEM_ENERGY_USAGE);
dataStream.writeInt(Mekanism.VOICE_PORT); dataStream.writeInt(Mekanism.VOICE_PORT);
dataStream.writeInt(Mekanism.maxUpgradeMultiplier); dataStream.writeInt(Mekanism.maxUpgradeMultiplier);
dataStream.writeInt(Mekanism.activeType.ordinal()); dataStream.writeInt(Mekanism.activeType.ordinal());
@ -95,7 +97,9 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
Mekanism.FROM_TE = dataStream.readDouble(); Mekanism.FROM_TE = dataStream.readDouble();
Mekanism.TO_TE = dataStream.readDouble(); Mekanism.TO_TE = dataStream.readDouble();
Mekanism.FROM_H2 = dataStream.readDouble(); Mekanism.FROM_H2 = dataStream.readDouble();
Mekanism.ETHENE_BURN_TIME = dataStream.readInt();
Mekanism.ENERGY_PER_REDSTONE = dataStream.readDouble(); Mekanism.ENERGY_PER_REDSTONE = dataStream.readDouble();
Mekanism.ATOMICDISASSEM_ENERGY_USAGE = dataStream.readInt();
Mekanism.VOICE_PORT = dataStream.readInt(); Mekanism.VOICE_PORT = dataStream.readInt();
Mekanism.maxUpgradeMultiplier = dataStream.readInt(); Mekanism.maxUpgradeMultiplier = dataStream.readInt();
Mekanism.activeType = EnergyType.values()[dataStream.readInt()]; Mekanism.activeType = EnergyType.values()[dataStream.readInt()];

2
src/main/java/mekanism/generators/common/MekanismGenerators.java
View file

@ -143,7 +143,7 @@ public class MekanismGenerators implements IModule
" O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic" " O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic"
})); }));
FuelHandler.addGas(GasRegistry.getGas("ethene"), 40, Mekanism.FROM_H2 + bioGeneration * 80); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus FuelHandler.addGas(GasRegistry.getGas("ethene"), Mekanism.ETHENE_BURN_TIME, Mekanism.FROM_H2 + bioGeneration * 2 * Mekanism.ETHENE_BURN_TIME); //1mB hydrogen + 2*bioFuel/tick*2000ticks/100mB * 2x efficiency bonus
} }