🚧 wip flashback mixins [1 done, 1 not done]

Author: asoji

README.md

@@ -1,11 +1,11 @@
 # Winter's Summer Fixes
 
-Some datapack [and maybe code?] fixes done for the Winter's Summer modpack, packaged as a mod
+Some fixes done for the Winter's Summer modpack.
 
 ## Fixes [so far]
 - Allow the Grappling Hook from Limits' Grapple fork to have Durability-based enchantments [Unbreaking, Mending, etc]
-- [WIP] Properly center the Grappling Hook's crosshair if in use with Centered Crosshair mod [but not if in use with Dynamic Crosshair as well]
 
 ## Additions
 - Raccoon trinkets slot for Raccoons & Rabies [thanks Cartrigger for the idea]
-  - also thanks Cartrigger for the Normal and Alternative slot texture for the Raccoon Slot
+  - also thanks Cartrigger for the Normal and Alternative slot texture for the Raccoon Slot
+- Be able to change the Grappling Hook's HUD color through the Winter's Summer Fixes config

build.gradle.kts

@@ -44,8 +44,10 @@ dependencies {
 	include(modImplementation(libs.midnightlib.get())!!)
 
 //	modImplementation(files("localLibs/centered-crosshair+1.21-1.0.8.jar"))
-//	modImplementation(files("localLibs/limits_grapple-0.7.3-1.21.1.jar"))
-//	modImplementation(files("localLibs/trinkets-3.10.0.jar"))
+	modImplementation(files("localLibs/limits_grapple-0.7.3-1.21.1.jar"))
+	modImplementation(files("localLibs/trinkets-3.10.0.jar"))
+	modImplementation(files("localLibs/Flashback-0.36.0-for-MC1.21.1.jar"))
+	modImplementation(files("localLibs/lattice-1.2.10.jar"))
 
 	include(modImplementation(libs.fmw.get())!!) // just to avoid the basic long metadata calls
 	include(implementation(annotationProcessor(libs.mixinsquared.get())!!)!!)

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

@@ -11,4 +11,16 @@ public class Config extends MidnightConfig {
 
     @Entry(category = "client", isColor = true)
     public static String limitsGrappleMissColor = "#99994c";
+
+    @Comment(category = "client", centered = true)
+    public static String flashback;
+
+    @Comment(category = "client", centered = true)
+    public static String flashbackSpacer;
+
+    @Comment(category = "client")
+    public static String flashbackReplayForceAllowIncompatibleModsExtremeWarning;
+
+    @Entry(category = "client")
+    public static Boolean flashbackReplayForceAllowIncompatibleMods = false;
 }

src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/flashback/FlashbackReplayIncompatibleModsMixin.java

@@ -0,0 +1,28 @@
+package one.devos.nautical.winterssummerfixes.mixin.compat.client.flashback;
+
+import com.llamalad7.mixinextras.injector.ModifyReturnValue;
+import com.moulberry.flashback.Flashback;
+import com.moulberry.mixinconstraints.annotations.IfModLoaded;
+import one.devos.nautical.winterssummerfixes.config.Config;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+import java.util.List;
+
+@IfModLoaded("flashback")
+@Mixin(value = Flashback.class, priority = 1800, remap = false)
+public class FlashbackReplayIncompatibleModsMixin {
+    @ModifyReturnValue(
+            method = "getReplayIncompatibleMods",
+            at = @At(value = "RETURN",
+                    target = "Lcom/moulberry/flashback/Flashback;getReplayIncompatibleMods()Ljava/util/List;"
+            )
+    )
+    private static List<String> getReplayIncompatibleMods(List<String> original) {
+        if (Config.flashbackReplayForceAllowIncompatibleMods) {
+            original.clear();
+        }
+
+        return original;
+    }
+}

src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/flashback/FlashbackReplayIncompatibleModsTitleScreenMixin.java

@@ -0,0 +1,18 @@
+package one.devos.nautical.winterssummerfixes.mixin.compat.client.flashback;
+
+import com.bawnorton.mixinsquared.TargetHandler;
+import com.moulberry.mixinconstraints.annotations.IfModLoaded;
+import net.minecraft.client.gui.screens.TitleScreen;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(value = TitleScreen.class, priority = 1800, remap = false)
+@IfModLoaded("flashback")
+public class FlashbackReplayIncompatibleModsTitleScreenMixin {
+    @TargetHandler(mixin = "com.moulberry.flashback.mixin.ui.MixinTitleScreen", name = "createOrPositionOpenSelectReplayScreenButton")
+    @ModifyArg(method = "@MixinSquared:Handler", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/chat/Component;translatable(Ljava/lang/String;)Lnet/minecraft/network/chat/MutableComponent;"))
+    private static String modifyWarning(String key) {
+        return "winterssummerfixes.flashback.incompatible_with_recording_description";
+    }
+}

…nt/LimitsGrappleInGameHudColorMixin.java …le/LimitsGrappleInGameHudColorMixin.javasrc/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/LimitsGrappleInGameHudColorMixin.java renamed to src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/limitsgrapple/LimitsGrappleInGameHudColorMixin.java src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/LimitsGrappleInGameHudColorMixin.java renamed to src/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/limitsgrapple/LimitsGrappleInGameHudColorMixin.java

@@ -1,4 +1,4 @@
-package one.devos.nautical.winterssummerfixes.mixin.compat.client;
+package one.devos.nautical.winterssummerfixes.mixin.compat.client.limitsgrapple;
 
 import com.bawnorton.mixinsquared.TargetHandler;
 import net.minecraft.client.gui.Gui;

src/main/kotlin/one/devos/nautical/winterssummerfixes/WintersSummerFixes.kt

@@ -3,6 +3,11 @@ package one.devos.nautical.winterssummerfixes
 import eu.midnightdust.lib.config.MidnightConfig
 import gay.asoji.fmw.FMW
 import net.fabricmc.api.ModInitializer
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper
+import net.fabricmc.fabric.api.resource.ResourcePackActivationType
+import net.fabricmc.loader.api.FabricLoader
+import net.minecraft.network.chat.Component
+import net.minecraft.resources.ResourceLocation
 import one.devos.nautical.winterssummerfixes.config.Config
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

src/main/kotlin/one/devos/nautical/winterssummerfixes/client/WintersSummerFixesClient.kt

@@ -16,5 +16,12 @@ object WintersSummerFixesClient : ClientModInitializer {
             Component.literal("Alt Raccoon Trinket Texture"),
             ResourcePackActivationType.NORMAL
         )
+
+        ResourceManagerHelper.registerBuiltinResourcePack(
+            ResourceLocation.fromNamespaceAndPath(WintersSummerFixes.MOD_ID, "flashbacklang"),
+            FabricLoader.getInstance().getModContainer(WintersSummerFixes.MOD_ID).get(),
+            Component.literal("Flashback Warning Override"),
+            ResourcePackActivationType.ALWAYS_ENABLED
+        )
     }
 }

