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 b52ed5e89..3a09d5c81 100644 --- a/src/main/java/com/simibubi/create/foundation/config/CClient.java +++ b/src/main/java/com/simibubi/create/foundation/config/CClient.java @@ -18,11 +18,13 @@ public class CClient extends ConfigBase { "Offset the overlay from goggle- and hover- information by this many pixels on the X axis; Use /create overlay"); 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 smoothPlacementIndicator = b(false, "smoothPlacementIndicator", - "Use an alternative indicator when showing where the assisted placement ends up relative to your crosshair"); - public ConfigEnum placementIndicator = e(PlacementIndicatorSetting.TEXTURE, "placementIndicator", "What indicator should be used when showing where the assisted placement ends up relative to your crosshair"); + 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"); + public ConfigGroup ponder = group(1, "ponder", "Ponder settings"); public ConfigBool comfyReading = b(false, "comfyReading", "Slow down a ponder scene whenever there is text on screen."); 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; diff --git a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java b/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java index 83e240fb6..cebfede73 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java +++ b/src/main/java/com/simibubi/create/foundation/utility/placement/PlacementHelpers.java @@ -29,11 +29,19 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import org.lwjgl.opengl.GL11; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import org.lwjgl.opengl.GL11; +import com.mojang.blaze3d.systems.RenderSystem; +import com.simibubi.create.foundation.config.AllConfigs; +import com.simibubi.create.foundation.config.CClient; +import com.simibubi.create.foundation.gui.AllGuiTextures; +import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingAngle; +import com.simibubi.create.foundation.gui.widgets.InterpolatedChasingValue; +import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.VecHelper; @Mod.EventBusSubscriber public class PlacementHelpers { @@ -214,6 +222,8 @@ public class PlacementHelpers { ms.translate(centerX, centerY, 0); ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(angle.get(0))); //RenderSystem.rotatef(snappedAngle, 0, 0, 1); + double scale = AllConfigs.CLIENT.indicatorScale.get(); + RenderSystem.scaled(scale, scale, 1); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuffer(); @@ -249,7 +259,9 @@ public class PlacementHelpers { RenderSystem.shadeModel(GL11.GL_SMOOTH); ms.translate(centerX, centerY, 0); - ms.scale(12, 12, 0); + float scale = AllConfigs.CLIENT.indicatorScale.get().floatValue(); + ms.scale(scale, scale, 1); + ms.scale(12, 12, 1); float index = snappedAngle / 22.5f; float tex_size = 16f/256f;