From b51aa0ee83540ac88a2d5b3c015599936247e691 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 27 Feb 2015 18:19:13 -0600 Subject: [PATCH] A few fixes, temporary x10 energy scale up to allow for higher energy production --- .../common/tile/TileEntityLaserAmplifier.java | 17 ++++++----------- .../generators/common/FusionReactor.java | 13 ++++++++----- .../generators/common/block/BlockReactor.java | 2 +- .../resources/assets/mekanism/lang/en_US.lang | 1 + 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java index 29cd959a2..11553e09a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java +++ b/src/main/java/mekanism/common/tile/TileEntityLaserAmplifier.java @@ -1,5 +1,7 @@ package mekanism.common.tile; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -9,9 +11,7 @@ import mekanism.common.LaserManager; import mekanism.common.Mekanism; import mekanism.common.base.IRedstoneControl; import mekanism.common.network.PacketTileEntity.TileEntityMessage; -import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -19,8 +19,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.common.util.ForgeDirection; -import io.netty.buffer.ByteBuf; - public class TileEntityLaserAmplifier extends TileEntityContainerBlock implements ILaserReceptor, IRedstoneControl { public static final double MAX_ENERGY = 5E9; @@ -67,14 +65,12 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement LaserManager.fireLaserClient(this, ForgeDirection.getOrientation(facing), lastFired, worldObj); } } - else - { + else { if(ticks < time) { ticks++; } - else - { + else { ticks = 0; } @@ -107,13 +103,12 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement { diggingProgress += firing; - if(diggingProgress >= hardness * general.laserEnergyNeededPerHardness) + if(diggingProgress >= hardness*general.laserEnergyNeededPerHardness) { LaserManager.breakBlock(hitCoord, true, worldObj); diggingProgress = 0; } - else - { + else { Minecraft.getMinecraft().effectRenderer.addBlockHitEffects(hitCoord.xCoord, hitCoord.yCoord, hitCoord.zCoord, mop); } } diff --git a/src/main/java/mekanism/generators/common/FusionReactor.java b/src/main/java/mekanism/generators/common/FusionReactor.java index 68ef2532e..aac522170 100644 --- a/src/main/java/mekanism/generators/common/FusionReactor.java +++ b/src/main/java/mekanism/generators/common/FusionReactor.java @@ -1,5 +1,8 @@ package mekanism.generators.common; +import static java.lang.Math.max; +import static java.lang.Math.min; + import java.util.ArrayList; import java.util.Collections; import java.util.HashSet; @@ -18,7 +21,6 @@ import mekanism.api.reactor.IReactorBlock; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.generators.common.tile.reactor.TileEntityReactorController; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.ItemCoal; @@ -30,9 +32,6 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; -import static java.lang.Math.max; -import static java.lang.Math.min; - public class FusionReactor implements IFusionReactor { public TileEntityReactorController controller; @@ -60,7 +59,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.01; + public static double thermocoupleEfficiency = 0.1; public static double steamTransferEfficiency = 0.1; //Heat transfer metrics @@ -317,6 +316,7 @@ public class FusionReactor implements IFusionReactor { AxisAlignedBB death_zone = AxisAlignedBB.getBoundingBox(controller.xCoord - 1, controller.yCoord - 3, controller.zCoord - 1 ,controller.xCoord + 2, controller.yCoord, controller.zCoord + 2); List entitiesToDie = controller.getWorldObj().getEntitiesWithinAABB(Entity.class, death_zone); + for(Entity entity : entitiesToDie) { entity.attackEntityFrom(DamageSource.magic, 50000F); @@ -471,6 +471,7 @@ public class FusionReactor implements IFusionReactor return true; } + @Override public boolean isFormed() { return formed; @@ -529,6 +530,7 @@ public class FusionReactor implements IFusionReactor return burnTemperature * energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) / (energyPerFuel * burnRatio * (plasmaCaseConductivity+k+caseAirConductivity) - plasmaCaseConductivity * (k + caseAirConductivity)); } + @Override public double getPassiveGeneration(boolean active, boolean current) { double temperature = current ? caseTemperature : getMaxCasingTemperature(active); @@ -536,6 +538,7 @@ public class FusionReactor implements IFusionReactor return thermocoupleEfficiency * caseAirConductivity * temperature; } + @Override public int getSteamPerTick(boolean current) { double temperature = current ? caseTemperature : getMaxCasingTemperature(true); diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 78f05895b..1d92835e8 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -228,7 +228,7 @@ public class BlockReactor extends BlockContainer implements IBlockCTM { for(ReactorBlockType type : ReactorBlockType.values()) { - if(type.typeBlock == this) + if(type.typeBlock == this && type != ReactorBlockType.NEUTRON_CAPTURE) { list.add(new ItemStack(item, 1, type.meta)); } diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 372b2bcfc..eb678ea44 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -290,6 +290,7 @@ fluid.heavyWater=Heavy Water fluid.lithium=Liquid Lithium fluid.deuterium=Liquid Deuterium fluid.tritium=Liquid Tritium +fluid.fusionFuelDT=Liquid D-T Fuel //OreGas names oregas.iron=Iron Ore