feat: add Mixins for Ribbits and Nitrogen(fabric) #8

Author: gizmo-ds

common/src/main/java/dev/aika/smsn/config/SMSNConfig.java

@@ -17,22 +17,35 @@ public class SMSNConfig extends ModConfig {
     @Comment("❤ Loving " + SMSN.MOD_NAME + " ? Consider supporting development on " + ModConstants.SponsorUrl + " to help keep updates coming! ❤")
     private static final String sponsor = ModConstants.MyCat;
 
+    @LoaderSpecific({LoaderType.NEOFORGE, LoaderType.FABRIC})
     public boolean aetherMoaSkinsFeature = SMSNConfigDefault.aetherMoaSkinsFeature;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean immersiveEngineeringSpecialRevolvers = SMSNConfigDefault.immersiveEngineeringSpecialRevolvers;
+    @LoaderSpecific({LoaderType.NEOFORGE, LoaderType.FABRIC})
     public boolean ipnUpdateCheckAndUserTracking = SMSNConfigDefault.ipnUpdateCheckAndUserTracking;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean petrolparkBadgeCheck = SMSNConfigDefault.petrolparkBadgeCheck;
+    @LoaderSpecific({LoaderType.NEOFORGE, LoaderType.FABRIC})
     public boolean supplementariesCreditsCheck = SMSNConfigDefault.supplementariesCreditsCheck;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean bagusLibSupportersCheck = SMSNConfigDefault.bagusLibSupportersCheck;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean placeboTrails = SMSNConfigDefault.placeboTrails;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean placeboWings = SMSNConfigDefault.placeboWings;
+    @LoaderSpecific(LoaderType.FABRIC)
     public boolean irisUpdateCheck = SMSNConfigDefault.irisUpdateCheck;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean actuallyAdditionsSpecialPeopleStuff = SMSNConfigDefault.actuallyAdditionsSpecialPeopleStuff;
+    @LoaderSpecific({LoaderType.NEOFORGE, LoaderType.FABRIC})
     public boolean exposureGoldenCameraSkin = SMSNConfigDefault.exposureGoldenCameraSkin;
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean titaniumReward = SMSNConfigDefault.titaniumReward;
+    @LoaderSpecific({LoaderType.NEOFORGE, LoaderType.FABRIC})
     public boolean ribbitsSupporterHat = SMSNConfigDefault.ribbitsSupporterHat;
 
     @Category("qol")
-    @LoaderSpecific(LoaderType.FORGE)
+    @LoaderSpecific(LoaderType.NEOFORGE)
     public boolean immersiveCavesDiscordMessage = SMSNConfigDefault.immersiveCavesDiscordMessage;
 
     private static final Jankson JANKSON = Jankson.builder().build();

fabric/build.gradle.kts

@@ -49,6 +49,10 @@ dependencies {
     modImplementation("maven.modrinth:iris:${mod.prop("fabric.iris")}")
     // Exposure
     modCompileOnly("maven.modrinth:exposure:${mod.prop("fabric.exposure")}")
+    // Aether Nitrogen
+    modImplementation("com.aetherteam.nitrogen:nitrogen_internals:${mod.prop("fabric.nitrogen")}")
+    // Ribbits
+    modCompileOnly("maven.modrinth:ribbits:${mod.prop("fabric.ribbits")}")
 
     shadowBundle("blue.endless:jankson:1.2.3")
 

fabric/src/main/java/dev/aika/smsn/fabric/mixin/MixinInfo.java

@@ -16,6 +16,10 @@ public static Map<String, String> getMixinClassNames() {
 
             put("dev.aika.smsn.fabric.mixin.exposure.GildedMixin", "exposure");
             put("dev.aika.smsn.fabric.mixin.exposure.PatreonMixin", "exposure");
+
+            put("dev.aika.smsn.fabric.mixin.ribbits.SupportersJSONMixin", "ribbits");
+
+            put("dev.aika.smsn.fabric.mixin.aetherteam.UserData$ServerMixin", "nitrogen");
         }};
     }
 }

fabric/src/main/java/dev/aika/smsn/fabric/mixin/aetherteam/UserData$ServerMixin.java