src/main/resources/assets/flashback/lang/en_us.json

@@ -2,5 +2,10 @@
   "winterssummerfixes.midnightconfig.title": "Winter's Summer Fixes",
   "winterssummerfixes.midnightconfig.limitsGrapple" : "Limits' Grapple",
   "winterssummerfixes.midnightconfig.limitsGrappleHitColor": "Hit Color",
-  "winterssummerfixes.midnightconfig.limitsGrappleMissColor": "Miss Color"
+  "winterssummerfixes.midnightconfig.limitsGrappleMissColor": "Miss Color",
+
+  "winterssummerfixes.midnightconfig.flashback" : "Flashback",
+  "winterssummerfixes.midnightconfig.flashbackReplayForceAllowIncompatibleModsExtremeWarning" : "§l§4WARNING: §rDO NOT TOUCH THIS SETTING UNLESS YOU KNOW EXACTLY WHAT YOU'RE GETTING YOURSELF INTO.\nFLASHBACK DISABLES THE USAGE OF VIEWING REPLAYS WITH C2ME FOR A VERY GOOD REASON.",
+
+  "winterssummerfixes.flashback.incompatible_with_recording_description": "You have mods which are known to cause issues when recording replays\nPlease go back to the Main Menu screen, Mods, open the Config for Winter's Summer Fixes,\nand enable the Flashback Allow Incompatible Mods in order to\nbe able to view replays.\n\n"
 }