Skip to content

Commit

Permalink
New mixins 0.8.7, mixinextras 0.4.1, and ASM 9.7.1 (#30)
Browse files Browse the repository at this point in the history
* UniMix -> 0.15.0+mixin.0.8.7
MixinExtras -> 0.4.0

* maybe fix 1.8+

* GTNHMixins fix

* specify jdk

* rm

* mixin 0.15.3+mixin.0.8.7 and asm 9.7.1

* mixin extras 0.4.1
  • Loading branch information
mitchej123 authored Oct 15, 2024
1 parent 918a80a commit 5fbb67e
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
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

0 comments on commit 5fbb67e

Please sign in to comment.