From 018fc3e22cdb5b298fdd31d88a70f0ab66389959 Mon Sep 17 00:00:00 2001 From: dima_dencep Date: Fri, 8 Dec 2023 23:17:14 +0700 Subject: [PATCH] grfhrteyjytjye --- .../coderbot/iris/mixin/texture/pbr/MixinDirectoryLister.java | 4 ++++ .../iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/coderbot/iris/mixin/texture/pbr/MixinDirectoryLister.java b/src/main/java/net/coderbot/iris/mixin/texture/pbr/MixinDirectoryLister.java index abfb64b112..31af51028d 100644 --- a/src/main/java/net/coderbot/iris/mixin/texture/pbr/MixinDirectoryLister.java +++ b/src/main/java/net/coderbot/iris/mixin/texture/pbr/MixinDirectoryLister.java @@ -21,6 +21,10 @@ public class MixinDirectoryLister { @Final private String idPrefix; + /** + * @author Asek3 + * @reason ModifyArgs on forge + */ @Overwrite public void run(ResourceManager resourceManager, SpriteSource.Output output) { FileToIdConverter fileToIdConverter = new FileToIdConverter("textures/" + sourcePath, ".png"); diff --git a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java index 60b516d89a..1042462b47 100644 --- a/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java +++ b/src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/mixin/IrisSodiumCompatMixinPlugin.java @@ -1,6 +1,6 @@ package net.coderbot.iris.compat.sodium.mixin; -import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.fml.loading.LoadingModList; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; @@ -19,7 +19,7 @@ public class IrisSodiumCompatMixinPlugin implements IMixinConfigPlugin { @Override public void onLoad(String mixinPackage) { - isRubidiumLoaded = FMLLoader.getLoadingModList().getModFileById("rubidium") != null; + isRubidiumLoaded = LoadingModList.get().getModFileById("rubidium") != null; } @Override