Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New mixins 0.8.7, mixinextras 0.4.1, and ASM 9.7.1 #30

Merged
merged 7 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,16 @@ public DummyTransformer() {
* case. We add an extra check here, in a method that gets called right before that log message.</p>
*/
private static void setFmlLoggerToVerbose() {
Logger fmlLog = FMLRelaunchLog.log.getLogger();
if (!(fmlLog instanceof org.apache.logging.log4j.core.Logger)) {
Logger fmlLog;
try {
fmlLog = FMLRelaunchLog.log.getLogger();
if (!(fmlLog instanceof org.apache.logging.log4j.core.Logger)) {
return;
}
} catch (NoClassDefFoundError e) {
return;
}

org.apache.logging.log4j.core.Logger fmlCoreLog = (org.apache.logging.log4j.core.Logger)fmlLog;

if(fmlCoreLog.getLevel() != Level.ALL) {
Expand Down
2 changes: 1 addition & 1 deletion module-gtnhmixins/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ def mixinExtrasVersion = "0.1.1"
configurations.create("shadowMixinExtras")

dependencies {
compileOnly('org.spongepowered:mixin:0.8.5')
compileOnly('org.spongepowered:mixin:0.8.7')
shadow(project(":module-common")) {
transitive = false
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ private Set<String> getLoadedCoremods(List<?> coremodList) {
public void injectData(Map<String, Object> data) {
LOGGER.info("Examining core mod list");
final Object coremodList = data.get("coremodList");

if (coremodList instanceof List) {
final Set<String> loadedCoremods = getLoadedCoremods((List<?>) coremodList);

Expand All @@ -107,7 +107,7 @@ public void injectData(Map<String, Object> data) {
if (theMod instanceof IEarlyMixinLoader) {
final IEarlyMixinLoader loader = (IEarlyMixinLoader)theMod;
final String mixinConfig = loader.getMixinConfig();
final Config config = Config.create(mixinConfig);
final Config config = Config.create(mixinConfig, null);
final List<String> mixins = loader.getMixins(loadedCoremods);
for(String mixin : mixins) {
LOGGER.info("Loading [{}] {}", mixinConfig, mixin);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ private void beforeConstructing(Object[] eventData, CallbackInfo ci) throws Thro
final String mixinConfig = lateLoader.getMixinConfig();
GTNHMixins.LOGGER.info("Adding {} mixin configuration.", mixinConfig);

final Config config = Config.create(mixinConfig);
final Config config = Config.create(mixinConfig, null);
final List<String> mixins = lateLoader.getMixins(loadedMods);
for(String mixin : mixins) {
GTNHMixins.LOGGER.info("Loading [{}] {}", mixinConfig, mixin);
Expand Down Expand Up @@ -125,4 +125,4 @@ private static Set<String> getLiteLoaderMods() {
}
return mods;
}
}
}
12 changes: 6 additions & 6 deletions module-mixin/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
fabricMixinVersion=0.13.1+mixin.0.8.5
unimixMixinVersion=0.13.0+mixin.0.8.5
spongepoweredMixinVersion=0.8.5
gtnhMixinVersion=0.8.5-GTNH-2
gasmixMixinVersion=0.8.5-gasstation_7
fabricMixinVersion=0.15.3+mixin.0.8.7
unimixMixinVersion=0.15.3+mixin.0.8.7
spongepoweredMixinVersion=0.8.7
gtnhMixinVersion=0.8.7-GTNH-2
gasmixMixinVersion=0.8.7-gasstation_7

asmVersion=9.6
asmVersion=9.7.1
2 changes: 1 addition & 1 deletion module-mixinextras/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
mixinExtrasVersion=0.3.5
mixinExtrasVersion=0.4.1
Loading