From 7aa2617a9643d76c0a0b5e639422b6b2dc4c7fb7 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 1 Sep 2014 20:17:55 +0100 Subject: [PATCH 01/11] Continue the attempting to be killing the bug with the fire... --- src/main/java/mekanism/common/FluidNetwork.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 7635d9ef7..982efc17b 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -179,7 +179,10 @@ public class FluidNetwork extends DynamicNetwork remaining--; } - fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + if(acceptorDirections.get(acceptor) != null && fluidToSend != null) + { + fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + } } } } From 999fe7719f185e50f85d496769667c0859efde38 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 1 Sep 2014 20:17:55 +0100 Subject: [PATCH 02/11] Continue the attempting to be killing the bug with the fire... --- src/main/java/mekanism/common/FluidNetwork.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 7635d9ef7..982efc17b 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -179,7 +179,10 @@ public class FluidNetwork extends DynamicNetwork remaining--; } - fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + if(acceptorDirections.get(acceptor) != null && fluidToSend != null) + { + fluidSent += acceptor.fill(acceptorDirections.get(acceptor).getOpposite(), new FluidStack(fluidToSend.fluidID, currentSending), doTransfer); + } } } } From cb1a40a13784f1ef6ad94e74cee0238ac09d4001 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 3 Sep 2014 19:25:29 +0100 Subject: [PATCH 03/11] Try and fix the mouse binding issue. --- src/main/java/mekanism/common/item/ItemBlockMachine.java | 3 ++- .../mekanism/generators/common/item/ItemBlockGenerator.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3c7e15a30..6b769a1a3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -48,6 +48,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -152,7 +153,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 83b05f678..fa8bf78cd 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -18,6 +18,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -98,7 +99,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) { From d78e16e954cd3b9a00f5278685a9c64e72f9247d Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Wed, 3 Sep 2014 19:25:29 +0100 Subject: [PATCH 04/11] Try and fix the mouse binding issue. --- src/main/java/mekanism/common/item/ItemBlockMachine.java | 3 ++- .../mekanism/generators/common/item/ItemBlockGenerator.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 3c7e15a30..6b769a1a3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -48,6 +48,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -152,7 +153,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) { diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index 83b05f678..fa8bf78cd 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -18,6 +18,7 @@ import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -98,7 +99,7 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) { list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + Keyboard.getKeyName(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) { From 3418438d6c504de10df64ddde29fc327e31f8710 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 5 Sep 2014 16:56:45 +0100 Subject: [PATCH 05/11] Update version to 7.1.1 due to Configurator ehancements. --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 ++-- .../java/mekanism/generators/common/MekanismGenerators.java | 4 ++-- src/main/java/mekanism/tools/common/MekanismTools.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.properties b/build.properties index 7001cc727..994066f1a 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ forge_version=10.13.0.1180 FMP_version=1.1.0.297 CCLIB_version=1.1.1.93 NEI_version=1.0.2.15 -mod_version=7.1.0 +mod_version=7.1.1 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index d5b224394..681c72cdc 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -159,7 +159,7 @@ import cpw.mods.fml.common.registry.GameRegistry; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "7.1.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "7.1.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:ForgeMultipart;after:BuildCraftAPI|power;after:BuildCraftAPI|tools;after:BuildCraftAPI|transport;after:IC2API;after:CoFHAPI|energy;after:ComputerCraft;after:Galacticraft API;" + "after:MineFactoryReloaded;after:MetallurgyCore;after:EnderIO;after:ExtraUtilities;after:Railcraft;after:Forestry;after:RedstoneArsenal") public class Mekanism @@ -188,7 +188,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(7, 1, 0); + public static Version versionNumber = new Version(7, 1, 1); /** Map of Teleporters */ public static Map> teleporters = new HashMap>(); diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 4fbedcbb7..b3dcf425e 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -37,7 +37,7 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "7.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "7.1.1", 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") @@ -47,7 +47,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(7, 1, 0); + public static Version versionNumber = new Version(7, 1, 1); //Items public static Item SolarPanel; diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 35bb0d094..1d48f9dcf 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -36,7 +36,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.1.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "7.1.1", 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") @@ -46,7 +46,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(7, 1, 0); + public static Version versionNumber = new Version(7, 1, 1); //Enums: Tools public static ToolMaterial toolOBSIDIAN; From c178f471f42aa8fec31c28d0eb057d81a7698d7d Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 14 Aug 2014 23:05:32 +0100 Subject: [PATCH 06/11] Cherry pick: Fix not sending tile updates Conflicts: src/main/java/mekanism/common/multipart/PartSidedPipe.java --- .../multipart/PartLogisticalTransporter.java | 2 +- .../common/multipart/PartSidedPipe.java | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index fd7281241..7dfb6b333 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -692,7 +692,7 @@ public class PartLogisticalTransporter extends PartSidedPipe implements ILogisti { TransporterUtils.incrementColor(this); refreshConnections(); - tile().notifyPartChange(this); + tile().notifyTileChange(); Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(tile()), getNetworkedData(new ArrayList())), new Range4D(Coord4D.get(tile()))); player.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.configurator.toggleColor") + ": " + (color != null ? color.getName() : EnumColor.BLACK + MekanismUtils.localize("gui.none")))); diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index d4dc9ef6a..506343139 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -464,6 +464,16 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, protected void onRefresh() {} + public void redstoneRefresh() + { + boolean nowPowered = redstoneReactive && world().isBlockIndirectlyGettingPowered(x(), y(), z()); + + if(nowPowered != redstonePowered) + { + refreshConnections(); + } + } + public void refreshConnections() { byte possibleTransmitters = getPossibleTransmitterConnections(); @@ -486,7 +496,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, onRedstoneJoin(); } - tile().notifyPartChange(this); + tile().notifyTileChange(); } } @@ -529,6 +539,12 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, refreshConnections(); } + @Override + public void onNeighborChanged() + { + redstoneRefresh(); + } + @Override public void onPartChanged(TMultiPart part) { From 83d9ecaf23a2ee8837bb058fc7c560a13c752a1e Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 11 Sep 2014 04:05:45 +0100 Subject: [PATCH 07/11] Mouse button binding fixed Also, make the extra info in tooltips use the sneak keybind. --- src/main/java/mekanism/client/MekKeyHandler.java | 6 ++++++ src/main/java/mekanism/client/MekanismKeyHandler.java | 5 +++++ .../java/mekanism/common/item/ItemBlockEnergyCube.java | 7 +++++-- .../java/mekanism/common/item/ItemBlockGasTank.java | 7 +++++-- .../java/mekanism/common/item/ItemBlockMachine.java | 10 ++++++---- src/main/java/mekanism/common/item/ItemBlockOre.java | 7 +++++-- .../mekanism/common/multipart/ItemPartTransmitter.java | 7 +++++-- .../generators/common/item/ItemBlockGenerator.java | 9 +++++---- 8 files changed, 42 insertions(+), 16 deletions(-) diff --git a/src/main/java/mekanism/client/MekKeyHandler.java b/src/main/java/mekanism/client/MekKeyHandler.java index 94bce99ec..1c0f4530d 100644 --- a/src/main/java/mekanism/client/MekKeyHandler.java +++ b/src/main/java/mekanism/client/MekKeyHandler.java @@ -46,6 +46,12 @@ public abstract class MekKeyHandler isDummy = true; } + public static boolean getIsKeyPressed(KeyBinding keyBinding) + { + int keyCode = keyBinding.getKeyCode(); + return keyCode < 0 ? Mouse.isButtonDown(keyCode + 100) : Keyboard.isKeyDown(keyCode); + } + public KeyBinding[] getKeyBindings () { return keyBindings; diff --git a/src/main/java/mekanism/client/MekanismKeyHandler.java b/src/main/java/mekanism/client/MekanismKeyHandler.java index 6e75b18cd..bce9f9070 100644 --- a/src/main/java/mekanism/client/MekanismKeyHandler.java +++ b/src/main/java/mekanism/client/MekanismKeyHandler.java @@ -1,9 +1,12 @@ package mekanism.client; import mekanism.common.util.MekanismUtils; + +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; +import org.lwjgl.input.Mouse; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; @@ -20,6 +23,8 @@ public class MekanismKeyHandler extends MekKeyHandler public static final String keybindCategory = "Mekanism"; public static KeyBinding modeSwitchKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.mode"), Keyboard.KEY_M, keybindCategory); public static KeyBinding voiceKey = new KeyBinding("Mekanism " + MekanismUtils.localize("key.voice"), Keyboard.KEY_U, keybindCategory); + public static KeyBinding sneakKey = Minecraft.getMinecraft().gameSettings.keyBindSneak; + public static KeyBinding jumpKey = Minecraft.getMinecraft().gameSettings.keyBindJump; public MekanismKeyHandler() { diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index 93e3a7446..d10825912 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -10,6 +10,8 @@ import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.Range4D; import mekanism.api.energy.IEnergizedItem; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; @@ -20,6 +22,7 @@ import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; @@ -60,9 +63,9 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); } else { list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); diff --git a/src/main/java/mekanism/common/item/ItemBlockGasTank.java b/src/main/java/mekanism/common/item/ItemBlockGasTank.java index ccc49843a..79026f003 100644 --- a/src/main/java/mekanism/common/item/ItemBlockGasTank.java +++ b/src/main/java/mekanism/common/item/ItemBlockGasTank.java @@ -7,12 +7,15 @@ import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.IGasItem; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -94,9 +97,9 @@ public class ItemBlockGasTank extends ItemBlock implements IGasItem, ISustainedI list.add(MekanismUtils.localize("tooltip.stored") + " " + gasStack.getGas().getLocalizedName() + ": " + gasStack.amount); } - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); } else { list.add(EnumColor.AQUA + MekanismUtils.localize("tooltip.inventory") + ": " + EnumColor.GREY + LangUtils.transYesNo(getInventory(itemstack) != null && getInventory(itemstack).tagCount() != 0)); diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 6b769a1a3..e6d23a12c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -12,6 +12,7 @@ import mekanism.api.EnumColor; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.api.gas.GasStack; +import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.IElectricChest; import mekanism.common.IFactory; @@ -48,6 +49,7 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -150,12 +152,12 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { MachineType type = MachineType.get(itemstack); - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } - else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) + else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { diff --git a/src/main/java/mekanism/common/item/ItemBlockOre.java b/src/main/java/mekanism/common/item/ItemBlockOre.java index 50b7c7209..2831c0bd2 100644 --- a/src/main/java/mekanism/common/item/ItemBlockOre.java +++ b/src/main/java/mekanism/common/item/ItemBlockOre.java @@ -3,8 +3,11 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; +import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -38,9 +41,9 @@ public class ItemBlockOre extends ItemBlock @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add("Hold " + EnumColor.AQUA + "shift" + EnumColor.GREY + " for details."); + list.add("Hold " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " for details."); } else { list.addAll(MekanismUtils.splitLines(MekanismUtils.localize("tooltip." + getUnlocalizedName(itemstack).replace("tile.OreBlock.", "")))); diff --git a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java index 7e032b7e2..3f126a021 100644 --- a/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/ItemPartTransmitter.java @@ -8,10 +8,13 @@ import mekanism.api.EnumColor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; +import mekanism.client.MekKeyHandler; +import mekanism.client.MekanismKeyHandler; import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.MekanismUtils; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.client.settings.GameSettings; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -85,7 +88,7 @@ public class ItemPartTransmitter extends JItemMultiPart @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { if(TransmitterType.values()[itemstack.getItemDamage()].getTransmission() == TransmissionType.ENERGY) { @@ -98,7 +101,7 @@ public class ItemPartTransmitter extends JItemMultiPart list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.pumpRate") + ": " + EnumColor.GREY + Tier.PipeTier.getTierFromMeta(itemstack.getItemDamage()).pipePullAmount + "mB/t"); } - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails")); } else { switch(itemstack.getItemDamage()) diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index fa8bf78cd..9cb20675d 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -7,6 +7,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.energy.IEnergizedItem; +import mekanism.client.MekKeyHandler; import mekanism.client.MekanismKeyHandler; import mekanism.common.ISustainedData; import mekanism.common.ISustainedInventory; @@ -96,12 +97,12 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp { GeneratorType type = GeneratorType.getFromMetadata(itemstack.getItemDamage()); - if(!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.sneakKey)) { - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + "shift" + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); - list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + "shift" + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.INDIGO + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDetails") + "."); + list.add(MekanismUtils.localize("tooltip.hold") + " " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.sneakKey.getKeyCode()) + EnumColor.GREY + " and " + EnumColor.AQUA + GameSettings.getKeyDisplayString(MekanismKeyHandler.modeSwitchKey.getKeyCode()) + EnumColor.GREY + " " + MekanismUtils.localize("tooltip.forDesc") + "."); } - else if(!Keyboard.isKeyDown(MekanismKeyHandler.modeSwitchKey.getKeyCode())) + else if(!MekKeyHandler.getIsKeyPressed(MekanismKeyHandler.modeSwitchKey)) { list.add(EnumColor.BRIGHT_GREEN + MekanismUtils.localize("tooltip.storedEnergy") + ": " + EnumColor.GREY + MekanismUtils.getEnergyDisplay(getEnergy(itemstack))); From c512d72b067789b9ed202b7d6e8526e707115bd2 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 30 Aug 2014 19:29:29 -0400 Subject: [PATCH 08/11] Increased Gas Tank's output by a factor of 16 - it now can emit 256 units of gas per tick. This should help counter the secondary energy changes. --- src/main/java/mekanism/common/tile/TileEntityGasTank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/tile/TileEntityGasTank.java b/src/main/java/mekanism/common/tile/TileEntityGasTank.java index dfde63c43..9a074d45c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityGasTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityGasTank.java @@ -32,7 +32,7 @@ public class TileEntityGasTank extends TileEntityContainerBlock implements IGasH public static final int MAX_GAS = 96000; /** How fast this tank can output gas. */ - public int output = 16; + public int output = 256; public boolean dumping; From 372705a44886d0c9a3b00bf8da092866bb719710 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 12 Sep 2014 02:06:40 +0100 Subject: [PATCH 09/11] Make energy upgrades affect fuel usage --- src/main/java/mekanism/common/util/MekanismUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index c24e13bc0..7c785ad17 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -632,7 +632,7 @@ public final class MekanismUtils */ public static int getSecondaryEnergyPerTick(IUpgradeManagement mgmt, int def) { - return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, mgmt.getSpeedMultiplier()/8.0)); + return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, (mgmt.getSpeedMultiplier()-mgmt.getEnergyMultiplier())/8.0)); } /** From 5fefe0068f670f8ec7ebae3e1f43db13941ff78c Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 13 Sep 2014 23:22:15 +0100 Subject: [PATCH 10/11] Fix saving of Gas Generator Gas Tanks. --- .../mekanism/generators/common/tile/TileEntityGasGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 881318d3e..78f08376c 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -281,7 +281,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH @Override public void writeSustainedData(ItemStack itemStack) { - if(fuelTank.getGas() != null) + if(fuelTank != null) { itemStack.stackTagCompound.setTag("fuelTank", fuelTank.write(new NBTTagCompound())); } From 930bb22b4535293f66fe9e7325cd89210ff9df4b Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sun, 14 Sep 2014 00:37:19 +0100 Subject: [PATCH 11/11] Fix the build failing. No idea what that was caused by but a ForgeGradle update did it. --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index ca949e853..2fabcc716 100644 --- a/build.gradle +++ b/build.gradle @@ -74,10 +74,10 @@ task coreJar(type: Jar) { from('etc/core') { include '*.info' - expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version + expand 'version': config.mod_version, 'mc_version': config.minecraft_version, 'fmp_version': config.FMP_version } - from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { + from zipTree(jar.outputs.getFiles().getSingleFile()).matching { exclude 'mekanism/tools/**', 'mekanism/generators/**', 'mcmod.info' } } @@ -90,7 +90,7 @@ task toolsJar(type: Jar) { expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version } - from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { + from zipTree(jar.outputs.getFiles().getSingleFile()).matching { include 'mekanism/tools/**' } } @@ -103,7 +103,7 @@ task generatorsJar(type: Jar) { expand 'version':config.mod_version,'mc_version':config.minecraft_version,'fmp_version':config.FMP_version } - from zipTree(reobf.outputs.getFiles().getSingleFile()).matching { + from zipTree(jar.outputs.getFiles().getSingleFile()).matching { include 'mekanism/generators/**' } } @@ -129,6 +129,6 @@ task releaseJars(type: Copy) { } task fullBuild(type: Delete) { - delete reobf + delete jar } fullBuild.dependsOn('releaseJars')