From 05d581c7797dbd815e62b259420c19a4ed4da919 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sat, 31 Jul 2021 12:24:28 +0200 Subject: [PATCH] Blinding transparency - Fixed goggle overlay fading into a solid colour when its custom alpha is 0 - Fixed crash rendering saws, addresses #2064 --- build.gradle | 2 +- changelog.txt | 64 ------------------- log.txt | 41 ------------ .../components/saw/SawTileEntity.java | 5 +- .../goggles/GoggleOverlayRenderer.java | 10 ++- 5 files changed, 10 insertions(+), 112 deletions(-) delete mode 100644 changelog.txt delete mode 100644 log.txt diff --git a/build.gradle b/build.gradle index 9a5dfeab0..56d6fb380 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ boolean dev = System.getenv('RELEASE') == null || System.getenv('RELEASE').equal ext.buildnumber = 0 project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : "custom" -version = "mc${minecraft_version}_v${mod_version}" + (dev ? "+${buildnumber}" : '') +version = "mc${minecraft_version}_v${mod_version}" + (dev && !buildnumber.equals("custom") ? "+${buildnumber}" : '') group = 'com.simibubi.create' archivesBaseName = 'create' diff --git a/changelog.txt b/changelog.txt deleted file mode 100644 index 191b1ac85..000000000 --- a/changelog.txt +++ /dev/null @@ -1,64 +0,0 @@ -0.2.4d: -More tiny bugfixes; we appreciate the reports! -Changes -- Cart assemblers now have several behaviours depending on the rail type they were placed on -Fixes -- Fixed dedicated server crash when using the Schematicannon -- Fixed blockzappers placing waterlogged blocks -- Updated chinese localization -- Added missing recipe for Dark Scoria - -0.2.4c: -A hotfix for our dear users over in Multiplayer. -Fixes -- (0.2.4b) Fixed server crash when Cart Assembler accelerates held Minecarts -- Fixed build errors of previous version - -0.2.4a: -Just a few Bug-Fixes since the recent 1.15 release. Enjoy! -Fixes -- Fixed pistons moving at inconsistent speeds, overshooting their bounds -- Fixed belts not moving entities -- Fixed diagonal belts teleporting entities miles away -- Fixed tree fertilizer not working -- Patched some localization gaps -- Fixed pulley placing down ropes when destroyed while moving -- Fixed inconsistencies with glue removal and placement -- Fixed crash when placing a crafter between two colliding rotation sources -- Fixed cases of self-powering loops caused by blocks rotated using the wrench -- Fixed Extendo Grip animation for left-handed players -- Fixed encoding of degree symbols in tooltips - -0.2.4: -Welcome to the future! Glad you are still here. -Warning -- Do NOT transfer world or schematic data from 1.14. This version is incompatible with any of the prior versions! -New -- Ported Create to Minecraft 1.15.2 -- Added Nixie Tubes -- Added the Extendo Grip -- Added support for TerraForged worldgen -Changes -- Removed Windowlogging, might come back as a stand-alone -- Removed Blazing, Shadow Steel and Gilded Quartz Toolsets -- Massively reworked Create palettes, offering a whole bunch of new patterns! -- The Creative Motor can now face in any direction -- The Creative Motor, Encased Fan and other directional blocks will now reverse their effective rotation when oriented backwards -- Redstone link receivers now emit their signal with the level of the strongest transmitter of the same frequency -- Changed the way cart assemblers react to redstone input -- Blocks that couldn't be placed when a contraption disassembles, now drop as items -- Some fixes regarding inconsistencies with Super Glue placement -- Deployers no longer consume food -- Deployers can now feed players -- Ploughs no longer break blocks if farmland is below them -- Super glue can no longer be removed while inbetween two blocks -Fixes -- Fixed Bells duplicating themselves when moved by a contraption -- Fixed moved Deployers in breaking mode getting stuck on fluids or bedrock -- Schematicannons can no longer place water in the nether -- Fixed bug with extractors not always being able to pull from moved contraptions -- Fixed deployers not able to place certain foods on campfires -- Fixed fire-immune creatures taking damage from heated air currents -- Endermen now take damage from washing fans -- Fixed crash when assembled minecarts pick up the block below their assembler -- Schematicannons can no longer place lit furnaces \ No newline at end of file diff --git a/log.txt b/log.txt deleted file mode 100644 index d65b8d57b..000000000 --- a/log.txt +++ /dev/null @@ -1,41 +0,0 @@ - -- Bump minimum required Forge version to 36.2.0 -- Added the Creative Blaze Cake -- Fixed backtank not rendering on all players -- Added config options that allow some more customization of the goggle overlay -- Fixed crash when simultaneously converting and destroying a Peculiar Bell -- Fixed Stockpile Switch not updating its signal when the inventory it's watching is moved -- Fixed Potato Cannon projectiles being able to move players in creative mode -- Fixed Lectern Controller not rendering buttons when being used by a different player -- Create now uses the milk fluid introduced by Forge -- Fixed mixer and press not checking for recipes once more after completing -- Fixed incorrect damage displayed in the tooltip of potato cannons -- Allow registering custom effect handlers for open ended pipes -- Fixed capitalization in English subtitles -- Now skipping item-drain JEI integration with missing item outputs -- Goggles icon no longer renders when menu button is set invisible -- Fixed missing blaze burner in JEI's display of heated compacting recipes -- Added support for custom namespaces in ponder -- Make ponder files use Minecraft's resource system -- Allow easily registering and generating ponder lang for any namespace -- Allow registering stress value providers and getting values by namespace -- Create now partially uses the Official Mappings provided by Mojang -- Fixed upright items rendered on depots -- Fixed invalid textures on Potato cannon model -- Mechanical Arms remember their targets when placed by Schematicannon -- Mechanical Arms will now rotate/mirror their targets when rotated/mirrored in a schematic or contraption -- Added milling recipes for beetroots and sea pickles -- Press/Spout placement offset no longer activates when clicking the side of a block -- Press/Spout placement offset no longer activates on invalid belt slopes -- Block-items without innate fluid handling no longer require sneaking to be placed next to item drains -- The Goggle overlay can now be activated by external add-ons -- The Goggle overlay default colour now has less opacity -- The Goggle overlay now fades in over a couple ticks - - -Updates to zh_cn.json by Water-Moon -Updates to ja_jp.json by CKenJa -Updates to ru_ru.json by pgkrol & Hanqnero -Updates to ko_kr.json by qkrehf2 & Red1854th -Updates to zh_tw.json by simba-fs - diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java index f05dba37e..768f795e3 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java @@ -125,9 +125,8 @@ public class SawTileEntity extends BlockBreakingKineticTileEntity { @Override protected AxisAlignedBB makeRenderBoundingBox() { - Direction facing = getBlockState().getValue(SawBlock.FACING); - AxisAlignedBB box = RENDER_BOX.expandTowards(facing.getStepX() * 0.125f, facing.getStepY() * 0.125f, facing.getStepZ() * 0.125f); - return box.move(worldPosition); + return RENDER_BOX.inflate(.125f) + .move(worldPosition); } @Override diff --git a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java index 6c7a9cf35..20b67aa52 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/goggles/GoggleOverlayRenderer.java @@ -188,9 +188,13 @@ public class GoggleOverlayRenderer { if (fade < 1) { ms.translate((1 - fade) * Math.signum(cfg.overlayOffsetX.get() + .5f) * 4, 0, 0); - colorBackground = ColorHelper.applyAlpha(colorBackground, fade); - colorBorderTop = ColorHelper.applyAlpha(colorBorderTop, fade); - colorBorderBot = ColorHelper.applyAlpha(colorBorderBot, fade); + int alphaMask = 0xFF000000; + if ((alphaMask & colorBackground) != 0) + colorBackground = ColorHelper.applyAlpha(colorBackground, fade); + if ((alphaMask & colorBorderTop) != 0) + colorBorderTop = ColorHelper.applyAlpha(colorBorderTop, fade); + if ((alphaMask & colorBorderBot) != 0) + colorBorderBot = ColorHelper.applyAlpha(colorBorderBot, fade); } GuiUtils.drawHoveringText(ms, tooltip, posX, posY, tooltipScreen.width, tooltipScreen.height, -1,