Merge branch 'master' into server

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: "https://paypal.me/Nightkingale"

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -6,13 +6,13 @@ jobs:
   build-binary:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build Binary
       run: |
-        docker build -t plugin_builder .
-        docker run --rm -v ${PWD}:/project plugin_builder make
+        docker build -t builder .
+        docker run --rm -v ${PWD}:/project builder make
     - uses: actions/upload-artifact@v3
       with:
-       name: Wii_U_Time_Sync.wps
-       path: "*.wps"
-       if-no-files-found: error
+        name: Wii_U_Time_Sync.wps
+        path: "*.wps"
+        if-no-files-found: error

Dockerfile

@@ -1,6 +1,6 @@
-FROM ghcr.io/wiiu-env/devkitppc:20230326
+FROM ghcr.io/wiiu-env/devkitppc:20230621
 
-COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230215 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/libnotifications:20230423 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230719 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libnotifications:20230621 /artifacts $DEVKITPRO
 
 WORKDIR project

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Nightkingale
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -28,7 +28,8 @@ INCLUDES	:=	source
 #-------------------------------------------------------------------------------
 # options for code generation
 #-------------------------------------------------------------------------------
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+CFLAGS	:=	-Wall -Wextra -Wundef -Wshadow -Wpointer-arith -Wcast-align \
+			-O2 -fipa-pta -pipe -ffunction-sections \
 			$(MACHDEP)
 
 CFLAGS	+=	$(INCLUDE) -D__WIIU__ -D__WUT__ -D__WUPS__ 

source/main.cpp

@@ -164,12 +164,27 @@ OSTime NTPGetTime(const char* hostname)
 }
 
 void updateTime() {
+    uint64_t roundtripStart = 0;
+    uint64_t roundtripEnd = 0;
+
+    // Get the time from the server.
+    roundtripStart = OSGetTime();
     OSTime time = NTPGetTime("pool.ntp.org"); // Connect to the time server.
+    roundtripEnd = OSGetTime();
 
     if (time == 0) {
         return; // Probably didn't connect correctly.
     }
 
+    // Calculate the roundtrip time.
+    uint64_t roundtrip = roundtripEnd - roundtripStart;
+
+    // Calculate the time it took to get the time from the server.
+    uint64_t timeTook = roundtrip / 2;
+
+    // Subtract the time it took to get the time from the server.
+    time -= timeTook;
+
     if (offsetHours < 0) {
         time -= OSSecondsToTicks(abs(offsetHours) * 60 * 60);
     } else {
@@ -231,31 +246,36 @@ INITIALIZE_PLUGIN() {
 
 void syncingEnabled(ConfigItemBoolean *item, bool value)
 {
+    (void)item;
     // If false, bro is literally a time traveler!
     WUPS_StoreBool(nullptr, SYNCING_ENABLED_CONFIG_ID, value);
     enabledSync = value;
 }
 
 void savingsEnabled(ConfigItemBoolean *item, bool value)
 {
+    (void)item;
     WUPS_StoreBool(nullptr, DST_ENABLED_CONFIG_ID, value);
     enabledDST = value;
 }
 
 void notifyEnabled(ConfigItemBoolean *item, bool value)
 {
+    (void)item;
     WUPS_StoreBool(nullptr, NOTIFY_ENABLED_CONFIG_ID, value);
     enabledNotify = value;
 }
 
 void onHourOffsetChanged(ConfigItemIntegerRange *item, int32_t offset)
 {
+    (void)item;
     WUPS_StoreInt(nullptr, OFFSET_HOURS_CONFIG_ID, offset);
     offsetHours = offset;
 }
 
 void onMinuteOffsetChanged(ConfigItemIntegerRange *item, int32_t offset)
 {
+    (void)item;
     WUPS_StoreInt(nullptr, OFFSET_MINUTES_CONFIG_ID, offset);
     offsetMinutes = offset;
 }