diff --git a/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java b/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java index d70cda9..272d2ee 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java @@ -77,6 +77,13 @@ public class ControllerDeadzoneCalibrationScreen extends Screen { else label = infoLabel; label.renderCentered(graphics, width / 2, 55); + + graphics.pose().pushPose(); + float scale = Math.min(3f, (readyButton.getY() - (55 + font.lineHeight * label.getLineCount()) - 2) / 64f); + graphics.pose().translate(width / 2f - 32 * scale, 55 + font.lineHeight * label.getLineCount(), 0f); + graphics.pose().scale(scale, scale, 1f); + graphics.blit(controller.icon(), 0, 0, 0f, 0f, 64, 64, 64, 64); + graphics.pose().popPose(); } private void drawBar(GuiGraphics graphics, int centerX, int y, float progress, int vOffset) { diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/dualsense/icon.png b/src/main/resources/assets/controlify/textures/gui/gamepad/dualsense/icon.png index 4185625..f3ee543 100644 Binary files a/src/main/resources/assets/controlify/textures/gui/gamepad/dualsense/icon.png and b/src/main/resources/assets/controlify/textures/gui/gamepad/dualsense/icon.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/stadia/icon.png b/src/main/resources/assets/controlify/textures/gui/gamepad/stadia/icon.png new file mode 100644 index 0000000..90d3d26 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/stadia/icon.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown deleted file mode 120000 index 905d028..0000000 --- a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown +++ /dev/null @@ -1 +0,0 @@ -xbox_one \ No newline at end of file diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/a_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/a_button.png new file mode 100644 index 0000000..1425cdf Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/a_button.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/b_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/b_button.png new file mode 100644 index 0000000..455a45d Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/b_button.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/back.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/back.png new file mode 100644 index 0000000..5d1b0e1 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/back.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_down.png new file mode 100644 index 0000000..95df9b0 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_down.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_left.png new file mode 100644 index 0000000..bba34e5 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_left.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_right.png new file mode 100644 index 0000000..195cc56 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_right.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_up.png new file mode 100644 index 0000000..d958c1a Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/dpad_up.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/guide.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/guide.png new file mode 100644 index 0000000..50a9f9d Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/guide.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/icon.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/icon.png new file mode 100644 index 0000000..90d3d26 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/icon.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_bumper.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_bumper.png new file mode 100644 index 0000000..b100b11 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_bumper.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_down.png new file mode 100644 index 0000000..feaf94e Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_down.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_left.png new file mode 100644 index 0000000..a80d177 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_left.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_press.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_press.png new file mode 100644 index 0000000..96ed6ae Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_press.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_right.png new file mode 100644 index 0000000..5b35903 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_right.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_up.png new file mode 100644 index 0000000..15329f4 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_stick_up.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_trigger.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_trigger.png new file mode 100644 index 0000000..6c2659b Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/left_trigger.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_bumper.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_bumper.png new file mode 100644 index 0000000..f687d4e Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_bumper.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_down.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_down.png new file mode 100644 index 0000000..cd52288 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_down.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_left.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_left.png new file mode 100644 index 0000000..dcda058 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_left.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_press.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_press.png new file mode 100644 index 0000000..fbc5fc8 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_press.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_right.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_right.png new file mode 100644 index 0000000..452c230 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_right.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_up.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_up.png new file mode 100644 index 0000000..7aa84d7 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_stick_up.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_trigger.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_trigger.png new file mode 100644 index 0000000..439c158 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/right_trigger.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/start.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/start.png new file mode 100644 index 0000000..ee7deac Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/start.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/touchpad.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/touchpad.png new file mode 100644 index 0000000..0997317 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/touchpad.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/x_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/x_button.png new file mode 100644 index 0000000..2d77d21 Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/x_button.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/y_button.png b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/y_button.png new file mode 100644 index 0000000..8989e4b Binary files /dev/null and b/src/main/resources/assets/controlify/textures/gui/gamepad/unknown/y_button.png differ diff --git a/src/main/resources/assets/controlify/textures/gui/gamepad/xbox_one/icon.png b/src/main/resources/assets/controlify/textures/gui/gamepad/xbox_one/icon.png index 82342ed..051eb6e 100644 Binary files a/src/main/resources/assets/controlify/textures/gui/gamepad/xbox_one/icon.png and b/src/main/resources/assets/controlify/textures/gui/gamepad/xbox_one/icon.png differ diff --git a/src/main/resources/assets/controlify/textures/screenshots/reach-around-placement.webp b/src/main/resources/assets/controlify/textures/screenshots/reach-around-placement.webp index c4c2ba2..1937809 100644 Binary files a/src/main/resources/assets/controlify/textures/screenshots/reach-around-placement.webp and b/src/main/resources/assets/controlify/textures/screenshots/reach-around-placement.webp differ