merge and port

This commit is contained in:
zelophed 2021-04-03 01:16:14 +02:00
parent e05eb5c386
commit 809bc6bf88
2 changed files with 3 additions and 1 deletions

View file

@ -19,6 +19,8 @@ public class CClient extends ConfigBase {
public ConfigInt overlayOffsetY = i(0, Integer.MIN_VALUE, Integer.MAX_VALUE, "overlayOffsetY", 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"); "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 ConfigGroup placementAssist = group(1, "placementAssist", "Settings for the Placement Assist");
public ConfigEnum<PlacementIndicatorSetting> 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 ConfigEnum<PlacementIndicatorSetting> 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 ConfigFloat indicatorScale = f(1.0f, 0f, "indicatorScale", "Change the size of the Indicator by this multiplier");

View file

@ -15,7 +15,7 @@ public class GhostBlocks {
double period = 2500; double period = 2500;
double timer = System.currentTimeMillis() % period; double timer = System.currentTimeMillis() % period;
double offset = MathHelper.cos((float) ((2d/period) * Math.PI * timer)); double offset = MathHelper.cos((float) ((2d/period) * Math.PI * timer));
return 0.75d - 0.2d * offset; return 0.55d - 0.2d * offset;
} }
final Map<Object, Entry> ghosts; final Map<Object, Entry> ghosts;