@@ -0,0 +1,19 @@
+package dev.aika.smsn.fabric.mixin.aetherteam;
+
+import dev.aika.smsn.SMSN;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+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;
+
+import java.util.UUID;
+
+@Mixin(value = com.aetherteam.nitrogen.api.users.UserData.Server.class, remap = false)
+public abstract class UserData$ServerMixin {
+    @Inject(method = "sendUserRequest", at = @At("HEAD"), cancellable = true)
+    private static void sendUserRequest(MinecraftServer server, ServerPlayer serverPlayer, UUID uuid, CallbackInfo ci) {
+        if (!SMSN.CONFIG.isAetherMoaSkinsFeature()) ci.cancel();
+    }
+}

fabric/src/main/java/dev/aika/smsn/fabric/mixin/ribbits/SupportersJSONMixin.java

@@ -0,0 +1,16 @@
+package dev.aika.smsn.fabric.mixin.ribbits;
+
+import com.yungnickyoung.minecraft.ribbits.client.supporters.SupportersJSON;
+import dev.aika.smsn.SMSN;
+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(value = SupportersJSON.class, remap = false)
+public abstract class SupportersJSONMixin {
+    @Inject(method = "populateSupportersList", at = @At("HEAD"), cancellable = true)
+    private static void populateSupportersList(CallbackInfo ci) {
+        if (!SMSN.CONFIG.isRibbitsSupporterHat()) ci.cancel();
+    }
+}

fabric/src/main/resources/smsn.mixins.json

@@ -8,10 +8,12 @@
     "iris.UpdateCheckerMixin"
   ],
   "mixins": [
+    "aetherteam.UserData$ServerMixin",
     "exposure.GildedMixin",
     "exposure.PatreonMixin",
     "ipn.IPNInfoManager$doCheckVersion$$inlined$timer$default$1Mixin",
     "ipn.IPNInfoManager$doSessionKeepAlive$$inlined$timer$default$1Mixin",
+    "ribbits.SupportersJSONMixin",
     "supplementaries.CreditsMixin"
   ],
   "injectors": {

gradle.properties

@@ -8,7 +8,7 @@ org.gradle.configuration-cache=false
 mod.id=smsn
 mod.name=Save My Shaky Network
 mod.group=dev.aika.smsn
-mod.version=1.2.2
+mod.version=1.2.3
 mod.release_type=release
 mod.enabled_platforms=fabric,neoforge
 # Minecraft properties

neoforge/build.gradle.kts

@@ -27,10 +27,6 @@ repositories {
         name = "NeoForged"
         url = uri("https://maven.neoforged.net/releases")
     }
-    maven {
-        name = "Aether Team"
-        url = uri("https://packages.aether-mod.net/Nitrogen")
-    }
     maven {
         name = "Blueprint"
         url = uri("https://maven.teamabnormals.com")
@@ -99,6 +95,8 @@ dependencies {
     modCompileOnly("maven.modrinth:exposure:${mod.prop("neoforge.exposure")}")
     // Titanium
     modCompileOnly("maven.modrinth:titanium:${mod.prop("neoforge.titanium")}")
+    // Ribbits
+    modCompileOnly("maven.modrinth:ribbits:${mod.prop("neoforge.ribbits")}")
 
     shadowBundle("blue.endless:jankson:1.2.3")
     forgeRuntimeLibrary("blue.endless:jankson:1.2.3")

neoforge/src/main/java/dev/aika/smsn/neoforge/mixin/MixinInfo.java

@@ -34,6 +34,8 @@ public static Map<String, String> getMixinClassNames() {
             put("dev.aika.smsn.neoforge.mixin.exposure.PatreonMixin", "exposure");
 
             put("dev.aika.smsn.neoforge.mixin.titanium.RewardMixin", "titanium");
+
+            put("dev.aika.smsn.neoforge.mixin.ribbits.SupportersJSONMixin", "ribbits");
         }};
     }
 }

neoforge/src/main/java/dev/aika/smsn/neoforge/mixin/ribbits/SupportersJSONMixin.java

@@ -0,0 +1,16 @@
+package dev.aika.smsn.neoforge.mixin.ribbits;
+
+import com.yungnickyoung.minecraft.ribbits.client.supporters.SupportersJSON;
+import dev.aika.smsn.SMSN;
+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(value = SupportersJSON.class, remap = false)
+public abstract class SupportersJSONMixin {
+    @Inject(method = "populateSupportersList", at = @At("HEAD"), cancellable = true)
+    private static void populateSupportersList(CallbackInfo ci) {
+        if (!SMSN.CONFIG.isRibbitsSupporterHat()) ci.cancel();
+    }
+}