From a999340caf1f4a3b9626e3124c2a3ab821394379 Mon Sep 17 00:00:00 2001 From: BluSunrize Date: Sun, 15 Jul 2018 18:35:29 +0200 Subject: [PATCH] Release 84 --- changelog.json | 7 ++++--- changelog.md | 3 ++- .../common/gui/ContainerIEBase.java | 20 +++++++++++++------ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/changelog.json b/changelog.json index 0fb50465d5..b85ffb4a9a 100644 --- a/changelog.json +++ b/changelog.json @@ -9,8 +9,8 @@ "1.10.2-recommended": "0.10-58", "1.11.2-latest": "0.11-63", "1.11.2-recommended": "0.11-63", - "1.12.2-latest": "0.12-83", - "1.12.2-recommended": "0.12-83" + "1.12.2-latest": "0.12-84", + "1.12.2-recommended": "0.12-84" }, "1.8.9": { "0.8-24": "- massive shoutout to Malte for figuring out some proper wire rendering! :D\n- added compat for DenseOres (crushing/smelting) \n- fixed lanterns not emitting light\n- fixed silver bullets causing a crash\n- fixed gunpowder barrels crashing because of a duplicate datamarker\n- fixed gunpowder barrels dropping from explosions\n- fixed CokeOvens not interacting with hoppers\n- fixed wires not outputting to RF-only receivers (thanks Malte)\n- fixed connections on HV relays (thanks Malte)\n- fixed a crash caused by hammering the top/bottom of a wooden post\n- fixed the stackoverflow in sheetmetal tanks\n- fixed the themoelectric gen crashing (thanks Malte)\n- fixed the waterwheels breaking more other wheels (thanks Malte)\n- fixed textures on stone slabs (thanks Malte)", @@ -76,6 +76,7 @@ "0.12-80": "- Fixed multiblock rendering in the manual with Optifine and texture packs (Malte)\n- Fixed pre-IE-79 multiblocks not working on IE 79 (Malte)\n- Fixed FluidContainer slots not accepting empty containers (BluSunrize)\n- Fixed Villager trades for Shader bags being inverted (BluSunrize)\n- Fixed Multiblocks dropping themselves as illegal items (BluSunrize)\n- Fixed ugly high-rez textures on Engineering blocks when CTM isn't loaded (BluSunrize)\n- Translations Added/Updated: ja_jp (iceink001), zh_CN (DYColdWind)", "0.12-81": "- Added the functionality for the Faraday Suit to protect against live wiring (Malte)\n- Added the ability to use Pick Block to take a connector's wire by sneaking (BluSunrize)\n- Added Magma blocks to the list of heatsources for the Thermoelectric generator (BluSunrize)\n- Added Efficiency, Unbreaking and Mending enchantments to the Engineer's Hammer and Wirecutter (BluSunrize)\n - Made those tools take damage when used to break blocks\n- Added compatibility for Forge's update checker (Malte)\n- Added support for Forge's memory Maven repo, this makes deleting old coremod versions unnecessary in Forge 2656+ (latest) (Malte)\n- Changed fences to allow torches on top and prevent mobspawns (Malte)\n- Changed animated item models to use Item-TESRs rather than rebaking (Malte)\n - Made the Fluorescent tube to be really fancy again! (Malte)\n- Changed renderdistance config to work as described (Malte)\n- Changed the images of wiring in the manual to use up-to-date pictures and feature connectors and relays (BluSunrize)\n- Shift-clicking is no longer needed to connect wires to breaker switches etc (Malte)\n- Failed wire connection attempts no longer spam the chat (Malte)\n- Changed Thermoelectric generator to cache its output values, improving performance (BluSunrize)\n- Fixed wires being invisible when logging into a server for the first time (Malte)\n- Fixed localization for treated wood banners (Malte)\n- Fixed the mineral command not workign with Vein names that contain a space (Malte)\n- Fixed shield having a really trippy enchantment glow (Malte)\n- Fixed conveyor recipe (Malte)\n- Fixed Skyhook crashing servers (Malte)\n- Fixed lag with redstone connectors (Malte)\n- Fixed blocks somtimes taking longer to break with the hammer (Malte)\n- Fixed a divide-by-zero issue in the ExcavatorHandler for blacklisted dimensions (BluSunrize)", "0.12-82": "- Added compat for farming Hemp to ActuallyAddition's farmer (BluSunrize)\n- Fixed Wirecutter getting consumed when cutting plates (BluSunrize)\n- Fixed Alloy Kiln consuming fuelsource container items (BluSunrize)\n- Fixed uncovered FluidPipes allowing mobspawns (BluSunrize)\n- Fixed spawn interdictors (Electric Lanterns, etc) not being removed on chunk unload (codewarrior0)\n- Fixed Metal Press animations and sounds with customized recipe times (codewarrior0)\n- Fixed some potential crashes in networking and reduced packet size (JamiesWhiteShirt)\n- Fixed 'removeRecipesForInput' in Crusher Craftweaker compat not working (BluSunrize)\n- Reduced the amount of ItemStacks being copied in rendering and recipe checking (Malte)\n- Translations Added/Updated: ja_jp (iceink001), zh_CN (DYColdWind)", - "0.12-83": "- Added the Extracting Conveyor. It pulls from inventories like a Hopper (BluSunrize)\n- Added even fancier Shaders with pulsing colours and dynamic rendering. Quite open for addon devs, too! (BluSunrize)\n - Added the IKELOS shader to make use of this\n- Added maps to the vanilla Catographer which lead to Mineral Veins (BluSunrize)\n- Added a config option to disable all use of the stencil buffer for old Intel GPUs (Malte)\n- Added normal tools (Axe, Pick, Shovel, Sword) made from Steel and Treated Wood. Good durability & efficiency, iron harvest level (BluSunrize)\n- Added a new rarity, \"Masterwork\". Currently only for Shaders (grabbags gained from secret advancements) but will have more use in the future! (BluSunrize)\n- Changed ItemRouters to allow pulling as well, allowing for filtered extraction (BluSunrize)\n- Changed BlastFurnace to not start using a new piece of coke if there is nothing left to smelt (Malte)\n- Changed the Excavator's Mineral Veins to consider the chunks in a radius of two around them, to avoid duplicate veins (BluSunrize)\n- Changed Chemical Thrower to factor in player-momentum to projectiles (TeamSpen210)\n- Fixed wires sometimes leaving behind the damage sources when broken (Malte)\n- Fixed the TConstruct compat module failing (Malte)\n- Fixed Hammers and Wirecutters to be properly repairable (Malte)\n- Fixed Wirecutters to be enchantable (Malte)\n- Fixed texture and model errors being spammed (Malte)\n- Fixed dropping conveyor spawning countless fake items in certain setups (Malte)\n- Fixed conveyors causing infinite loops in rare cases (Malte)\n- Fixed a crash when breaking a connector after dying (Malte)\n- Fixed wires connected to transformers breaking when they shouldn't (Malte)\n- Fixed horizotal wires on the breaker switch (Malte)\n- Fixed crashes with the Core Sample Drill in some dimensions (Malte)\n- Fixed pipes accessing the world from wrong threads (Malte)\n- Fixed a dupe bug (Malte)\n- Fixed the skyhook for vertical wires (Malte)\n- Fixed placing blocks against pipes not working as expected (Malte)\n- Fixed the garden cloche accepting any item into the fertilizer slot (Malte)\n- Fixed the workbench creating excess items (codewarrior0)\n- Fixed obstructed connections not rendering properly in LAN worlds (JamiesWhiteShirt)\n- Fixed Razor Wire not having collision on upper wall section (TeamSpen210)\n- Fixed Arc Furnace recycling being broken (BluSunrize)\n- Fixed Squeezer and Fermenter not updating the GUI when filling buckets (BluSunrize)\n- Improved log output when a compat module fails (Malte)\n- Translations Added/Updated: ja_jp (iceink001), ru_ru (kellixon ), zh_tw (vongola12324)" + "0.12-83": "- Added the Extracting Conveyor. It pulls from inventories like a Hopper (BluSunrize)\n- Added even fancier Shaders with pulsing colours and dynamic rendering. Quite open for addon devs, too! (BluSunrize)\n - Added the IKELOS shader to make use of this\n- Added maps to the vanilla Catographer which lead to Mineral Veins (BluSunrize)\n- Added a config option to disable all use of the stencil buffer for old Intel GPUs (Malte)\n- Added normal tools (Axe, Pick, Shovel, Sword) made from Steel and Treated Wood. Good durability & efficiency, iron harvest level (BluSunrize)\n- Added a new rarity, \"Masterwork\". Currently only for Shaders (grabbags gained from secret advancements) but will have more use in the future! (BluSunrize)\n- Changed ItemRouters to allow pulling as well, allowing for filtered extraction (BluSunrize)\n- Changed BlastFurnace to not start using a new piece of coke if there is nothing left to smelt (Malte)\n- Changed the Excavator's Mineral Veins to consider the chunks in a radius of two around them, to avoid duplicate veins (BluSunrize)\n- Changed Chemical Thrower to factor in player-momentum to projectiles (TeamSpen210)\n- Fixed wires sometimes leaving behind the damage sources when broken (Malte)\n- Fixed the TConstruct compat module failing (Malte)\n- Fixed Hammers and Wirecutters to be properly repairable (Malte)\n- Fixed Wirecutters to be enchantable (Malte)\n- Fixed texture and model errors being spammed (Malte)\n- Fixed dropping conveyor spawning countless fake items in certain setups (Malte)\n- Fixed conveyors causing infinite loops in rare cases (Malte)\n- Fixed a crash when breaking a connector after dying (Malte)\n- Fixed wires connected to transformers breaking when they shouldn't (Malte)\n- Fixed horizotal wires on the breaker switch (Malte)\n- Fixed crashes with the Core Sample Drill in some dimensions (Malte)\n- Fixed pipes accessing the world from wrong threads (Malte)\n- Fixed a dupe bug (Malte)\n- Fixed the skyhook for vertical wires (Malte)\n- Fixed placing blocks against pipes not working as expected (Malte)\n- Fixed the garden cloche accepting any item into the fertilizer slot (Malte)\n- Fixed the workbench creating excess items (codewarrior0)\n- Fixed obstructed connections not rendering properly in LAN worlds (JamiesWhiteShirt)\n- Fixed Razor Wire not having collision on upper wall section (TeamSpen210)\n- Fixed Arc Furnace recycling being broken (BluSunrize)\n- Fixed Squeezer and Fermenter not updating the GUI when filling buckets (BluSunrize)\n- Improved log output when a compat module fails (Malte)\n- Translations Added/Updated: ja_jp (iceink001), ru_ru (kellixon ), zh_tw (vongola12324)", + "0.12-84": "- Changed handling of Potions in the mixer: (BluSunrize)\n - Now supports MixPredicates as well as custom brewing recipes\n - Shows properly in JEI, based on Potion output, rather than input\n - Bottling recipes are consistent, anything you can mix, you can bottle (ideally)\n - Added tooltips to Potion fluids to show which mod added the PotionType\n - Added compat for KnightMiner's Inspirations, allowing their Splash and Lingering bottles to be filled\n- Added a separate JEI Handler for Arc-Recycling (BluSunrize)\n- Added a particle trail to Minecarts that use fancy shaders (e.g. IKELOS) (BluSunrize)\n- Added the ability to pop Balloons by hitting them with a Projectile (BluSunrize)\n- Added Shader Particles to the Railgun and Drill (BluSunrize)\n- Added a \"Noise\" component to the revolver, which will make it attract nearby mobs when fired (BluSunrize)\n - Adding a bit of a stealth/survival aspect\n - Probably not super impactful in normal singleplayer, but could be fun for pack makers\n - This will play into a larger customization system for the Revolver, to be implemented in the future\n- Re-Added some shader textures that got lost in the 1.11 update (BluSunrize)\n- Changed Arc-Recycling to run in init and be overall cleaner (Malte)\n- Changed the recipe for Vacuum Tubes to use Nickel Plates (BluSunrize)\n- Fixed compatability with ActuallyAdditions and AttainedDrops (Shadows-of-Fire)\n- Fixed out-of-thread call to JEI functions causing crashes (BluSunrize)\n- Fixed depth-rendering issues in JEI handlers (BluSunrize)\n- Fixed shiftclicking on IE's containers (BluSunrize)\n- Translations Added/Updated: zh_cn (DYColdWind)" } } \ No newline at end of file diff --git a/changelog.md b/changelog.md index d0c9877d68..1d99c4a470 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -#####Version 0.12-84 +#####Version 0.12-84 - BUILT - Changed handling of Potions in the mixer: (BluSunrize) - Now supports MixPredicates as well as custom brewing recipes - Shows properly in JEI, based on Potion output, rather than input @@ -19,6 +19,7 @@ - Fixed compatability with ActuallyAdditions and AttainedDrops (Shadows-of-Fire) - Fixed out-of-thread call to JEI functions causing crashes (BluSunrize) - Fixed depth-rendering issues in JEI handlers (BluSunrize) +- Fixed shiftclicking on IE's containers (BluSunrize) - Translations Added/Updated: zh_cn (DYColdWind) #####Version 0.12-83 - BUILT diff --git a/src/main/java/blusunrize/immersiveengineering/common/gui/ContainerIEBase.java b/src/main/java/blusunrize/immersiveengineering/common/gui/ContainerIEBase.java index d32bc4efc9..42b52e95b5 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/gui/ContainerIEBase.java +++ b/src/main/java/blusunrize/immersiveengineering/common/gui/ContainerIEBase.java @@ -87,20 +87,28 @@ public ItemStack transferStackInSlot(EntityPlayer player, int slot) { ItemStack itemstack = ItemStack.EMPTY; Slot slotObject = this.inventorySlots.get(slot); - if (slotObject != null && slotObject.getHasStack()) { + if(slotObject!=null&&slotObject.getHasStack()) + { ItemStack itemstack1 = slotObject.getStack(); itemstack = itemstack1.copy(); - if (slot < slotCount) { - if (!this.mergeItemStack(itemstack1, slotCount, this.inventorySlots.size(), true)) { + if(slot < slotCount) + { + if(!this.mergeItemStack(itemstack1, slotCount, this.inventorySlots.size(), true)) + { return ItemStack.EMPTY; } - } else if (!this.mergeItemStack(itemstack1, 0, slotCount, false)) { + } + else if(!this.mergeItemStack(itemstack1, 0, slotCount, false)) + { return ItemStack.EMPTY; } - if (itemstack1.isEmpty()) { + if(itemstack1.isEmpty()) + { slotObject.putStack(ItemStack.EMPTY); - } else { + } + else + { slotObject.onSlotChanged(); } }