diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker')
7 files changed, 11 insertions, 17 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java index 07109b46..41511732 100644 --- a/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java +++ b/src/main/java/de/hysky/skyblocker/config/HudConfigScreen.java @@ -6,7 +6,6 @@ import it.unimi.dsi.fastutil.ints.IntIntMutablePair; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.text.Text; -import net.minecraft.util.math.MathHelper; import java.awt.*; import java.util.List; @@ -70,8 +69,8 @@ public abstract class HudConfigScreen extends Screen { @Override public final boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) { if (button == 0 && draggingWidget != null) { - draggingWidget.setX((int) MathHelper.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth())); - draggingWidget.setY((int) MathHelper.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight())); + draggingWidget.setX((int) Math.clamp(mouseX - mouseClickRelativeX, 0, this.width - draggingWidget.getWidth())); + draggingWidget.setY((int) Math.clamp(mouseY - mouseClickRelativeY, 0, this.height - draggingWidget.getHeight())); } return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java index 4334fc58..2204d39c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/AuctionTypeWidget.java @@ -4,7 +4,6 @@ import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.skyblock.auction.SlotClickHandler; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; public class AuctionTypeWidget extends SliderWidget<AuctionTypeWidget.Option> { @@ -34,7 +33,7 @@ public class AuctionTypeWidget extends SliderWidget<AuctionTypeWidget.Option> { private static final AuctionTypeWidget.Option[] values = values(); public static AuctionTypeWidget.Option get(int ordinal) { - return values[MathHelper.clamp(ordinal, 0, values.length - 1)]; + return values[Math.clamp(ordinal, 0, values.length - 1)]; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java index b2450b59..84b8ae4d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/widgets/SortWidget.java @@ -4,7 +4,6 @@ import de.hysky.skyblocker.SkyblockerMod; import de.hysky.skyblocker.skyblock.auction.SlotClickHandler; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; public class SortWidget extends SliderWidget<SortWidget.Option> { @@ -39,7 +38,7 @@ public class SortWidget extends SliderWidget<SortWidget.Option> { private static final Option[] values = values(); public static Option get(int ordinal) { - return values[MathHelper.clamp(ordinal, 0, values.length - 1)]; + return values[Math.clamp(ordinal, 0, values.length - 1)]; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java index f35cfd22..a4af804c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dwarven/CrystalsHud.java @@ -11,7 +11,6 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.Identifier; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RotationAxis; import org.joml.Vector2i; import org.joml.Vector2ic; @@ -127,8 +126,8 @@ public class CrystalsHud { //converts an x and z to a location on the map int transformedX = (int) ((x - 202) / 621 * 62); int transformedY = (int) ((z - 202) / 621 * 62); - transformedX = MathHelper.clamp(transformedX, 0, 62); - transformedY = MathHelper.clamp(transformedY, 0, 62); + transformedX = Math.clamp(transformedX, 0, 62); + transformedY = Math.clamp(transformedY, 0, 62); return new Vector2i(transformedX, transformedY); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java index a960c9af..2ee119fe 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/fancybars/FancyStatusBars.java @@ -185,7 +185,7 @@ public class FancyStatusBars { // FIX SIZES int totalSize = 0; for (StatusBar statusBar : barRow) - totalSize += (statusBar.size = MathHelper.clamp(statusBar.size, sizeRule.minSize(), sizeRule.maxSize())); + totalSize += (statusBar.size = Math.clamp(statusBar.size, sizeRule.minSize(), sizeRule.maxSize())); whileLoop: while (totalSize != sizeRule.targetSize()) { @@ -240,7 +240,7 @@ public class FancyStatusBars { } } StatusBar statusBar = barRow.get(i); - statusBar.size = MathHelper.clamp(statusBar.size, sizeRule.minSize(), sizeRule.maxSize()); + statusBar.size = Math.clamp(statusBar.size, sizeRule.minSize(), sizeRule.maxSize()); float x = barAnchor.isRight() ? anchorPosition.x() + currSize * widthPerSize : diff --git a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java index c4388178..9522be43 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/tabhud/widget/component/ProgressComponent.java @@ -5,7 +5,6 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.item.ItemStack; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import net.minecraft.util.math.MathHelper; /** @@ -37,7 +36,7 @@ public class ProgressComponent extends Component { this.ico = (ico == null) ? Ico.BARRIER : ico; this.desc = d; this.bar = b; - this.pcnt = MathHelper.clamp(pcnt, 0f, 100f); + this.pcnt = Math.clamp(pcnt, 0f, 100f); this.color = 0xff000000 | color; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/OrderedWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/OrderedWaypoints.java index a01d830b..7b7694f6 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/OrderedWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/OrderedWaypoints.java @@ -58,7 +58,6 @@ import net.minecraft.command.argument.PosArgument; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; public class OrderedWaypoints { @@ -144,7 +143,7 @@ public class OrderedWaypoints { OrderedWaypoint waypoint = new OrderedWaypoint(pos, colorComponents); if (index != Integer.MIN_VALUE) { - int indexToAddAt = MathHelper.clamp(index, 0, group.waypoints().size()); + int indexToAddAt = Math.clamp(index, 0, group.waypoints().size()); group.waypoints().add(indexToAddAt, waypoint); INDEX_STORE.removeInt(group.name()); @@ -188,7 +187,7 @@ public class OrderedWaypoints { } if (index != Integer.MIN_VALUE) { - int indexToRemove = MathHelper.clamp(index, 0, group.waypoints().size() - 1); + int indexToRemove = Math.clamp(index, 0, group.waypoints().size() - 1); group.waypoints().remove(indexToRemove); INDEX_STORE.removeInt(group.name()); |