Skip to content

Commit bf07ca7

Browse files
authored
Fix built-in MixinBooter & Bump dependencies (#20)
* Fixup internal mixinbooter * Bump MixinExtras to 0.5.0-rc.2 and remove Caffeine * Configurable mixinbooter version There is no guarantee that mods will work after changing the version * Update SpecialSource to 1.11.5 * [ci skip] Remove outdated description
1 parent eb0608e commit bf07ca7

File tree

4 files changed

+5
-9
lines changed

4 files changed

+5
-9
lines changed

FIXED_UPSTREAM_ISSUES.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88

99
- Some mod explosions cannot be handled by Bukkit plugins(e.g. Tinkers' Construct EFLN)
1010

11-
### Mods
12-
13-
- Simple Difficulty(And any other similar mods) thirst is not getting reset on player respawn[(Luohuayu/CatServer#536)](https://github.com/Luohuayu/CatServer/issues/536)[(MohistMC/Mohist#2905)](https://github.com/MohistMC/Mohist/issues/2905)
14-
1511
## More
1612

1713
- It is recommended to install [HybridFix](https://github.com/HaHaWTH/HybridFix), which aims to improve Forge+Bukkit compatibility and fix behaviour inconsistencies.

build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ project(':cleanroom') {
488488

489489
// Mixin
490490
installer 'com.cleanroommc:sponge-mixin:0.16.0+mixin.0.8.5'
491-
installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.3.5')
491+
installer annotationProcessor('io.github.llamalad7:mixinextras-common:0.5.0-rc.2')
492492

493493
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.10.1'
494494
testImplementation 'org.junit.vintage:junit-vintage-engine:5.10.1'
@@ -498,7 +498,7 @@ project(':cleanroom') {
498498
// CatServer
499499
installer 'com.googlecode.json-simple:json-simple:1.1.1'
500500
installer 'org.yaml:snakeyaml:1.19'
501-
installer 'net.md-5:SpecialSource:1.11.4'
501+
installer 'net.md-5:SpecialSource:1.11.5'
502502
installer 'net.md-5:bungeecord-chat:1.16-R0.4'
503503
installer 'commons-lang:commons-lang:2.6' // Is needed for plugin compatibility
504504
installer 'org.xerial:sqlite-jdbc:3.21.0.1'
@@ -508,7 +508,6 @@ project(':cleanroom') {
508508
installer 'net.openhft:affinity:3.23.3'
509509
installer 'org.slf4j:slf4j-api:2.1.0-alpha1' // Affinity
510510
installer 'org.slf4j:slf4j-simple:2.1.0-alpha1' // Affinity
511-
installer 'com.github.ben-manes.caffeine:caffeine:3.1.8'
512511

513512
/*
514513
forgeGradleMcDeps

src/main/java/net/minecraftforge/fml/common/MixinContainer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
import com.google.common.eventbus.EventBus;
44

55
public final class MixinContainer extends DummyModContainer{
6+
private static final String version = System.getProperty("cleanroom.mixinbooter.version", "10.1");
67
public MixinContainer() {
78
super(new ModMetadata());
89
ModMetadata meta = this.getMetadata();
910
meta.modId = "mixinbooter";
1011
meta.name = "MixinBooter";
1112
meta.description = "A Mixin library and loader.";
12-
meta.version = "10.0";
13+
meta.version = version;
1314
meta.authorList.add("Rongmario");
1415
}
1516

src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
public class CoreModManager {
7575
private static final Attributes.Name COREMODCONTAINSFMLMOD = new Attributes.Name("FMLCorePluginContainsFMLMod");
7676
private static final Attributes.Name MODTYPE = new Attributes.Name("ModType");
77-
private static String[] rootPlugins = { "net.minecraftforge.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin", "catserver.server.CatCorePlugin" };
77+
private static String[] rootPlugins = { "net.minecraftforge.fml.relauncher.FMLCorePlugin", "net.minecraftforge.classloading.FMLForgePlugin", "catserver.server.CatCorePlugin", "net.minecraftforge.fml.relauncher.MixinBooterPlugin" };
7878
private static List<String> ignoredModFiles = Lists.newArrayList();
7979
private static Map<String, List<String>> transformers = Maps.newHashMap();
8080
private static List<FMLPluginWrapper> loadPlugins;

0 commit comments

Comments
 (0)