Skip to content

Commit b176c4e

Browse files
committed
πŸ’š shut the fuck up
1 parent a5e6b2a commit b176c4e

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

β€ŽREADME.mdβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Some fixes done for the Winter's Summer modpack.
44

55
## Fixes [so far]
66
- Allow the Grappling Hook from Limits' Grapple fork to have Durability-based enchantments [Unbreaking, Mending, etc]
7+
- Allow Flashback's replayer viewer to work with incompatible mods [VMP, C2ME] via config [thank you IThundxr for helping with this mixin]
78

89
## Additions
910
- Raccoon trinkets slot for Raccoons & Rabies [thanks Cartrigger for the idea]
1011
- also thanks Cartrigger for the Normal and Alternative slot texture for the Raccoon Slot
11-
- Be able to change the Grappling Hook's HUD color through the Winter's Summer Fixes config
12+
- Be able to change the Grappling Hook's HUD color through the config

β€Žbuild.gradle.ktsβ€Ž

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ dependencies {
4444
include(modImplementation(libs.midnightlib.get())!!)
4545

4646
// modImplementation(files("localLibs/centered-crosshair+1.21-1.0.8.jar"))
47-
modImplementation(files("localLibs/limits_grapple-0.7.3-1.21.1.jar"))
48-
modImplementation(files("localLibs/trinkets-3.10.0.jar"))
49-
modImplementation(files("localLibs/Flashback-0.36.0-for-MC1.21.1.jar"))
50-
modImplementation(files("localLibs/lattice-1.2.10.jar"))
47+
// modImplementation(files("localLibs/limits_grapple-0.7.3-1.21.1.jar"))
48+
// modImplementation(files("localLibs/lattice-1.2.10.jar"))
5149

5250
include(modImplementation(libs.fmw.get())!!) // just to avoid the basic long metadata calls
5351
include(implementation(annotationProcessor(libs.mixinsquared.get())!!)!!)

β€Žgradle/libs.versions.tomlβ€Ž

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ mixinconstraints = "1.0.9"
99
mixinsquared = "0.3.3"
1010
modmenu = "11.0.3"
1111
sodium = "mc1.21.1-0.6.13-fabric"
12+
flashback = "0.36.0"
13+
trinkets = "3.10.0"
1214

1315
[libraries]
1416
fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric_api" }
@@ -21,10 +23,12 @@ mixinsquared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-fabric
2123
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
2224
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
2325
sodium = { module = "maven.modrinth:sodium", version.ref = "sodium" }
26+
flashback = { module = "maven.modrinth:flashback", version.ref = "flashback" }
27+
trinkets = { module = "maven.modrinth:trinkets", version.ref = "trinkets" }
2428

2529
[bundles]
2630
dev_mods = [ "sodium", "modmenu" ]
27-
dependencies = [ "midnightlib" ]
31+
dependencies = [ "midnightlib", "flashback", "trinkets" ]
2832

2933
[plugins]
3034
grgit = { id = "org.ajoberstar.grgit", version = "5.2.2"}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import java.util.List;
1717
import java.util.Objects;
1818

19-
@IfModLoaded("flashback")
2019
@Mixin(value = Flashback.class, priority = 1800, remap = false)
20+
@IfModLoaded("flashback")
2121
public class FlashbackReplayIncompatibleModsMixin {
2222
@Unique
2323
private static void playRoombaSound(SoundManager handler) {

β€Žsrc/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/limitsgrapple/LimitsGrappleInGameHudColorMixin.javaβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package one.devos.nautical.winterssummerfixes.mixin.compat.client.limitsgrapple;
22

33
import com.bawnorton.mixinsquared.TargetHandler;
4+
import com.moulberry.mixinconstraints.annotations.IfModLoaded;
45
import net.minecraft.client.gui.Gui;
56
import net.minecraft.util.FastColor;
67
import one.devos.nautical.winterssummerfixes.config.Config;
@@ -12,6 +13,7 @@
1213

1314
@SuppressWarnings("MixinAnnotationTarget")
1415
@Mixin(value = Gui.class, priority = 1050)
16+
@IfModLoaded("limits_grapple")
1517
public class LimitsGrappleInGameHudColorMixin {
1618
@TargetHandler(mixin = "io.github.moonlight_maya.limits_grapple.mixin.render.InGameHudMixin", name = "limits_grapple$drawHitResult")
1719
@ModifyArgs(method = "@MixinSquared:Handler", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;setColor(FFFF)V", ordinal = 0))

0 commit comments

Comments
Β (0)