diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index aea5f50c5..2efa02907 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -30,6 +30,7 @@ public class MekanismConfig public static int userWorldGenVersion = 0; public static double ENERGY_PER_REDSTONE = 10000; public static int ETHENE_BURN_TIME = 40; + public static int METHANE_BURN_TIME = 10; public static double DISASSEMBLER_USAGE = 10; public static EnergyType energyUnit = EnergyType.J; public static TempType tempUnit = TempType.K; @@ -87,6 +88,8 @@ public class MekanismConfig public static boolean enableAmbientLighting; public static int ambientLightingLevel; public static boolean opaqueTransmitters = false; + public static boolean doMultiblockSparkle = true; + public static int multiblockSparkleIntensity = 6; } public static class machines @@ -140,6 +143,8 @@ public class MekanismConfig public static double heatGeneration; public static double heatGenerationLava; public static double heatGenerationNether; + public static int heatGenerationFluidRate; + public static boolean heatGenEnable; public static double solarGeneration; public static double windGenerationMin; diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index f5755bbc1..691785a7e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -231,6 +231,8 @@ public class ClientProxy extends CommonProxy client.enableAmbientLighting = Mekanism.configuration.get("client", "EnableAmbientLighting", true).getBoolean(); client.ambientLightingLevel = Mekanism.configuration.get("client", "AmbientLightingLevel", 15).getInt(); client.opaqueTransmitters = Mekanism.configuration.get("client", "OpaqueTransmitterRender", false).getBoolean(); + client.doMultiblockSparkle = Mekanism.configuration.get("client", "DoMultiblockSparkle", true).getBoolean(); + client.multiblockSparkleIntensity = Mekanism.configuration.get("client", "MultiblockSparkleIntesity", 6).getInt(); if(Mekanism.configuration.hasChanged()) { @@ -567,13 +569,15 @@ public class ClientProxy extends CommonProxy @Override public void doMultiblockSparkle(final TileEntityMultiblock tileEntity) { - new SparkleAnimation(tileEntity, new INodeChecker() { - @Override - public boolean isNode(TileEntity tile) - { + if(client.doMultiblockSparkle == true){ + new SparkleAnimation(tileEntity, new INodeChecker() { + @Override + public boolean isNode(TileEntity tile) + { return MultiblockManager.areEqual(tile, tileEntity); - } - }).run(); + } + }).run(); + } } @Override diff --git a/src/main/java/mekanism/client/SparkleAnimation.java b/src/main/java/mekanism/client/SparkleAnimation.java index b759b4dcc..1222bebc5 100644 --- a/src/main/java/mekanism/client/SparkleAnimation.java +++ b/src/main/java/mekanism/client/SparkleAnimation.java @@ -6,6 +6,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.client; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -46,10 +47,11 @@ public class SparkleAnimation public void run() { World world = pointer.getWorldObj(); + int count = client.multiblockSparkleIntensity; for(Coord4D coord : iteratedNodes) { - for(int i = 0; i < 6; i++) + for(int i = 0; i < count; i++) { world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + -.01, coord.zCoord + random.nextDouble(), 0, 0, 0); world.spawnParticle("reddust", coord.xCoord + random.nextDouble(), coord.yCoord + 1.01, coord.zCoord + random.nextDouble(), 0, 0, 0); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index d6a75452b..f6a572ecd 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -114,6 +114,7 @@ public class MekanismRenderer GasRegistry.getGas("tritium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidTritium")); GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerIcon("mekanism:liquid/LiquidDT")); GasRegistry.getGas("lithium").setIcon(event.map.registerIcon("mekanism:liquid/LiquidLithium")); + GasRegistry.getGas("methane").setIcon(event.map.registerIcon("mekanism:liquid/LiquidMethane")); for(Gas gas : GasRegistry.getRegisteredGasses()) { diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 293508a9b..b8eca12e7 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -270,6 +270,7 @@ public class CommonProxy implements IGuiProvider general.TO_TE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "RFToJoules", 0.4D).getDouble(); general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 200D, "Determines Electrolytic Separator usage").getDouble(); general.ETHENE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EthyleneBurnTime", 40).getInt(); + general.METHANE_BURN_TIME = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MethaneBurnTime", 10).getInt(); general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(); general.DISASSEMBLER_USAGE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DisassemblerEnergyUsage", 10).getInt(); general.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index ad1ee6786..142cad69e 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1168,6 +1168,7 @@ public class Mekanism GasRegistry.register(new Gas("tritium")).registerFluid(); GasRegistry.register(new Gas("fusionFuelDT")).registerFluid(); GasRegistry.register(new Gas("lithium")).registerFluid(); + GasRegistry.register(new Gas("methane")).registerFluid(); FluidRegistry.registerFluid(new Fluid("heavyWater")); FluidRegistry.registerFluid(new Fluid("steam").setGaseous(true)); diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index 9f4fca734..0509b0ab3 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -105,15 +105,15 @@ public class BlockCardboardBox extends BlockContainer data.block.onBlockPlacedBy(world, x, y, z, entityplayer, new ItemStack(data.block, 1, data.meta)); data.block.onPostBlockPlaced(world, x, y, z, data.meta); } + + // float motion = 0.7F; + // double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + // double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + // double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - float motion = 0.7F; - double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - double motionY = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; - double motionZ = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; + // EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack); - EntityItem entityItem = new EntityItem(world, x + motionX, y + motionY, z + motionZ, itemStack); - - world.spawnEntityInWorld(entityItem); + // world.spawnEntityInWorld(entityItem); } } diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index 8583c89e8..323c9143a 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -66,8 +66,7 @@ public final class OreDictManager if (OreDictionary.getOres("itemRubber").size() > 0) { for (ItemStack ore : OreDictionary.getOres("woodRubber")) { - RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRubber").get(0), 1), 1F); - } + RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ItemStack(Blocks.planks, 4), StackUtils.size(OreDictionary.getOres("itemRawRubber").get(0), 2), 1F); } } for (ItemStack ore : OreDictionary.getOres("dustSulfur")) { diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 41274908e..ae4fd038b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -44,6 +44,7 @@ public class PacketConfigSync implements IMessageHandler