diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java index 7b97b1fe5..d1e88cf34 100644 --- a/src/main/java/mekanism/api/MekanismConfig.java +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -131,6 +131,11 @@ public class MekanismConfig public static int windGenerationMinY; public static int windGenerationMaxY; + + public static int turbineBladesPerCoil; + public static double turbineBaseEnergyPerSteam; + public static double turbineVentGasFlow; + public static double turbineDisperserGasFlow; } public static class tools diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java index 1f5215cb7..d93726043 100644 --- a/src/main/java/mekanism/api/infuse/InfuseType.java +++ b/src/main/java/mekanism/api/infuse/InfuseType.java @@ -1,5 +1,7 @@ package mekanism.api.infuse; +import mekanism.common.Resource; + import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -13,29 +15,29 @@ public final class InfuseType /** The name of this infusion */ public String name; - /** The location of this infuse's GUI texture */ - public ResourceLocation texture; - - /** The infuse's GUI texture X offset. */ - public int texX; - - /** The infuse's GUI texture Y offset. */ - public int texY; + /** This infuse GUI's icon */ + public ResourceLocation icon; + + /** The location of this infuse GUI's icon */ + public String textureLocation; /** The unlocalized name of this type. */ public String unlocalizedName; - public InfuseType(String s, ResourceLocation location, int x, int y) + public InfuseType(String s, String tex) { name = s; - texture = location; - texX = x; - texY = y; + textureLocation = tex; + } + + public void setIcon(ResourceLocation i) + { + icon = i; } public InfuseType setUnlocalizedName(String name) { - unlocalizedName = name; + unlocalizedName = "infuse." + name; return this; } diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index 72b437ab8..1876a1df8 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -1,8 +1,9 @@ package mekanism.client.gui; +import java.util.ArrayList; import java.util.List; -import mekanism.api.gas.GasStack; +import mekanism.api.Coord4D; import mekanism.api.util.ListUtils; import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; @@ -13,13 +14,21 @@ import mekanism.client.gui.element.GuiSortingTab; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; import mekanism.client.render.MekanismRenderer; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; import mekanism.common.Tier.FactoryTier; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.inventory.container.ContainerFactory; +import mekanism.common.item.ItemGaugeDropper; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import net.minecraftforge.fml.relauncher.Side; @@ -69,7 +78,14 @@ public class GuiFactory extends GuiMekanism if(xAxis >= 8 && xAxis <= 168 && yAxis >= 78 && yAxis <= 83) { - drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis); + if(tileEntity.recipeType.usesFuel()) + { + drawCreativeTabHoveringText(tileEntity.gasTank.getGas() != null ? tileEntity.gasTank.getGas().getGas().getLocalizedName() + ": " + tileEntity.gasTank.getStored() : LangUtils.localize("gui.none"), xAxis, yAxis); + } + else if(tileEntity.recipeType == RecipeType.INFUSING) + { + drawCreativeTabHoveringText(tileEntity.infuseStored.type != null ? tileEntity.infuseStored.type.getLocalizedName() + ": " + tileEntity.infuseStored.amount : LangUtils.localize("gui.empty"), xAxis, yAxis); + } } super.drawGuiContainerForegroundLayer(mouseX, mouseY); @@ -92,48 +108,40 @@ public class GuiFactory extends GuiMekanism displayInt = tileEntity.getScaledEnergyLevel(52); drawTexturedModalRect(guiWidth + 165, guiHeight + 17 + 52 - displayInt, 176, 52 - displayInt, 4, displayInt); - if(tileEntity.tier == FactoryTier.BASIC) + int xOffset = tileEntity.tier == FactoryTier.BASIC ? 59 : (tileEntity.tier == FactoryTier.ADVANCED ? + 39 : 33); + int xDistance = tileEntity.tier == FactoryTier.BASIC ? 38 : (tileEntity.tier == FactoryTier.ADVANCED ? + 26 : 19); + + for(int i = 0; i < tileEntity.tier.processes; i++) { - for(int i = 0; i < tileEntity.tier.processes; i++) - { - int xPos = 59 + (i*38); + int xPos = xOffset + (i*xDistance); - displayInt = tileEntity.getScaledProgress(20, i); - drawTexturedModalRect(guiWidth + xPos, guiHeight + 33, 176, 52, 8, displayInt); - } - } - else if(tileEntity.tier == FactoryTier.ADVANCED) - { - for(int i = 0; i < tileEntity.tier.processes; i++) - { - int xPos = 39 + (i*26); - - displayInt = tileEntity.getScaledProgress(20, i); - drawTexturedModalRect(guiWidth + xPos, guiHeight + 33, 176, 52, 8, displayInt); - } - } - else if(tileEntity.tier == FactoryTier.ELITE) - { - for(int i = 0; i < tileEntity.tier.processes; i++) - { - int xPos = 33 + (i*19); - - displayInt = tileEntity.getScaledProgress(20, i); - drawTexturedModalRect(guiWidth + xPos, guiHeight + 33, 176, 52, 8, displayInt); - } + displayInt = tileEntity.getScaledProgress(20, i); + drawTexturedModalRect(guiWidth + xPos, guiHeight + 33, 176, 52, 8, displayInt); } - if(tileEntity.getScaledGasLevel(160) > 0) + if(tileEntity.recipeType.usesFuel()) { - displayGauge(8, 78, tileEntity.getScaledGasLevel(160), 5, tileEntity.gasTank.getGas()); + if(tileEntity.getScaledGasLevel(160) > 0) + { + displayGauge(8, 78, tileEntity.getScaledGasLevel(160), 5, tileEntity.gasTank.getGas().getGas().getIcon()); + } + } + else if(tileEntity.recipeType == RecipeType.INFUSING) + { + if(tileEntity.getScaledInfuseLevel(160) > 0) + { + displayGauge(8, 78, tileEntity.getScaledInfuseLevel(160), 5, tileEntity.infuseStored.type.icon); + } } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } - public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, GasStack gas) + public void displayGauge(int xPos, int yPos, int sizeX, int sizeY, IIcon icon) { - if(gas == null) + if(icon == null) { return; } @@ -142,6 +150,32 @@ public class GuiFactory extends GuiMekanism int guiHeight = (height - ySize) / 2; mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); - drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos, gas.getGas().getIcon(), sizeX, sizeY); + drawTexturedModelRectFromIcon(guiWidth + xPos, guiHeight + yPos, icon, sizeX, sizeY); + } + + @Override + protected void mouseClicked(int x, int y, int button) + { + super.mouseClicked(x, y, button); + + if(button == 0 || Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + { + int xAxis = (x - (width - xSize) / 2); + int yAxis = (y - (height - ySize) / 2); + + if(xAxis > 8 && xAxis < 168 && yAxis > 78 && yAxis < 83) + { + ItemStack stack = mc.thePlayer.inventory.getItemStack(); + + if(stack != null && stack.getItem() instanceof ItemGaugeDropper) + { + ArrayList data = new ArrayList(); + data.add(1); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + SoundHandler.playSound("gui.button.press"); + } + } + } } } diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index f95cacdcc..efa133615 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -9,15 +9,16 @@ import mekanism.client.gui.element.GuiEnergyInfo; import mekanism.client.gui.element.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiRedstoneControl; import mekanism.client.gui.element.GuiSideConfigurationTab; import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.client.gui.element.GuiTransporterConfigTab; import mekanism.client.gui.element.GuiUpgradeTab; +import mekanism.client.render.MekanismRenderer; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerMetallurgicInfuser; @@ -100,9 +101,9 @@ public class GuiMetallurgicInfuser extends GuiMekanism if(tileEntity.infuseStored.type != null) { + mc.renderEngine.bindTexture(MekanismRenderer.getBlocksTexture()); int displayInt = tileEntity.getScaledInfuseLevel(52); - mc.renderEngine.bindTexture(tileEntity.infuseStored.type.texture); - drawTexturedModalRect(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.infuseStored.type.texX, tileEntity.infuseStored.type.texY + 52 - displayInt, 4, displayInt); + drawTexturedRectFromIcon(guiWidth + 7, guiHeight + 17 + 52 - displayInt, tileEntity.infuseStored.type.icon, 4, displayInt); } super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java index 4bb26edad..f8053382e 100644 --- a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java @@ -1,6 +1,9 @@ package mekanism.client.nei; -import java.awt.*; +import static codechicken.lib.gui.GuiDraw.changeTexture; +import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; + +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -12,13 +15,14 @@ import mekanism.api.infuse.InfuseType; import mekanism.client.gui.GuiMetallurgicInfuser; import mekanism.client.gui.element.GuiElement; import mekanism.client.gui.element.GuiPowerBar; -import mekanism.client.gui.element.GuiProgress; -import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiPowerBar.IPowerInfoHandler; +import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; import mekanism.client.gui.element.GuiSlot.SlotOverlay; import mekanism.client.gui.element.GuiSlot.SlotType; +import mekanism.client.render.MekanismRenderer; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.util.LangUtils; @@ -31,8 +35,6 @@ import org.lwjgl.opengl.GL11; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import static codechicken.lib.gui.GuiDraw.changeTexture; -import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler { @@ -132,8 +134,9 @@ public class MetallurgicInfuserRecipeHandler extends BaseRecipeHandler float f = ticksPassed >= 20 && ticksPassed < 40 ? (ticksPassed - 20) % 20 / 20.0F : 1.0F; if(ticksPassed < 20) f = 0.0F; - changeTexture(type.texture); - drawProgressBar(2, 2, type.texX, type.texY, 4, 52, f, 3); + int display = (int)(52F*f); + changeTexture(MekanismRenderer.getBlocksTexture()); + drawTexturedRectFromIcon(2, 2+52-display, type.icon, 4, display); } @Override diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 6e1356a3e..030d6a095 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -10,6 +10,8 @@ import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.OreGas; +import mekanism.api.infuse.InfuseRegistry; +import mekanism.api.infuse.InfuseType; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.tileentity.RenderConfigurableMachine; import mekanism.client.render.tileentity.RenderDynamicTank; diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java deleted file mode 100644 index ea77255a9..000000000 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.common; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; - -public final class ItemAttacher -{ - private static final List attachable = new ArrayList(); - - static - { - attachable.add(new ItemStack(Blocks.lever)); - -/*TODO put this back - for(TransmitterType type : TransmitterType.values()) - { - attachable.add(new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal())); - } -*/ - } - - public static boolean canAttach(ItemStack itemStack) - { - if(itemStack == null) - { - return false; - } - - for(ItemStack stack : attachable) - { - if(stack.isItemEqual(itemStack)) - { - return true; - } - } - - return false; - } -} diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 7c9b47900..527c44205 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -81,7 +81,6 @@ import mekanism.common.tile.TileEntitySolarEvaporationValve; import mekanism.common.tile.TileEntityThermoelectricBoiler; import mekanism.common.tile.TileEntityThermoelectricValve; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; import net.minecraft.entity.EnumCreatureType; @@ -1196,13 +1195,13 @@ public class Mekanism MekanismBlocks.register(); //Register infuses - InfuseRegistry.registerInfuseType(new InfuseType("CARBON", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 0, 0).setUnlocalizedName("infuse.carbon")); - InfuseRegistry.registerInfuseType(new InfuseType("TIN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 4, 0).setUnlocalizedName("infuse.tin")); - InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 8, 0).setUnlocalizedName("infuse.diamond")); - InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 16, 0).setUnlocalizedName("infuse.redstone")); - InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 20, 0).setUnlocalizedName("infuse.fungi")); - InfuseRegistry.registerInfuseType(new InfuseType("BIO", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 12, 0).setUnlocalizedName("infuse.bio")); - InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", MekanismUtils.getResource(ResourceType.INFUSE, "Infusions.png"), 24, 0).setUnlocalizedName("infuse.obsidian")); + InfuseRegistry.registerInfuseType(new InfuseType("CARBON", "mekanism:infuse/Carbon").setUnlocalizedName("carbon")); + InfuseRegistry.registerInfuseType(new InfuseType("TIN", "mekanism:infuse/Tin").setUnlocalizedName("tin")); + InfuseRegistry.registerInfuseType(new InfuseType("DIAMOND", "mekanism:infuse/Diamond").setUnlocalizedName("diamond")); + InfuseRegistry.registerInfuseType(new InfuseType("REDSTONE", "mekanism:infuse/Redstone").setUnlocalizedName("redstone")); + InfuseRegistry.registerInfuseType(new InfuseType("FUNGI", "mekanism:infuse/Fungi").setUnlocalizedName("fungi")); + InfuseRegistry.registerInfuseType(new InfuseType("BIO", "mekanism:infuse/Bio").setUnlocalizedName("bio")); + InfuseRegistry.registerInfuseType(new InfuseType("OBSIDIAN", "mekanism:infuse/Obsidian").setUnlocalizedName("obsidian")); } @EventHandler diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 6816d2769..88b77665c 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -5,15 +5,16 @@ import java.util.Map; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.util.StackUtils; -import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.InfuseStorage; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.recipe.inputs.AdvancedMachineInput; +import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.inputs.ItemStackInput; import mekanism.common.recipe.machines.AdvancedMachineRecipe; import mekanism.common.recipe.machines.BasicMachineRecipe; import mekanism.common.recipe.machines.MachineRecipe; +import mekanism.common.recipe.machines.MetallurgicInfuserRecipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.LangUtils; import net.minecraft.block.Block; @@ -21,6 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; +import static mekanism.common.block.states.BlockStateMachine.MachineType; + /** * Internal interface for managing various Factory types. * @author AidanBrady @@ -44,13 +47,14 @@ public interface IFactory public static enum RecipeType { - SMELTING("Smelting", "smelter", BlockStateMachine.MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), - ENRICHING("Enriching", "enrichment", BlockStateMachine.MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), - CRUSHING("Crushing", "crusher", BlockStateMachine.MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), - COMPRESSING("Compressing", "compressor", BlockStateMachine.MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), - COMBINING("Combining", "combiner", BlockStateMachine.MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), - PURIFYING("Purifying", "purifier", BlockStateMachine.MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), - INJECTING("Injecting", "injection", BlockStateMachine.MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER); + SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), + ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), + CRUSHING("Crushing", "crusher", MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), + COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), + COMBINING("Combining", "combiner", MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), + PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), + INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER), + INFUSING("Infusing", "metalinfuser", MachineType.METALLURGIC_INFUSER.getStack(), false, false, Recipe.METALLURGIC_INFUSER); private String name; private ResourceLocation sound; @@ -79,13 +83,27 @@ public interface IFactory { return getRecipe(new AdvancedMachineInput(input, gas)); } + + public MetallurgicInfuserRecipe getRecipe(InfusionInput input) + { + return RecipeHandler.getMetallurgicInfuserRecipe(input); + } + + public MetallurgicInfuserRecipe getRecipe(ItemStack input, InfuseStorage storage) + { + return getRecipe(new InfusionInput(storage, input)); + } - public MachineRecipe getAnyRecipe(ItemStack slotStack, Gas gasType) + public MachineRecipe getAnyRecipe(ItemStack slotStack, Gas gasType, InfuseStorage infuse) { if(usesFuel()) { return getRecipe(slotStack, gasType); } + else if(this == INFUSING) + { + return getRecipe(slotStack, infuse); + } return getRecipe(slotStack); } @@ -169,7 +187,7 @@ public interface IFactory { if(cacheTile == null) { - MachineType type = BlockStateMachine.MachineType.get(Block.getBlockFromItem(getStack().getItem()), getStack().getItemDamage()); + MachineType type = MachineType.get(Block.getBlockFromItem(getStack().getItem()), getStack().getItemDamage()); cacheTile = (TileEntityAdvancedElectricMachine)type.create(); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 213a7821c..fd7891ed1 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -5,7 +5,6 @@ import java.util.Random; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.Tier.BaseTier; import mekanism.common.base.IActiveState; @@ -486,14 +485,6 @@ public abstract class BlockBasic extends Block//TODO? implements IBlockCTM, ICus if(getBasicBlock() == BasicBlock.BASIC_BLOCK_1) { - if(metadata != 6) - { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - } - if(metadata == 2) { if(entityplayer.isSneaking()) diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 3fa7f3f63..faa800a1d 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -4,7 +4,6 @@ import buildcraft.api.tools.IToolWrench; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import mekanism.api.energy.IEnergizedItem; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; @@ -32,10 +31,10 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; - -import java.util.List; -import java.util.Random; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple energy cube block IDs. @@ -142,11 +141,6 @@ public class BlockEnergyCube extends BlockContainer @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 66ede39df..688b2f6e7 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -3,14 +3,12 @@ package mekanism.common.block; import java.util.Random; import mekanism.api.gas.IGasItem; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; import mekanism.common.base.ISustainedInventory; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,12 +24,14 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.common.ModAPIManager; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.common.util.ForgeDirection; +import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import buildcraft.api.tools.IToolWrench; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockGasTank extends BlockContainer { @@ -90,11 +90,6 @@ public class BlockGasTank extends BlockContainer @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c7477cf41..177171d6c 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -9,7 +9,6 @@ import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBoundingBlock; @@ -564,11 +563,6 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou @Override public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer entityplayer, EnumFacing side, float hitX, float hitY, float hitZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java index f7e5cd4ac..c0fb7bc6c 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFactory.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFactory.java @@ -1,5 +1,6 @@ package mekanism.common.inventory.container; +import mekanism.api.infuse.InfuseRegistry; import mekanism.common.Tier; import mekanism.common.Tier.FactoryTier; import mekanism.common.base.IFactory.RecipeType; @@ -8,7 +9,6 @@ import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.item.ItemBlockMachine; import mekanism.common.tile.TileEntityFactory; import mekanism.common.util.ChargeUtils; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -143,7 +143,7 @@ public class ContainerFactory extends Container return null; } } - else if(tileEntity.recipeType.getAnyRecipe(slotStack, tileEntity.gasTank.getGasType()) != null) + else if(tileEntity.recipeType.getAnyRecipe(slotStack, tileEntity.gasTank.getGasType(), tileEntity.infuseStored) != null) { if(!isInputSlot(slotID)) { @@ -192,6 +192,25 @@ public class ContainerFactory extends Container } } } + else if(tileEntity.recipeType == RecipeType.INFUSING) + { + if(InfuseRegistry.getObject(slotStack) != null && (tileEntity.infuseStored.type == null || tileEntity.infuseStored.type == InfuseRegistry.getObject(slotStack).type)) + { + if(slotID > tileEntity.inventory.length-1) + { + if(!mergeItemStack(slotStack, 3, 4, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, tileEntity.inventory.length-1, inventorySlots.size(), true)) + { + return null; + } + } + } + } else { int slotEnd = tileEntity.inventory.length-1; diff --git a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java index 2b1fcb54a..d043064d5 100644 --- a/src/main/java/mekanism/common/item/ItemFactoryInstaller.java +++ b/src/main/java/mekanism/common/item/ItemFactoryInstaller.java @@ -7,6 +7,7 @@ import mekanism.common.tile.TileEntityAdvancedElectricMachine; 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.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -97,6 +98,17 @@ public class ItemFactoryInstaller extends ItemMekanism stack.stackSize = 0; } + return true; + } + else if(tile instanceof TileEntityMetallurgicInfuser) + { + ((TileEntityMetallurgicInfuser)tile).upgrade(type); + + if(!player.capabilities.isCreativeMode) + { + stack.stackSize = 0; + } + return true; } } diff --git a/src/main/java/mekanism/common/recipe/machines/MetallurgicInfuserRecipe.java b/src/main/java/mekanism/common/recipe/machines/MetallurgicInfuserRecipe.java index 27180eefb..a13d69fab 100644 --- a/src/main/java/mekanism/common/recipe/machines/MetallurgicInfuserRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/MetallurgicInfuserRecipe.java @@ -3,7 +3,6 @@ package mekanism.common.recipe.machines; import mekanism.common.InfuseStorage; import mekanism.common.recipe.inputs.InfusionInput; import mekanism.common.recipe.outputs.ItemStackOutput; - import net.minecraft.item.ItemStack; public class MetallurgicInfuserRecipe extends MachineRecipe @@ -18,9 +17,9 @@ public class MetallurgicInfuserRecipe extends MachineRecipe> extends TileEntityBasicMachine { /** @@ -73,7 +77,6 @@ public abstract class TileEntityElectricMachine 0) + if(inventory[4] != null) { - if(inventory[4].getItem() instanceof IGasItem) + if(recipeType.usesFuel() && gasTank.getNeeded() > 0) { - GasStack gas = ((IGasItem)inventory[4].getItem()).getGas(inventory[4]); - - if(gas != null && recipeType.isValidGas(gas.getGas())) + if(inventory[4].getItem() instanceof IGasItem) { - GasStack removed = GasTransmission.removeGas(inventory[4], gasTank.getGasType(), gasTank.getNeeded()); - gasTank.receive(removed, true); + GasStack gas = ((IGasItem)inventory[4].getItem()).getGas(inventory[4]); + + if(gas != null && recipeType.isValidGas(gas.getGas())) + { + GasStack removed = GasTransmission.removeGas(inventory[4], gasTank.getGasType(), gasTank.getNeeded()); + gasTank.receive(removed, true); + } + + return; } - - return; - } - - GasStack stack = recipeType.getItemGas(inventory[4]); - int gasNeeded = gasTank.getNeeded(); - - if(stack != null && stack.amount <= gasNeeded) - { - gasTank.receive(stack, true); - - inventory[4].stackSize--; - - if(inventory[4].stackSize == 0) + + GasStack stack = recipeType.getItemGas(inventory[4]); + int gasNeeded = gasTank.getNeeded(); + + if(stack != null && stack.amount <= gasNeeded) { - inventory[4] = null; + gasTank.receive(stack, true); + + inventory[4].stackSize--; + + if(inventory[4].stackSize == 0) + { + inventory[4] = null; + } + } + } + else if(recipeType == RecipeType.INFUSING) + { + if(InfuseRegistry.getObject(inventory[4]) != null) + { + InfuseObject infuse = InfuseRegistry.getObject(inventory[4]); + + if(infuseStored.type == null || infuseStored.type == infuse.type) + { + if(infuseStored.amount + infuse.stored <= maxInfuse) + { + infuseStored.amount += infuse.stored; + infuseStored.type = infuse.type; + inventory[4].stackSize--; + + if(inventory[4].stackSize <= 0) + { + inventory[4] = null; + } + } + } } } } @@ -535,7 +581,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } else if(slotID >= 5 && slotID <= 7) { - return recipeType.getAnyRecipe(itemstack, gasTank.getGasType()) != null; + return recipeType.getAnyRecipe(itemstack, gasTank.getGasType(), infuseStored) != null; } } else if(tier == FactoryTier.ADVANCED) @@ -546,7 +592,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } else if(slotID >= 5 && slotID <= 9) { - return recipeType.getAnyRecipe(itemstack, gasTank.getGasType()) != null; + return recipeType.getAnyRecipe(itemstack, gasTank.getGasType(), infuseStored) != null; } } else if(tier == FactoryTier.ELITE) @@ -557,7 +603,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } else if(slotID >= 5 && slotID <= 11) { - return recipeType.getAnyRecipe(itemstack, gasTank.getGasType()) != null; + return recipeType.getAnyRecipe(itemstack, gasTank.getGasType(), infuseStored) != null; } } @@ -571,7 +617,31 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I } else if(slotID == 4) { - return recipeType.getItemGas(itemstack) != null; + if(recipeType.usesFuel()) + { + return recipeType.getItemGas(itemstack) != null; + } + else if(recipeType == RecipeType.INFUSING) + { + if(infuseStored.type != null) + { + if(RecipeHandler.getMetallurgicInfuserRecipe(new InfusionInput(infuseStored, itemstack)) != null) + { + return true; + } + } + else { + for(Object obj : Recipe.METALLURGIC_INFUSER.get().keySet()) + { + InfusionInput input = (InfusionInput)obj; + + if(input.inputStack.isItemEqual(itemstack)) + { + return true; + } + } + } + } } return false; @@ -581,6 +651,11 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { return progress[process]*i / ticksRequired; } + + public int getScaledInfuseLevel(int i) + { + return infuseStored.amount * i / maxInfuse; + } public int getScaledGasLevel(int i) { @@ -606,6 +681,19 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I return recipe != null && recipe.canOperate(inventory, inputSlot, outputSlot, gasTank, secondaryEnergyThisTick); } + + if(recipeType == RecipeType.INFUSING) + { + InfusionInput input = new InfusionInput(infuseStored, inventory[inputSlot]); + MetallurgicInfuserRecipe recipe = RecipeHandler.getMetallurgicInfuserRecipe(input); + + if(recipe == null) + { + return false; + } + + return recipe.canOperate(inventory, inputSlot, outputSlot, infuseStored); + } BasicMachineRecipe recipe = recipeType.getRecipe(inventory[inputSlot]); @@ -626,6 +714,13 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I recipe.operate(inventory, inputSlot, outputSlot, gasTank, secondaryEnergyThisTick); } + else if(recipeType == RecipeType.INFUSING) + { + InfusionInput input = new InfusionInput(infuseStored, inventory[inputSlot]); + MetallurgicInfuserRecipe recipe = RecipeHandler.getMetallurgicInfuserRecipe(input); + + recipe.output(inventory, inputSlot, outputSlot, infuseStored); + } else { BasicMachineRecipe recipe = recipeType.getRecipe(inventory[inputSlot]); @@ -647,6 +742,12 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I { sorting = !sorting; } + else if(type == 1) + { + gasTank.setGas(null); + infuseStored.amount = 0; + infuseStored.type = null; + } return; } @@ -667,6 +768,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I controlType = RedstoneControl.values()[dataStream.readInt()]; sorting = dataStream.readBoolean(); upgraded = dataStream.readBoolean(); + infuseStored.amount = dataStream.readInt(); + infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream)); for(int i = 0; i < tier.processes; i++) { @@ -714,6 +817,8 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I recipeTicks = nbtTags.getInteger("recipeTicks"); controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; sorting = nbtTags.getBoolean("sorting"); + infuseStored.amount = nbtTags.getInteger("infuseStored"); + infuseStored.type = InfuseRegistry.get(nbtTags.getString("type")); for(int i = 0; i < tier.processes; i++) { @@ -733,6 +838,15 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I nbtTags.setInteger("recipeTicks", recipeTicks); nbtTags.setInteger("controlType", controlType.ordinal()); nbtTags.setBoolean("sorting", sorting); + nbtTags.setInteger("infuseStored", infuseStored.amount); + + if(infuseStored.type != null) + { + nbtTags.setString("type", infuseStored.type.name); + } + else { + nbtTags.setString("type", "null"); + } for(int i = 0; i < tier.processes; i++) { @@ -753,6 +867,16 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I data.add(controlType); data.add(sorting); data.add(upgraded); + data.add(infuseStored.amount); + + if(infuseStored.type != null) + { + data.add(infuseStored.type.name); + } + else { + data.add("null"); + } + data.add(progress); if(gasTank.getGas() != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 31717fe1a..46a2def00 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -15,11 +15,13 @@ import mekanism.api.infuse.InfuseRegistry; import mekanism.api.transmitters.TransmissionType; import mekanism.common.InfuseStorage; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.Upgrade; import mekanism.common.base.IEjector; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.IRedstoneControl; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; @@ -193,6 +195,61 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i } } + public void upgrade(RecipeType type) + { + worldObj.setBlockToAir(xCoord, yCoord, zCoord); + worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5, 3); + + TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(xCoord, yCoord, zCoord); + + //Basic + factory.facing = facing; + factory.clientFacing = clientFacing; + factory.ticker = ticker; + factory.redstone = redstone; + factory.redstoneLastTick = redstoneLastTick; + factory.doAutoSync = doAutoSync; + + //Electric + factory.electricityStored = electricityStored; + + //Noisy + factory.soundURL = soundURL; + + //Machine + factory.progress[0] = operatingTicks; + factory.clientActive = clientActive; + factory.isActive = isActive; + factory.updateDelay = updateDelay; + factory.controlType = controlType; + factory.prevEnergy = prevEnergy; + factory.upgradeComponent.readFrom(upgradeComponent); + factory.upgradeComponent.setUpgradeSlot(0); + factory.ejectorComponent.readFrom(ejectorComponent); + factory.ejectorComponent.setOutputData(TransmissionType.ITEM, factory.configComponent.getOutputs(TransmissionType.ITEM).get(4)); + factory.recipeType = type; + factory.upgradeComponent.setSupported(Upgrade.GAS, type.fuelEnergyUpgrades()); + + //Infuser + factory.infuseStored.amount = infuseStored.amount; + factory.infuseStored.type = infuseStored.type; + + factory.inventory[5] = inventory[2]; + factory.inventory[1] = inventory[4]; + factory.inventory[5+3] = inventory[3]; + factory.inventory[0] = inventory[0]; + factory.inventory[4] = inventory[1]; + + for(Upgrade upgrade : factory.upgradeComponent.getSupportedTypes()) + { + factory.recalculateUpgradables(upgrade); + } + + factory.upgraded = true; + + factory.markDirty(); + } + @Override public EnumSet getConsumingSides() { @@ -265,7 +322,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i public void operate(MetallurgicInfuserRecipe recipe) { - recipe.output(inventory, infuseStored); + recipe.output(inventory, 2, 3, infuseStored); markDirty(); ejectorComponent.outputItems(); @@ -273,7 +330,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i public boolean canOperate(MetallurgicInfuserRecipe recipe) { - return recipe != null && recipe.canOperate(inventory, infuseStored); + return recipe != null && recipe.canOperate(inventory, 2, 3, infuseStored); } public int getScaledInfuseLevel(int i) diff --git a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java index 13f1fb1a5..ddf4f5aac 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiIndustrialTurbine.java @@ -1,5 +1,6 @@ package mekanism.generators.client.gui; +import mekanism.api.MekanismConfig.generators; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.element.GuiPowerBar; import mekanism.client.gui.element.GuiRateBar; @@ -42,8 +43,8 @@ public class GuiIndustrialTurbine extends GuiMekanism @Override public double getLevel() { - double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); - rate = Math.min(rate, tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW); + double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); + rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); return (double)tileEntity.structure.lastSteamInput/rate; } @@ -58,10 +59,10 @@ public class GuiIndustrialTurbine extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 5, 0x404040); - double energyMultiplier = TileEntityTurbineCasing.ENERGY_PER_STEAM*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*TileEntityTurbineCasing.BLADE_TO_COIL_RATIO); + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); - double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); - rate = Math.min(rate, tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW); + double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); + rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); renderScaledText(LangUtils.localize("gui.production") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.structure.clientFlow*energyMultiplier), 53, 26, 0x00CD00, 106); renderScaledText(LangUtils.localize("gui.flowRate") + ": " + tileEntity.structure.clientFlow + " mB/t", 53, 35, 0x00CD00, 106); diff --git a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java index 2ca5e6685..f6337b51c 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java +++ b/src/main/java/mekanism/generators/client/gui/GuiTurbineStats.java @@ -1,6 +1,7 @@ package mekanism.generators.client.gui; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.generators; import mekanism.client.gui.GuiMekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.LangUtils; @@ -41,10 +42,10 @@ public class GuiTurbineStats extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.tankVolume") + ": " + tileEntity.structure.lowerVolume, 8, 26, 0x404040); - boolean dispersersLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW < - tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW; - boolean ventsLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW > - tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW; + boolean dispersersLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow < + tileEntity.structure.vents*generators.turbineVentGasFlow; + boolean ventsLimiting = tileEntity.structure.lowerVolume*tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow > + tileEntity.structure.vents*generators.turbineVentGasFlow; fontRendererObj.drawString(LangUtils.localize("gui.steamFlow"), 8, 40, 0x797979); fontRendererObj.drawString(LangUtils.localize("gui.dispersers") + ": " + tileEntity.structure.clientDispersers + (dispersersLimiting ? limiting : ""), 14, 49, 0x404040); @@ -57,9 +58,9 @@ public class GuiTurbineStats extends GuiMekanism fontRendererObj.drawString(LangUtils.localize("gui.blades") + ": " + tileEntity.structure.blades + (bladesLimiting ? limiting : ""), 14, 81, 0x404040); fontRendererObj.drawString(LangUtils.localize("gui.coils") + ": " + tileEntity.structure.coils + (coilsLimiting ? limiting : ""), 14, 90, 0x404040); - double energyMultiplier = TileEntityTurbineCasing.ENERGY_PER_STEAM*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*TileEntityTurbineCasing.BLADE_TO_COIL_RATIO); - double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*TileEntityTurbineCasing.DISPERSER_GAS_FLOW); - rate = Math.min(rate, tileEntity.structure.vents*TileEntityTurbineCasing.VENT_GAS_FLOW); + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(tileEntity.structure.blades, tileEntity.structure.coils*generators.turbineBladesPerCoil); + double rate = tileEntity.structure.lowerVolume*(tileEntity.structure.clientDispersers*generators.turbineDisperserGasFlow); + rate = Math.min(rate, tileEntity.structure.vents*generators.turbineVentGasFlow); fontRendererObj.drawString(LangUtils.localize("gui.maxProduction") + ": " + MekanismUtils.getEnergyDisplay(rate*energyMultiplier), 8, 104, 0x404040); diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 92ddd35e4..4cbc98ddc 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -92,14 +92,19 @@ public class GeneratorsCommonProxy implements IGuiProvider */ public void loadConfiguration() { - generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); - generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D); - generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); - generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble(5D); - generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble(100D); - generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D); + generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(); + generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(); + generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(); + generators.heatGenerationLava = Mekanism.configuration.get("generation", "HeatGenerationLava", 5D).getDouble(); + generators.heatGenerationNether = Mekanism.configuration.get("generation", "HeatGenerationNether", 100D).getDouble(); + generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(); loadWindConfiguration(); + + generators.turbineBladesPerCoil = Mekanism.configuration.get("generation", "TurbineBladesPerCoil", 4).getInt(); + generators.turbineBaseEnergyPerSteam = Mekanism.configuration.get("generation", "TurbineBaseEnergyPerSteam", 10D).getDouble(); + generators.turbineVentGasFlow = Mekanism.configuration.get("generation", "TurbineVentGasFlow", 16000D).getDouble(); + generators.turbineDisperserGasFlow = Mekanism.configuration.get("generation", "TurbineDisperserGasFlow", 640D).getDouble(); if(Mekanism.configuration.hasChanged()) { @@ -109,24 +114,12 @@ public class GeneratorsCommonProxy implements IGuiProvider private void loadWindConfiguration() { - if(Mekanism.configuration.hasKey("generation", "WindGeneration")) - { - //Migrate the old wind generation config - final double legacyWindGeneration = Mekanism.configuration.get("generation", "WindGeneration", 60D).getDouble(60D); - final double windGenerationMax = legacyWindGeneration * 8D; - Mekanism.configuration.getCategory("generation").remove("WindGeneration"); - - generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", legacyWindGeneration).getDouble(legacyWindGeneration); - generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", windGenerationMax).getDouble(windGenerationMax); - } - else { - generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble(60D); - generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble(480D); - } + generators.windGenerationMin = Mekanism.configuration.get("generation", "WindGenerationMin", 60D).getDouble(); + generators.windGenerationMax = Mekanism.configuration.get("generation", "WindGenerationMax", 480D).getDouble(); //Ensure max > min to avoid division by zero later - final int minY = Mekanism.configuration.get("generation", "WindGenerationMinY", 24).getInt(24); - final int maxY = Mekanism.configuration.get("generation", "WindGenerationMaxY", 255).getInt(255); + final int minY = Mekanism.configuration.get("generation", "WindGenerationMinY", 24).getInt(); + final int maxY = Mekanism.configuration.get("generation", "WindGenerationMaxY", 255).getInt(); generators.windGenerationMinY = minY; generators.windGenerationMaxY = Math.max(minY + 1, maxY); diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index cd84c829f..af01b744f 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -7,7 +7,6 @@ import java.util.Random; import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IActiveState; import mekanism.common.base.IBlockCTM; @@ -415,11 +414,6 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int side, float playerX, float playerY, float playerZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index a42f47b50..6586bd97c 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -5,7 +5,6 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.common.CTMData; -import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.base.IBlockCTM; import mekanism.common.tile.TileEntityBasicBlock; @@ -159,11 +158,6 @@ public class BlockReactor extends BlockContainer implements IBlockCTM @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityplayer, int facing, float playerX, float playerY, float playerZ) { - if(ItemAttacher.canAttach(entityplayer.getCurrentEquippedItem())) - { - return false; - } - if(world.isRemote) { return true; diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java index 0ec8c955f..78e1adc09 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineCasing.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.generators; import mekanism.api.Range4D; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.common.Mekanism; @@ -26,11 +27,6 @@ import net.minecraftforge.fluids.FluidStack; public class TileEntityTurbineCasing extends TileEntityMultiblock implements IStrictEnergyStorage { - public static final double DISPERSER_GAS_FLOW = 640; - public static final double VENT_GAS_FLOW = 16000; - public static final double ENERGY_PER_STEAM = 10; - public static final double BLADE_TO_COIL_RATIO = 4; - public float prevScale; public TileEntityTurbineCasing() @@ -82,9 +78,9 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock 0 && getEnergy() < structure.getEnergyCapacity()) { - double energyMultiplier = ENERGY_PER_STEAM*Math.min(structure.blades, structure.coils*BLADE_TO_COIL_RATIO); - double rate = structure.lowerVolume*(structure.getDispersers()*DISPERSER_GAS_FLOW); - rate = Math.min(rate, structure.vents*VENT_GAS_FLOW); + double energyMultiplier = generators.turbineBaseEnergyPerSteam*Math.min(structure.blades, structure.coils*generators.turbineBladesPerCoil); + double rate = structure.lowerVolume*(structure.getDispersers()*generators.turbineDisperserGasFlow); + rate = Math.min(rate, structure.vents*generators.turbineVentGasFlow); double origRate = rate; diff --git a/src/main/resources/assets/mekanism/infuse/Infusions.png b/src/main/resources/assets/mekanism/infuse/Infusions.png deleted file mode 100644 index 70ef32dfd..000000000 Binary files a/src/main/resources/assets/mekanism/infuse/Infusions.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 949c75867..51383001d 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -532,6 +532,7 @@ gui.factory.Compressing=Compressing gui.factory.Combining=Combining gui.factory.Purifying=Purifying gui.factory.Injecting=Injecting +gui.factory.Infusing=Infusing gui.seismicReader.short=S. Reader gui.seismicReader.solids=Solids diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Bio.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Bio.png new file mode 100644 index 000000000..a4cc3c8b8 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Bio.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Carbon.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Carbon.png new file mode 100644 index 000000000..4c8dc5d09 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Carbon.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Diamond.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Diamond.png new file mode 100644 index 000000000..ebe63955b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Diamond.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Fungi.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Fungi.png new file mode 100644 index 000000000..af57ed1e4 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Fungi.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Obsidian.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Obsidian.png new file mode 100644 index 000000000..11d90098b Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Obsidian.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Redstone.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Redstone.png new file mode 100644 index 000000000..9038a2101 Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Redstone.png differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/infuse/Tin.png b/src/main/resources/assets/mekanism/textures/blocks/infuse/Tin.png new file mode 100644 index 000000000..689987bed Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/blocks/infuse/Tin.png differ