Merge pull request #6 from devOS-Sanity-Edition/revert-2-feat/1.21.1/summer/v3-mega-pr

Revert "v3 Mega Update"

Author: asoji

.gitignore

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

README.md

@@ -15,29 +15,15 @@ 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, and fixing the internal impl for getting QOI Images working correctly
-- Deftu for Vigilance config assistance and better server restart command implementation
+- CephalonCosmic for internal tool to figure out which NBT files have certain values
 - IThundxr for 
-- maximumpower55 for helping with the pack, and the mclo.gs crash handling from TeaBridge
+- maximumpower55 for helping with the pack
 - 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/common/CrashReportGenerativeAIDeterrentMixin.java) in specific is 0BSD, feel free to take it, no attributions needed. :p
+As per usual with all my projects, [MIT License](LICENSE).

build.gradle.kts

@@ -19,8 +19,6 @@ repositories {
 	maven("https://maven.bawnorton.com/releases") // MixinSquared
 	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
@@ -43,33 +41,20 @@ dependencies {
 	modLocalRuntime(libs.bundles.dev.mods)
 
 	// Config
-	include(implementation(libs.essential.vigilance.get())!!)
-	include(modImplementation(libs.essential.universalcraft.get())!!)
+	include(modImplementation(libs.midnightlib.get())!!)
 
 //	modImplementation(files("localLibs/centered-crosshair+1.21-1.0.8.jar"))
 
 	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)
 	modCompileOnly(libs.xaeros.minimap)
 	modImplementation(libs.journeymap)
 	modImplementation(libs.multikeybindings)
-//    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.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # Mod Properties
-mod_version=3.0.0
+mod_version=2.1.1
 maven_group=one.devos.nautical
 archives_base_name=winterisms
 

gradle/libs.versions.toml

@@ -1,88 +1,60 @@
 [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"
-multikeybindings = "1.0.2+1.21.1"
-polymorph = "AGMyBSJE"
-qoi = "1.2.1"
-reborn_energy = "4.1.0"
-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"
+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"
+reborn_energy = "4.1.0"
+better_end_island = "1.21.1-Fabric-3.1.2"
 
 [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" }
-multikeybindings = { module = "maven.modrinth:multi-key-bindings", version.ref = "multikeybindings" }
-polymorph = { module = "maven.modrinth:polymorph", version.ref = "polymorph" }
-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" }
-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" }
+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" }
+reborn_energy = { module = "teamreborn:energy", version.ref = "reborn_energy" }
+better_end_island = { module = "maven.modrinth:yungs-better-end-island", version.ref = "better_end_island" }
 
 [bundles]
-dev_mods = [ "sodium" ]
-dependencies = [ "midnightlib", "flashback", "trinkets", "modmenu" ]
+dev_mods = [ "sodium", "modmenu" ]
+dependencies = [ "midnightlib", "flashback", "trinkets" ]
 techreborn = [ "techreborn", "reborncore", "reborn_energy" ]
 polymorph = [ "polymorph", "cardinal_components_base", "cardinal_components_block", "cardinal_components_entity" ]
 

src/main/java/one/devos/nautical/winterisms/config/Config.java

@@ -0,0 +1,51 @@
+package one.devos.nautical.winterisms.config;
+
+import eu.midnightdust.lib.config.MidnightConfig;
+
+public class Config extends MidnightConfig {
+    public static final String limitsGrappleCategory = "limitsGrapple";
+    public static final String flashbackCategory = "flashback";
+    public static final String limitsGrappleModId = "limits_grapple";
+    public static final String flashbackModId = "flashback";
+    public static final String onboardingCategory = "onboarding";
+    public static String painAndSufferingAndSufferingAndPain = "I understand what I am doing will cause potential instabilities with Flashback. I will not report this to Flashback support. Praise Winter. Praise Moulberry. Praise Ishland.";
+
+    @Comment(category = limitsGrappleCategory)
+    @Condition(requiredModId = limitsGrappleModId)
+    public static String limitsGrappleSwingColorWindowMissingWarning;
+
+    @Comment(category = limitsGrappleCategory)
+    @Condition(requiredModId = limitsGrappleModId)
+    public static String limitsGrappleSwingColorWindowMissingWarningSpacer;
+
+    @Entry(category = limitsGrappleCategory, isColor = true, width = 7, min = 7)
+    @Condition(requiredModId = limitsGrappleModId)
+    public static String limitsGrappleHitColor = "#3333ff";
+
+    @Entry(category = limitsGrappleCategory, isColor = true, width = 7, min = 7)
+    @Condition(requiredModId = limitsGrappleModId)
+    public static String limitsGrappleMissColor = "#99994c";
+
+    @Comment(category = flashbackCategory)
+    @Condition(requiredModId = flashbackModId)
+    public static String flashbackReplayForceAllowIncompatibleModsExtremeWarning;
+
+    @Comment(category = flashbackCategory)
+    @Condition(requiredModId = flashbackModId)
+    public static String flashbackSpacer;
+
+    @Comment(category = flashbackCategory)
+    @Condition(requiredModId = flashbackModId)
+    public static String flashbackReplayForceAllowIncompatibleModsExtremeWarning2;
+
+    @Comment(category = flashbackCategory)
+    @Condition(requiredModId = flashbackModId)
+    public static String flashbackSpacer2;
+
+    @Entry(category = flashbackCategory)
+    @Condition(requiredModId = flashbackModId)
+    public static String flashbackReplayForceAllowIncompatibleMods = "";
+
+    @Entry(category = onboardingCategory)
+    public static Boolean incompatibleModsWarningScreenViewed = false;
+}

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

@@ -1,7 +1,11 @@
-package one.devos.nautical.winterisms.mixin.common;
+package one.devos.nautical.winterisms.mixin;
 
 import com.bawnorton.mixinsquared.TargetHandler;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.item.ItemInput;
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;

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

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

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

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

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

@@ -1,4 +1,4 @@
-package one.devos.nautical.winterisms.mixin.client;
+package one.devos.nautical.winterisms.mixin;
 
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
@@ -18,7 +18,7 @@ protected TitleScreenMixin(Component title) {
 
     @Inject(at = @At("RETURN"), method = "init")
     private void init(CallbackInfo info) {
-        if (!Config.INSTANCE.getIncompatibleModsWarningScreenViewed()) {
+        if (Config.incompatibleModsWarningScreenViewed == false) {
             this.minecraft.setScreen(new InitialIncompatibleWarningScreen(this));
         }
     }