Bump version to 9.1, add Laser Amplifier comparator support, add Saturating Condensers to recycle water from Industrial Turbines

This commit is contained in:
aidancbrady committed 2016-07-06 16:56:24 -04:00
1 parent 53a9204974
commit 95c0ad4a73
28 files changed
+295 -118

No files matched your search

@@ -145,6 +145,7 @@ public class MekanismConfig
public static int turbineBladesPerCoil;
public static double turbineVentGasFlow;
public static double turbineDisperserGasFlow;
public static int condenserRate;
}
public static class tools
@@ -3,7 +3,7 @@ package mekanism.client.gui;
import java.util.ArrayList;
import mekanism.api.Coord4D;
import mekanism.client.gui.element.GuiDetectionTab;
import mekanism.client.gui.element.GuiAmplifierTab;
import mekanism.client.gui.element.GuiGauge.Type;
import mekanism.client.gui.element.GuiNumberGauge;
import mekanism.client.gui.element.GuiNumberGauge.INumberInfoHandler;
@@ -69,7 +69,7 @@ public class GuiLaserAmplifier extends GuiMekanism
}, Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png"), 6, 10));
guiElements.add(new GuiSecurityTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiDetectionTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
guiElements.add(new GuiAmplifierTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiBlank.png")));
}
@Override
@@ -18,13 +18,13 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class GuiDetectionTab extends GuiElement
public class GuiAmplifierTab extends GuiElement
{
public TileEntity tileEntity;
public GuiDetectionTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def)
public GuiAmplifierTab(IGuiWrapper gui, TileEntity tile, ResourceLocation def)
{
super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiDetectionTab.png"), gui, def);
super(MekanismUtils.getResource(ResourceType.GUI_ELEMENT, "GuiAmplifierTab.png"), gui, def);
tileEntity = tile;
}
@@ -41,13 +41,14 @@ public class GuiDetectionTab extends GuiElement
mc.renderEngine.bindTexture(RESOURCE);
guiObj.drawTexturedRect(guiWidth - 26, guiHeight + 138, 0, 0, 26, 26);
int outputOrdinal = ((TileEntityLaserAmplifier)tileEntity).outputMode.ordinal();
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160)
{
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 142, 26, 0, 18, 18);
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 142, 26 + 18*outputOrdinal, 0, 18, 18);
}
else {
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 142, 26, 18, 18, 18);
guiObj.drawTexturedRect(guiWidth - 21, guiHeight + 142, 26 + 18*outputOrdinal, 18, 18, 18);
}
mc.renderEngine.bindTexture(defaultLocation);
@@ -60,8 +61,8 @@ public class GuiDetectionTab extends GuiElement
if(xAxis >= -21 && xAxis <= -3 && yAxis >= 142 && yAxis <= 160)
{
String text = LangUtils.transOnOff(((TileEntityLaserAmplifier)tileEntity).entityDetection);
displayTooltip(LangUtils.localize("gui.entityDetection") + ": " + text, xAxis, yAxis);
String text = LangUtils.localize("gui.redstoneOutput") + ": ";
displayTooltip(text + ((TileEntityLaserAmplifier)tileEntity).outputMode.getName(), xAxis, yAxis);
}
mc.renderEngine.bindTexture(defaultLocation);
+2 -2
View File
@@ -142,7 +142,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
* @author AidanBrady
*
*/
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.0.3", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory",
dependencies = "after:ForgeMultipart;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" +
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
public class Mekanism
@@ -168,7 +168,7 @@ public class Mekanism
public static Configuration configuration;
/** Mekanism version number */
public static Version versionNumber = new Version(9, 0, 3);
public static Version versionNumber = new Version(9, 1, 0);
/** MultiblockManagers for various structrures */
public static MultiblockManager<SynchronizedTankData> tankManager = new MultiblockManager<SynchronizedTankData>("dynamicTank");
@@ -242,6 +242,24 @@ public interface IFactory
{
return fuelSpeed;
}
public static RecipeType getFromMachine(Block block, int meta)
{
RecipeType type = null;
for(RecipeType iterType : RecipeType.values())
{
ItemStack machineStack = iterType.getStack();
if(Block.getBlockFromItem(machineStack.getItem()) == block && machineStack.getItemDamage() == meta)
{
type = iterType;
break;
}
}
return type;
}
private RecipeType(String s, String s1, ItemStack is, boolean b, boolean b1, Recipe r)
{
@@ -0,0 +1,8 @@
package mekanism.common.base;
import mekanism.common.Tier.BaseTier;
public interface ITierUpgradeable
{
public boolean upgrade(BaseTier upgradeTier);
}
@@ -818,6 +818,19 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo
return ((TileEntityFluidTank)tileEntity).getRedstoneLevel();
}
if(tileEntity instanceof TileEntityLaserAmplifier)
{
TileEntityLaserAmplifier amplifier = (TileEntityLaserAmplifier)tileEntity;
if(amplifier.outputMode == TileEntityLaserAmplifier.RedstoneOutput.ENERGY_CONTENTS)
{
return amplifier.getRedstoneLevel();
}
else {
return isProvidingWeakPower(world, x, y, z, par5);
}
}
return 0;
}
@@ -4,13 +4,8 @@ import java.util.List;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.tile.TileEntityAdvancedElectricMachine;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.tile.TileEntityBasicBlock;
import mekanism.common.tile.TileEntityElectricMachine;
import mekanism.common.tile.TileEntityFactory;
import mekanism.common.tile.TileEntityMetallurgicInfuser;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -27,7 +22,6 @@ public class ItemFactoryInstaller extends ItemMekanism
public ItemFactoryInstaller()
{
super();
setMaxStackSize(1);
setHasSubtypes(true);
}
@@ -42,79 +36,18 @@ public class ItemFactoryInstaller extends ItemMekanism
TileEntity tile = world.getTileEntity(x, y, z);
FactoryTier tier = FactoryTier.values()[stack.getItemDamage()];
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).playersUsing.size() > 0)
if(tile instanceof ITierUpgradeable)
{
return true;
}
if(tile instanceof TileEntityFactory && tier != FactoryTier.BASIC)
{
TileEntityFactory factory = (TileEntityFactory)tile;
if(factory.tier.ordinal()+1 == tier.ordinal())
if(tile instanceof TileEntityBasicBlock && ((TileEntityBasicBlock)tile).playersUsing.size() > 0)
{
if(!world.isRemote)
{
factory.upgrade();
}
if(!player.capabilities.isCreativeMode)
{
stack.stackSize = 0;
}
return true;
}
}
else if(tile != null && tier == FactoryTier.BASIC)
{
RecipeType type = null;
for(RecipeType iterType : RecipeType.values())
if(((ITierUpgradeable)tile).upgrade(tier.getBaseTier()))
{
ItemStack machineStack = iterType.getStack();
if(Block.getBlockFromItem(machineStack.getItem()) == world.getBlock(x, y, z) && machineStack.getItemDamage() == world.getBlockMetadata(x, y, z))
if(!player.capabilities.isCreativeMode)
{
type = iterType;
break;
}
}
if(type != null)
{
if(tile instanceof TileEntityElectricMachine)
{
((TileEntityElectricMachine)tile).upgrade(type);
if(!player.capabilities.isCreativeMode)
{
stack.stackSize = 0;
}
return true;
}
else if(tile instanceof TileEntityAdvancedElectricMachine)
{
((TileEntityAdvancedElectricMachine)tile).upgrade(type);
if(!player.capabilities.isCreativeMode)
{
stack.stackSize = 0;
}
return true;
}
else if(tile instanceof TileEntityMetallurgicInfuser)
{
((TileEntityMetallurgicInfuser)tile).upgrade(type);
if(!player.capabilities.isCreativeMode)
{
stack.stackSize = 0;
}
return true;
stack.stackSize--;
}
}
}
@@ -122,11 +55,6 @@ public class ItemFactoryInstaller extends ItemMekanism
return false;
}
private int getOutputSlot(FactoryTier tier, int operation)
{
return 5+tier.processes+operation;
}
@Override
public void registerIcons(IIconRegister register)
{
@@ -14,8 +14,10 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.SideData;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Upgrade;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.inputs.AdvancedMachineInput;
import mekanism.common.recipe.machines.AdvancedMachineRecipe;
@@ -33,7 +35,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedMachineRecipe<RECIPE>> extends TileEntityBasicMachine<AdvancedMachineInput, ItemStackOutput, RECIPE> implements IGasHandler, ITubeConnection
public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedMachineRecipe<RECIPE>> extends TileEntityBasicMachine<AdvancedMachineInput, ItemStackOutput, RECIPE> implements IGasHandler, ITubeConnection, ITierUpgradeable
{
/** How much secondary energy (fuel) this machine uses per tick, not including upgrades. */
public int BASE_SECONDARY_ENERGY_PER_TICK;
@@ -89,12 +91,19 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2));
}
public void upgrade(RecipeType type)
@Override
public boolean upgrade(BaseTier upgradeTier)
{
if(upgradeTier != BaseTier.BASIC)
{
return false;
}
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5, 3);
TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(xCoord, yCoord, zCoord);
RecipeType type = RecipeType.getFromMachine(getBlockType(), getBlockMetadata());
//Basic
factory.facing = facing;
@@ -146,8 +155,9 @@ public abstract class TileEntityAdvancedElectricMachine<RECIPE extends AdvancedM
}
factory.upgraded = true;
factory.markDirty();
return true;
}
/**
@@ -574,6 +574,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento
{
setActive(!getActive());
worldObj.playSoundEffect(xCoord, yCoord, zCoord, "random.click", 0.3F, 1);
return true;
}
@@ -5,7 +5,9 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.SideData;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Upgrade;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.recipe.RecipeHandler;
import mekanism.common.recipe.inputs.ItemStackInput;
@@ -20,7 +22,7 @@ import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.item.ItemStack;
public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecipe<RECIPE>> extends TileEntityBasicMachine<ItemStackInput, ItemStackOutput, RECIPE>
public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecipe<RECIPE>> extends TileEntityBasicMachine<ItemStackInput, ItemStackOutput, RECIPE> implements ITierUpgradeable
{
/**
* A simple electrical machine. This has 3 slots - the input slot (0), the energy slot (1),
@@ -55,12 +57,19 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
ejectorComponent.setOutputData(TransmissionType.ITEM, configComponent.getOutputs(TransmissionType.ITEM).get(2));
}
public void upgrade(RecipeType type)
@Override
public boolean upgrade(BaseTier upgradeTier)
{
if(upgradeTier != BaseTier.BASIC)
{
return false;
}
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5, 3);
TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(xCoord, yCoord, zCoord);
RecipeType type = RecipeType.getFromMachine(getBlockType(), getBlockMetadata());
//Basic
factory.facing = facing;
@@ -108,8 +117,9 @@ public abstract class TileEntityElectricMachine<RECIPE extends BasicMachineRecip
}
factory.upgraded = true;
factory.markDirty();
return true;
}
@Override
@@ -30,11 +30,13 @@ import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.PacketHandler;
import mekanism.common.SideData;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.Upgrade;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.base.SoundWrapper;
import mekanism.common.block.BlockMachine.MachineType;
@@ -61,7 +63,7 @@ import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile
public class TileEntityFactory extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IGasHandler, ITubeConnection, ISpecialConfigData, ISecurityTile, ITierUpgradeable
{
/** This Factory's tier. */
public FactoryTier tier;
@@ -174,8 +176,14 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
maxInfuse = BASE_MAX_INFUSE*tier.processes;
}
public void upgrade()
@Override
public boolean upgrade(BaseTier upgradeTier)
{
if(upgradeTier.ordinal() != tier.ordinal()+1 || tier == FactoryTier.ELITE)
{
return false;
}
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5+tier.ordinal()+1, 3);
@@ -244,6 +252,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I
factory.markDirty();
Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(factory), factory.getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(factory)));
return true;
}
@Override
@@ -17,11 +17,13 @@ import mekanism.common.integration.IComputerIntegration;
import mekanism.common.network.PacketTileEntity.TileEntityMessage;
import mekanism.common.security.ISecurityTile;
import mekanism.common.tile.component.TileComponentSecurity;
import mekanism.common.util.LangUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraftforge.common.util.ForgeDirection;
@@ -44,7 +46,9 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
public double diggingProgress;
public boolean emittingRedstone;
public boolean entityDetection;
public int currentRedstoneLevel;
public RedstoneOutput outputMode = RedstoneOutput.OFF;
public TileComponentSecurity securityComponent = new TileComponentSecurity(this);
@@ -91,7 +95,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
if(!(hardness < 0 || (tileHit instanceof ILaserReceptor && !((ILaserReceptor)tileHit).canLasersDig())))
{
diggingProgress += lastFired;
if(diggingProgress < hardness*general.laserEnergyNeededPerHardness)
{
Mekanism.proxy.addHitEffects(hitCoord, mop);
@@ -163,11 +167,19 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D));
}
if(!entityDetection)
if(outputMode != RedstoneOutput.ENTITY_DETECTION)
{
emittingRedstone = false;
}
int newRedstoneLevel = getRedstoneLevel();
if(newRedstoneLevel != currentRedstoneLevel)
{
markDirty();
currentRedstoneLevel = newRedstoneLevel;
}
if(emittingRedstone != prevRedstone)
{
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType());
@@ -196,6 +208,17 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
{
return shouldFire() ? Math.min(collectedEnergy, maxThreshold) : 0;
}
public int getRedstoneLevel()
{
if(outputMode != RedstoneOutput.ENERGY_CONTENTS)
{
return 0;
}
double fractionFull = getEnergy()/getMaxEnergy();
return MathHelper.floor_float((float)(fractionFull * 14.0F)) + (fractionFull > 0 ? 1 : 0);
}
@Override
public ArrayList getNetworkedData(ArrayList data)
@@ -210,7 +233,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
data.add(lastFired);
data.add(controlType.ordinal());
data.add(emittingRedstone);
data.add(entityDetection);
data.add(outputMode.ordinal());
return data;
}
@@ -232,7 +255,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
time = dataStream.readInt();
break;
case 3:
entityDetection = !entityDetection;
outputMode = RedstoneOutput.values()[outputMode.ordinal() == RedstoneOutput.values().length-1 ? 0 : outputMode.ordinal()+1];
break;
}
@@ -251,7 +274,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
lastFired = dataStream.readDouble();
controlType = RedstoneControl.values()[dataStream.readInt()];
emittingRedstone = dataStream.readBoolean();
entityDetection = dataStream.readBoolean();
outputMode = RedstoneOutput.values()[dataStream.readInt()];
}
}
@@ -267,7 +290,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
collectedEnergy = nbtTags.getDouble("collectedEnergy");
lastFired = nbtTags.getDouble("lastFired");
controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")];
entityDetection = nbtTags.getBoolean("entityDetection");
outputMode = RedstoneOutput.values()[nbtTags.getInteger("outputMode")];
}
@Override
@@ -282,7 +305,7 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
nbtTags.setDouble("collectedEnergy", collectedEnergy);
nbtTags.setDouble("lastFired", lastFired);
nbtTags.setInteger("controlType", controlType.ordinal());
nbtTags.setBoolean("entityDetection", entityDetection);
nbtTags.setInteger("outputMode", outputMode.ordinal());
}
@Override
@@ -342,4 +365,23 @@ public class TileEntityLaserAmplifier extends TileEntityContainerBlock implement
{
return securityComponent;
}
public static enum RedstoneOutput
{
OFF("off"),
ENTITY_DETECTION("entityDetection"),
ENERGY_CONTENTS("energyContents");
private String unlocalizedName;
private RedstoneOutput(String name)
{
unlocalizedName = name;
}
public String getName()
{
return LangUtils.localize("gui." + unlocalizedName);
}
}
}
@@ -19,10 +19,12 @@ import mekanism.common.MekanismBlocks;
import mekanism.common.MekanismItems;
import mekanism.common.PacketHandler;
import mekanism.common.SideData;
import mekanism.common.Tier.BaseTier;
import mekanism.common.Upgrade;
import mekanism.common.base.IFactory.RecipeType;
import mekanism.common.base.IRedstoneControl;
import mekanism.common.base.ISideConfiguration;
import mekanism.common.base.ITierUpgradeable;
import mekanism.common.base.IUpgradeTile;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.integration.IComputerIntegration;
@@ -42,7 +44,7 @@ import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile
public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock implements IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile, ITierUpgradeable
{
/** The maxiumum amount of infuse this machine can store. */
public int MAX_INFUSE = 1000;
@@ -199,12 +201,19 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
}
}
public void upgrade(RecipeType type)
@Override
public boolean upgrade(BaseTier upgradeTier)
{
if(upgradeTier != BaseTier.BASIC)
{
return false;
}
worldObj.setBlockToAir(xCoord, yCoord, zCoord);
worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5, 3);
TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(xCoord, yCoord, zCoord);
RecipeType type = RecipeType.INFUSING;
//Basic
factory.facing = facing;
@@ -257,8 +266,9 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i
}
factory.upgraded = true;
factory.markDirty();
return true;
}
@Override
@@ -28,6 +28,7 @@ import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture;
import mekanism.generators.common.tile.reactor.TileEntityReactorPort;
import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil;
import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex;
import mekanism.generators.common.tile.turbine.TileEntitySaturatingCondenser;
import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
import mekanism.generators.common.tile.turbine.TileEntityTurbineValve;
@@ -61,6 +62,7 @@ public class GeneratorsCommonProxy implements IGuiProvider
GameRegistry.registerTileEntity(TileEntityReactorLogicAdapter.class, "ReactorLogicAdapter");
GameRegistry.registerTileEntity(TileEntityRotationalComplex.class, "RotationalComplex");
GameRegistry.registerTileEntity(TileEntityElectromagneticCoil.class, "ElectromagneticCoil");
GameRegistry.registerTileEntity(TileEntitySaturatingCondenser.class, "SaturatingCondenser");
}
/**
@@ -103,6 +105,7 @@ public class GeneratorsCommonProxy implements IGuiProvider
generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt();
generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble();
generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble();
generators.condenserRate = Mekanism.configuration.get("generation", "TurbineCondenserRate", 8000).getInt();
if(Mekanism.configuration.hasChanged())
{
@@ -43,7 +43,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.network.NetworkRegistry;
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.0.3", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory")
public class MekanismGenerators implements IModule
{
@SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy")
@@ -53,7 +53,7 @@ public class MekanismGenerators implements IModule
public static MekanismGenerators instance;
/** MekanismGenerators version number */
public static Version versionNumber = new Version(9, 0, 3);
public static Version versionNumber = new Version(9, 1, 0);
public static MultiblockManager<SynchronizedTurbineData> turbineManager = new MultiblockManager<SynchronizedTurbineData>("industrialTurbine");
@@ -210,6 +210,7 @@ public class MekanismGenerators implements IModule
dataStream.writeInt(generators.turbineBladesPerCoil);
dataStream.writeDouble(generators.turbineVentGasFlow);
dataStream.writeDouble(generators.turbineDisperserGasFlow);
dataStream.writeInt(generators.condenserRate);
}
@Override
@@ -231,6 +232,7 @@ public class MekanismGenerators implements IModule
generators.turbineBladesPerCoil = dataStream.readInt();
generators.turbineVentGasFlow = dataStream.readDouble();
generators.turbineDisperserGasFlow = dataStream.readDouble();
generators.condenserRate = dataStream.readInt();
}
@Override
@@ -36,6 +36,7 @@ import mekanism.generators.common.tile.TileEntitySolarGenerator;
import mekanism.generators.common.tile.TileEntityWindGenerator;
import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil;
import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex;
import mekanism.generators.common.tile.turbine.TileEntitySaturatingCondenser;
import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
import mekanism.generators.common.tile.turbine.TileEntityTurbineValve;
@@ -77,6 +78,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* 10: Turbine Casing
* 11: Turbine Valve
* 12: Turbine Vent
* 13: Saturating Condenser
* @author AidanBrady
*
*/
@@ -117,6 +119,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB
icons[10][0] = ctms[10].mainTextureData.icon;
icons[11][0] = ctms[11].mainTextureData.icon;
icons[12][0] = ctms[12].mainTextureData.icon;
icons[13][0] = register.registerIcon("mekanism:SteelCasing");
}
@Override
@@ -767,7 +770,8 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB
ELECTROMAGNETIC_COIL(9, "ElectromagneticCoil", -1, -1, TileEntityElectromagneticCoil.class, false),
TURBINE_CASING(10, "TurbineCasing", -1, -1, TileEntityTurbineCasing.class, false),
TURBINE_VALVE(11, "TurbineValve", -1, -1, TileEntityTurbineValve.class, false),
TURBINE_VENT(12, "TurbineVent", -1, -1, TileEntityTurbineVent.class, false);
TURBINE_VENT(12, "TurbineVent", -1, -1, TileEntityTurbineVent.class, false),
SATURATING_CONDENSER(13, "SaturatingCondenser", -1, -1, TileEntitySaturatingCondenser.class, false);
public int meta;
public String name;
@@ -25,6 +25,7 @@ public class SynchronizedTurbineData extends SynchronizedData<SynchronizedTurbin
public int blades;
public int vents;
public int coils;
public int condensers;
public int lowerVolume;
@@ -33,6 +34,8 @@ public class SynchronizedTurbineData extends SynchronizedData<SynchronizedTurbin
public int lastSteamInput;
public int newSteamInput;
public int flowRemaining;
public int clientDispersers;
public int clientFlow;
public float clientRotation;
@@ -15,6 +15,7 @@ import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.block.BlockGenerator.GeneratorType;
import mekanism.generators.common.tile.turbine.TileEntityElectromagneticCoil;
import mekanism.generators.common.tile.turbine.TileEntityRotationalComplex;
import mekanism.generators.common.tile.turbine.TileEntitySaturatingCondenser;
import mekanism.generators.common.tile.turbine.TileEntityTurbineCasing;
import mekanism.generators.common.tile.turbine.TileEntityTurbineRotor;
import mekanism.generators.common.tile.turbine.TileEntityTurbineVent;
@@ -50,7 +51,8 @@ public class TurbineUpdateProtocol extends UpdateProtocol<SynchronizedTurbineDat
TileEntity tile = pointer.getWorldObj().getTileEntity(x, y, z);
return tile instanceof TileEntityTurbineRotor || tile instanceof TileEntityRotationalComplex ||
tile instanceof TileEntityPressureDisperser || tile instanceof TileEntityElectromagneticCoil;
tile instanceof TileEntityPressureDisperser || tile instanceof TileEntityElectromagneticCoil ||
tile instanceof TileEntitySaturatingCondenser;
}
@Override
@@ -70,6 +72,7 @@ public class TurbineUpdateProtocol extends UpdateProtocol<SynchronizedTurbineDat
Set<Coord4D> turbines = new HashSet<Coord4D>();
Set<Coord4D> dispersers = new HashSet<Coord4D>();
Set<Coord4D> coils = new HashSet<Coord4D>();
Set<Coord4D> condensers = new HashSet<Coord4D>();
//Scan for complex
for(Coord4D coord : innerNodes)
@@ -107,6 +110,10 @@ public class TurbineUpdateProtocol extends UpdateProtocol<SynchronizedTurbineDat
{
coils.add(coord);
}
else if(tile instanceof TileEntitySaturatingCondenser)
{
condensers.add(coord);
}
}
//Terminate if complex doesn't exist
@@ -140,6 +147,17 @@ public class TurbineUpdateProtocol extends UpdateProtocol<SynchronizedTurbineDat
return false;
}
//Make sure all condensers are in proper locations
for(Coord4D coord : condensers)
{
if(coord.yCoord <= complex.yCoord)
{
return false;
}
}
structure.condensers = condensers.size();
int turbineHeight = 0;
//Make sure a complete line of turbine rotors exist from the complex to the multiblock's base
@@ -56,6 +56,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* 10: Turbine Casing
* 11: Turbine Valve
* 12: Turbine Vent
* 13: Saturating Condenser
* @author AidanBrady
*
*/
@@ -0,0 +1,15 @@
package mekanism.generators.common.tile.turbine;
import mekanism.common.tile.TileEntityBasicBlock;
public class TileEntitySaturatingCondenser extends TileEntityBasicBlock
{
@Override
public boolean canUpdate()
{
return false;
}
@Override
public void onUpdate() {}
}
@@ -76,7 +76,8 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock<SynchronizedTu
setEnergy(getEnergy()+((int)rate)*energyMultiplier);
structure.fluidStored.amount -= rate;
structure.clientFlow = (int)rate;
structure.clientFlow = Math.min((int)rate, structure.condensers*generators.condenserRate);
structure.flowRemaining = (int)rate;
if(structure.fluidStored.amount == 0)
{
@@ -181,6 +182,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock<SynchronizedTu
data.add(structure.vents);
data.add(structure.blades);
data.add(structure.coils);
data.add(structure.condensers);
data.add(structure.getDispersers());
data.add(structure.electricityStored);
data.add(structure.clientFlow);
@@ -236,6 +238,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock<SynchronizedTu
structure.vents = dataStream.readInt();
structure.blades = dataStream.readInt();
structure.coils = dataStream.readInt();
structure.condensers = dataStream.readInt();
structure.clientDispersers = dataStream.readInt();
structure.electricityStored = dataStream.readDouble();
structure.clientFlow = dataStream.readInt();
@@ -1,9 +1,81 @@
package mekanism.generators.common.tile.turbine;
public class TileEntityTurbineVent extends TileEntityTurbineCasing
import mekanism.api.Coord4D;
import mekanism.common.util.PipeUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler;
public class TileEntityTurbineVent extends TileEntityTurbineCasing implements IFluidHandler
{
public FluidTankInfo fakeInfo = new FluidTankInfo(null, 1000);
public TileEntityTurbineVent()
{
super("TurbineVent");
}
@Override
public void onUpdate()
{
super.onUpdate();
if(structure != null && structure.flowRemaining > 0)
{
FluidStack fluidStack = new FluidStack(FluidRegistry.WATER, structure.flowRemaining);
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
TileEntity tile = Coord4D.get(this).getFromSide(side).getTileEntity(worldObj);
if(tile instanceof IFluidHandler)
{
if(((IFluidHandler)tile).canFill(side.getOpposite(), fluidStack.getFluid()))
{
structure.flowRemaining -= ((IFluidHandler)tile).fill(side.getOpposite(), fluidStack, true);
}
}
}
}
}
@Override
public FluidTankInfo[] getTankInfo(ForgeDirection from)
{
return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)) ? new FluidTankInfo[] {fakeInfo} : PipeUtils.EMPTY;
}
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill)
{
return 0;
}
@Override
public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain)
{
return null;
}
@Override
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
{
return null;
}
@Override
public boolean canFill(ForgeDirection from, Fluid fluid)
{
return false;
}
@Override
public boolean canDrain(ForgeDirection from, Fluid fluid)
{
return fluid == FluidRegistry.WATER;
}
}
@@ -29,7 +29,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.0.3", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory")
public class MekanismTools implements IModule
{
@SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy")
@@ -39,7 +39,7 @@ public class MekanismTools implements IModule
public static MekanismTools instance;
/** MekanismTools version number */
public static Version versionNumber = new Version(9, 0, 3);
public static Version versionNumber = new Version(9, 1, 0);
//Enums: Tools
public static ToolMaterial toolOBSIDIAN;