Merge pull request #5 from devOS-Sanity-Edition/feat/1.21.1/summer/v3/misc-patches

Misc Patches and everything else

Author: asoji

.gitignore

@@ -31,6 +31,7 @@ bin/
 # fabric
 
 run/
+runServer/
 
 # java
 

README.md

@@ -15,17 +15,29 @@ Some fixes done for the Winter's modpacks.
 - Potential Problem Mods screen on first startup
 - Be able to click on Journeymap formatted waypoints if you use Xaero's [Journey already integrates the other way around]
 - Everyone in the end during an end fight gets a dragon egg
+- Dark Titlebar [Windows 11 only]
+- Ability to change titlebar and icon [Must be a 32x32 Brotli-compressed QOI Image in Base64 string form] [Converter here](https://qoi.y2k.diy/)
+- Ability to read unsup.ini files in pack folder to set icon [Must be a 32x32 Brotli-compressed QOI Image in Base64 string form] and titlebar
+- `request` commands, notably `request dontSleep`, `request attention` and [OP Level 4 only] `request serverRestart`
+- `restart` command that saves, does a 15 second countdown, and then stops server [and let Pelican/Pterodactyl start server back up under assumption]
+- Generative AI deterrent in logs
+- Uploads crash logs automatically and opens up browser
+
+A lot of this can be found in the mod's config, which is powered by [Vigilance](https://github.com/EssentialGG/Vigilance)
+
+![java_axPRlxeTJb](https://github.com/user-attachments/assets/503969a7-b709-4ccd-baac-2195fc5fca29)
 
 ## Credits
 - BluSpring for.. basically half of this mod and why it even exists. Major major code help.
 - Cartrigger for idea of Raccoon trinket slot and the 2 raccoon slot textures
-- CephalonCosmic for internal tool to figure out which NBT files have certain values
+- CephalonCosmic for internal tool to figure out which NBT files have certain values, and fixing the internal impl for getting QOI Images working correctly
+- Deftu for Vigilance config assistance and better server restart command implementation
 - IThundxr for 
-- maximumpower55 for helping with the pack
+- maximumpower55 for helping with the pack, and the mclo.gs crash handling from TeaBridge
 - Oliver-makes-code for showing how to setup datapacks as a resource pack for actual working Structure NBT overriding
-- ims212 for end dragon fight mixin
+- IMS212 for end dragon fight mixin
 
 ## License
 As per usual with all my projects, [MIT License](LICENSE).
 
-However, the [CrashReportGAIDeterrentMixin](src/main/java/one/devos/nautical/winterisms/mixin/CrashReportGAIDeterrentMixin.java) in specific is 0BSD, feel free to take it, no attributions needed. :p
+However, the [CrashReportGAIDeterrentMixin](src/main/java/one/devos/nautical/winterisms/mixin/common/CrashReportGenerativeAIDeterrentMixin.java) in specific is 0BSD, feel free to take it, no attributions needed. :p

build.gradle.kts

@@ -20,6 +20,7 @@ repositories {
 	maven("https://maven.ladysnake.org/releases")
 	maven("https://cursemaven.com") // ech. curseforge.
     maven("https://repo.essential.gg/repository/maven-public") // Essential's Vigilance Config
+    maven("https://jitpack.io")
 }
 
 //All dependencies and their versions are in ./gradle/libs.versions.toml
@@ -50,6 +51,13 @@ dependencies {
 	include(modImplementation(libs.fmw.get())!!) // just to avoid the basic long metadata calls
 	include(implementation(annotationProcessor(libs.mixinsquared.get())!!)!!)
 	include(implementation(libs.mixinconstraints.get())!!)
+    include(implementation(libs.brigadier.kotlin.get())!!)
+    include(implementation(libs.ini4j.get())!!)
+    include(implementation(libs.qoi.main.get())!!)
+    include(implementation(libs.qoi.awt.get())!!)
+    include(implementation(libs.brotli.get())!!)
+    include(implementation(libs.jna.main.get())!!)
+    include(implementation(libs.jna.platform.get())!!)
 
 	modImplementation(libs.grappling.hook)
 	modImplementation(libs.lattice)
@@ -59,6 +67,9 @@ dependencies {
 //    modImplementation(libs.yungs.api) // aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
     modImplementation(libs.cloth.config)
 	modImplementation(libs.better.end.island)
+    modImplementation(libs.cicada)
+    modImplementation(libs.`do`.a.barrel.roll)
+    modImplementation(libs.fabric.permissions.api) // DABR needs this but it doesnt bundle it which is dumb. so you crash on world join w/ this
 
 	modCompileOnly(libs.enderscape)
 

gradle/libs.versions.toml

@@ -1,66 +1,84 @@
 [versions]
+better_end_island = "1.21.1-Fabric-3.1.2"
+brigadier_kotlin = "1.4.2"
+brotli = "0.1.2"
+cardinal_components = "6.1.1"
+cicada = "0.14.2+1.21-1.21.1"
+cloth_config = "15.0.140+fabric"
+do_a_barrel_roll = "3.7.3+1.21-fabric"
+enderscape = "wbBsMlR1"
+essential_elementa = "710"
+essential_universalcraft = "427" # the stanley parable number?!
+essential_vigilance = "312"
 fabric_api = "0.116.4+1.21.1"
 fabric_language_kotlin = "1.13.4+kotlin.2.2.0"
 fabric_loader = "0.16.14"
+fabric_permissions_api = "0.3.1"
 flashback = "hQkBepoB"
 fmw = "1.0.0+build.8"
 grappling_hook = "0.7.3-1.21.1"
+ini4j = "0.5.4"
+jna = "5.17.0"
+journeymap = "1.21.1-6.0.0-beta.52+fabric"
 lattice = "1.2.10"
 midnightlib = "1.7.5+1.21.1-fabric"
 minecraft = "1.21.1"
 mixinconstraints = "1.0.9"
 mixinsquared = "0.3.3"
 modmenu = "11.0.3"
-sodium = "mc1.21.1-0.6.13-fabric"
-trinkets = "3.10.0"
-xaeros_minimap = "25.2.10_Fabric_1.21"
-enderscape = "wbBsMlR1"
-journeymap = "1.21.1-6.0.0-beta.52+fabric"
 multikeybindings = "1.0.2+1.21.1"
-techreborn = "5776057"
-reborncore = "5776056"
-cardinal_components = "6.1.1"
 polymorph = "AGMyBSJE"
+qoi = "1.2.1"
 reborn_energy = "4.1.0"
-better_end_island = "1.21.1-Fabric-3.1.2"
-cloth_config = "15.0.140+fabric"
+reborncore = "5776056"
+sodium = "mc1.21.1-0.6.13-fabric"
+techreborn = "5776057"
+trinkets = "3.10.0"
+xaeros_minimap = "25.2.10_Fabric_1.21"
 yungs_api = "1.21.1-Fabric-5.1.6"
-essential_elementa = "710"
-essential_vigilance = "312"
-essential_universalcraft = "427" # the stanley parable number?!
 
 [libraries]
+better_end_island = { module = "maven.modrinth:yungs-better-end-island", version.ref = "better_end_island" }
+brigadier_kotlin = { module = "com.github.Phyrone:brigardier-kotlin", version.ref = "brigadier_kotlin" }
+brotli = { module = "org.brotli:dec", version.ref = "brotli" }
+cardinal_components_base = { module = "org.ladysnake.cardinal-components-api:cardinal-components-base", version.ref = "cardinal_components" }
+cardinal_components_block = { module = "org.ladysnake.cardinal-components-api:cardinal-components-block", version.ref = "cardinal_components" }
+cardinal_components_entity = { module = "org.ladysnake.cardinal-components-api:cardinal-components-entity", version.ref = "cardinal_components" }
+cicada = { module = "maven.modrinth:cicada", version.ref = "cicada" }
+cloth_config = { module = "maven.modrinth:cloth-config", version.ref = "cloth_config" }
+do_a_barrel_roll = { module = "maven.modrinth:do-a-barrel-roll", version.ref = "do_a_barrel_roll" }
+enderscape = { module = "maven.modrinth:enderscape", version.ref = "enderscape" }
+essential_elementa = { module = "gg.essential:elementa", version.ref = "essential_elementa" }
+essential_universalcraft = { module = "gg.essential:universalcraft-1.21-fabric", version.ref = "essential_universalcraft" }
+essential_vigilance = { module = "gg.essential:vigilance", version.ref = "essential_vigilance" }
 fabric_api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
 fabric_language_kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric_language_kotlin" }
 fabric_loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric_loader" }
+fabric_permissions_api = { module = "me.lucko:fabric-permissions-api", version.ref = "fabric_permissions_api" }
 flashback = { module = "maven.modrinth:flashback", version.ref = "flashback" }
 fmw = { module = "gay.asoji:fmw", version.ref = "fmw" }
 grappling_hook = { module = "io.github.moonlight_maya:Grappling-Hook", version.ref = "grappling_hook" }
+ini4j = { module = "org.ini4j:ini4j", version.ref = "ini4j" }
+jna_main = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+jna_platform = { module = "net.java.dev.jna:jna-platform", version.ref = "jna" }
+journeymap = { module = "maven.modrinth:journeymap", version.ref = "journeymap" }
 lattice = { module = "com.moulberry:lattice", version.ref = "lattice" }
 midnightlib = { module = "maven.modrinth:midnightlib", version.ref = "midnightlib" }
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
 mixinconstraints = { module = "com.moulberry:mixinconstraints", version.ref = "mixinconstraints" }
 mixinsquared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-fabric", version.ref = "mixinsquared" }
 modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
-sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
-trinkets = { module = "dev.emi:trinkets", version.ref = "trinkets" }
-xaeros_minimap = { module = "maven.modrinth:xaeros-minimap", version.ref = "xaeros_minimap" }
-enderscape = { module = "maven.modrinth:enderscape", version.ref = "enderscape" }
-journeymap = { module = "maven.modrinth:journeymap", version.ref = "journeymap" }
 multikeybindings = { module = "maven.modrinth:multi-key-bindings", version.ref = "multikeybindings" }
-techreborn = { module = "curse.maven:techreborn-233564", version.ref = "techreborn" }
-reborncore = { module = "curse.maven:reborncore-237903", version.ref = "reborncore" }
 polymorph = { module = "maven.modrinth:polymorph", version.ref = "polymorph" }
-cardinal_components_base = { module = "org.ladysnake.cardinal-components-api:cardinal-components-base", version.ref = "cardinal_components" }
-cardinal_components_block = { module = "org.ladysnake.cardinal-components-api:cardinal-components-block", version.ref = "cardinal_components" }
-cardinal_components_entity = { module = "org.ladysnake.cardinal-components-api:cardinal-components-entity", version.ref = "cardinal_components" }
+qoi_awt = { module = "me.saharnooby:qoi-java-awt", version.ref = "qoi" }
+qoi_main = { module = "me.saharnooby:qoi-java", version.ref = "qoi" }
 reborn_energy = { module = "teamreborn:energy", version.ref = "reborn_energy" }
-better_end_island = { module = "maven.modrinth:yungs-better-end-island", version.ref = "better_end_island" }
-cloth_config = { module = "maven.modrinth:cloth-config", version.ref = "cloth_config" }
+reborncore = { module = "curse.maven:reborncore-237903", version.ref = "reborncore" }
+sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
+techreborn = { module = "curse.maven:techreborn-233564", version.ref = "techreborn" }
+trinkets = { module = "dev.emi:trinkets", version.ref = "trinkets" }
+xaeros_minimap = { module = "maven.modrinth:xaeros-minimap", version.ref = "xaeros_minimap" }
 yungs_api = { module = "maven.modrinth:yungs-api", version.ref = "yungs_api" }
-essential_elementa = { module = "gg.essential:elementa", version.ref = "essential_elementa" }
-essential_vigilance = { module = "gg.essential:vigilance", version.ref = "essential_vigilance" }
-essential_universalcraft = { module = "gg.essential:universalcraft-1.21-fabric", version.ref = "essential_universalcraft" }
 
 [bundles]
 dev_mods = [ "sodium" ]

…interisms/mixin/DisableVanillaTitle.java …ms/mixin/client/DisableVanillaTitle.javasrc/main/java/one/devos/nautical/winterisms/mixin/DisableVanillaTitle.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/DisableVanillaTitle.java src/main/java/one/devos/nautical/winterisms/mixin/DisableVanillaTitle.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/DisableVanillaTitle.java

@@ -1,4 +1,4 @@
-package one.devos.nautical.winterisms.mixin;
+package one.devos.nautical.winterisms.mixin.client;
 
 import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;

…interisms/mixin/KeyBindsScreenMixin.java …ms/mixin/client/KeyBindsScreenMixin.javasrc/main/java/one/devos/nautical/winterisms/mixin/KeyBindsScreenMixin.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/KeyBindsScreenMixin.java src/main/java/one/devos/nautical/winterisms/mixin/KeyBindsScreenMixin.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/KeyBindsScreenMixin.java

@@ -1,4 +1,4 @@
-package one.devos.nautical.winterisms.mixin;
+package one.devos.nautical.winterisms.mixin.client;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.Util;

…winterisms/mixin/KeyMappingAccessor.java …sms/mixin/client/KeyMappingAccessor.javasrc/main/java/one/devos/nautical/winterisms/mixin/KeyMappingAccessor.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/KeyMappingAccessor.java src/main/java/one/devos/nautical/winterisms/mixin/KeyMappingAccessor.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/KeyMappingAccessor.java

@@ -1,4 +1,4 @@
-package one.devos.nautical.winterisms.mixin;
+package one.devos.nautical.winterisms.mixin.client;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;

…l/winterisms/mixin/TitleScreenMixin.java …risms/mixin/client/TitleScreenMixin.javasrc/main/java/one/devos/nautical/winterisms/mixin/TitleScreenMixin.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/TitleScreenMixin.java src/main/java/one/devos/nautical/winterisms/mixin/TitleScreenMixin.java renamed to src/main/java/one/devos/nautical/winterisms/mixin/client/TitleScreenMixin.java

@@ -1,10 +1,10 @@
-package one.devos.nautical.winterisms.mixin;
+package one.devos.nautical.winterisms.mixin.client;
 
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.network.chat.Component;
-import one.devos.nautical.winterisms.config.Config;
 import one.devos.nautical.winterisms.client.screens.InitialIncompatibleWarningScreen;
+import one.devos.nautical.winterisms.config.Config;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

src/main/java/one/devos/nautical/winterisms/mixin/client/WindowQOIDataMixin.java

@@ -0,0 +1,16 @@
+package one.devos.nautical.winterisms.mixin.client;
+
+import net.minecraft.client.Minecraft;
+import one.devos.nautical.winterisms.client.titlebar.QOIWindowIcon;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class WindowQOIDataMixin {
+    @Inject(method = "onResourceLoadFinished", at = @At("HEAD"))
+    private void onResourceLoadFinished(CallbackInfo ci) {
+        QOIWindowIcon.INSTANCE.okayLetsDoThisShit();
+    }
+}

src/main/java/one/devos/nautical/winterisms/mixin/client/WindowTitlebarMixin.java

@@ -0,0 +1,20 @@
+package one.devos.nautical.winterisms.mixin.client;
+
+import net.minecraft.client.Minecraft;
+import one.devos.nautical.winterisms.client.titlebar.DarkModeTitleBar;
+import org.lwjgl.glfw.GLFWNativeWin32;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class WindowTitlebarMixin {
+    @Inject(method = "setWindowActive", at = @At("HEAD"))
+    private void titlebar(boolean windowActive, CallbackInfo ci) {
+        long window = Minecraft.getInstance().getWindow().getWindow();
+        int windowId = (int) GLFWNativeWin32.glfwGetWin32Window(window);
+
+        DarkModeTitleBar.INSTANCE.darkModeTitleBarForWindows11(windowId);
+    }
+}