Skip to content

Commit

Permalink
prevent loading ResourceLocation early
Browse files Browse the repository at this point in the history
  • Loading branch information
Terrails committed Jan 6, 2024
1 parent 86ca321 commit a0cd17f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package terrails.colorfulhearts.fabric;

import net.fabricmc.loader.api.FabricLoader;
import org.apache.logging.log4j.LogManager;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import terrails.colorfulhearts.CColorfulHearts;

import java.util.List;
import java.util.Set;
Expand All @@ -22,10 +22,10 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
String modid = matcher.group(1);
String className = matcher.group(2);
if (FabricLoader.getInstance().isModLoaded(modid)) {
CColorfulHearts.LOGGER.info("Applying mixin {} as mod {} is present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Applying mixin {} as mod {} is present.", className, modid);
return true;
} else {
CColorfulHearts.LOGGER.debug("Skipped applying mixin {} as mod {} is not present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Skipped applying mixin {} as mod {} is not present.", className, modid);
return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package terrails.colorfulhearts.forge;

import net.minecraftforge.fml.loading.LoadingModList;
import org.apache.logging.log4j.LogManager;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import terrails.colorfulhearts.CColorfulHearts;

import java.util.List;
import java.util.Set;
Expand All @@ -22,10 +22,10 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
String modid = matcher.group(1);
String className = matcher.group(2);
if (LoadingModList.get().getModFileById(modid) != null) {
CColorfulHearts.LOGGER.info("Applying mixin {} as mod {} is present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Applying mixin {} as mod {} is present.", className, modid);
return true;
} else {
CColorfulHearts.LOGGER.debug("Skipped applying mixin {} as mod {} is not present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Skipped applying mixin {} as mod {} is not present.", className, modid);
return false;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package terrails.colorfulhearts.neoforge;

import net.neoforged.fml.loading.LoadingModList;
import org.apache.logging.log4j.LogManager;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import terrails.colorfulhearts.CColorfulHearts;

import java.util.List;
import java.util.Set;
Expand All @@ -22,10 +22,10 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
String modid = matcher.group(1);
String className = matcher.group(2);
if (LoadingModList.get().getModFileById(modid) != null) {
CColorfulHearts.LOGGER.info("Applying mixin {} as mod {} is present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Applying mixin {} as mod {} is present.", className, modid);
return true;
} else {
CColorfulHearts.LOGGER.debug("Skipped applying mixin {} as mod {} is not present.", className, modid);
LogManager.getLogger("Colorful Hearts").info("Skipped applying mixin {} as mod {} is not present.", className, modid);
return false;
}
}
Expand Down

0 comments on commit a0cd17f

Please sign in to comment.