From 81dcf0180c3cb54fe3778f287f212072c5f3b358 Mon Sep 17 00:00:00 2001 From: Aaron <51387595+AzureAaron@users.noreply.github.com> Date: Sat, 25 Jan 2025 12:58:36 -0500 Subject: Fix JGit using insteadOfs (how?) (#1137) JGit is the gift that keeps on giving... --- .../hysky/skyblocker/mixins/jgit/UrlConfigMixin.java | 19 +++++++++++++++++++ src/main/resources/skyblocker.mixins.json | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/main/java/de/hysky/skyblocker/mixins/jgit/UrlConfigMixin.java diff --git a/src/main/java/de/hysky/skyblocker/mixins/jgit/UrlConfigMixin.java b/src/main/java/de/hysky/skyblocker/mixins/jgit/UrlConfigMixin.java new file mode 100644 index 00000000..e1dc7dfa --- /dev/null +++ b/src/main/java/de/hysky/skyblocker/mixins/jgit/UrlConfigMixin.java @@ -0,0 +1,19 @@ +package de.hysky.skyblocker.mixins.jgit; + +import java.util.Map; + +import org.eclipse.jgit.transport.UrlConfig; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; + +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; + +@Mixin(value = UrlConfig.class, remap = false) +public class UrlConfigMixin { + + @WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Ljava/util/Map;put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;")) + private Object skyblocker$ignoreUrlRedirects(Map map, Object key, Object value, Operation operation) { + return null; + } +} diff --git a/src/main/resources/skyblocker.mixins.json b/src/main/resources/skyblocker.mixins.json index 20ef3807..2c0ff922 100644 --- a/src/main/resources/skyblocker.mixins.json +++ b/src/main/resources/skyblocker.mixins.json @@ -63,7 +63,8 @@ "accessors.SlotAccessor", "accessors.WorldRendererAccessor", "discordipc.ConnectionMixin", - "jgit.SystemReaderMixin" + "jgit.SystemReaderMixin", + "jgit.UrlConfigMixin" ], "injectors": { "defaultRequire": 1 -- cgit