From 809bc6bf888c670983a59f3944f2253d071a63b8 Mon Sep 17 00:00:00 2001 From: zelophed Date: Sat, 3 Apr 2021 01:16:14 +0200 Subject: [PATCH] merge and port --- .../java/com/simibubi/create/foundation/config/CClient.java | 2 ++ .../simibubi/create/foundation/utility/ghost/GhostBlocks.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/foundation/config/CClient.java b/src/main/java/com/simibubi/create/foundation/config/CClient.java index 3c5bfc2e2..3a09d5c81 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -19,6 +19,8 @@ public class CClient extends ConfigBase { public ConfigInt overlayOffsetY = i(0, Integer.MIN_VALUE, Integer.MAX_VALUE, "overlayOffsetY", "Offset the overlay from goggle- and hover- information by this many pixels on the Y axis; Use /create overlay"); + public ConfigBool ignoreFabulousWarning = b(false, "ignoreFabulousWarning", "Setting this to true will prevent Create from sending you a warning when playing with Fabulous graphics enabled"); + public ConfigGroup placementAssist = group(1, "placementAssist", "Settings for the Placement Assist"); public ConfigEnum placementIndicator = e(PlacementIndicatorSetting.TEXTURE, "indicatorType", "What indicator should be used when showing where the assisted placement ends up relative to your crosshair", "Choose 'NONE' to disable the Indicator altogether"); public ConfigFloat indicatorScale = f(1.0f, 0f, "indicatorScale", "Change the size of the Indicator by this multiplier"); diff --git a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlocks.java b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlocks.java index 2c6cc6f4b..1ef7f0c01 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlocks.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ghost/GhostBlocks.java @@ -15,7 +15,7 @@ public class GhostBlocks { double period = 2500; double timer = System.currentTimeMillis() % period; double offset = MathHelper.cos((float) ((2d/period) * Math.PI * timer)); - return 0.75d - 0.2d * offset; + return 0.55d - 0.2d * offset; } final Map ghosts;