Skip to content

Commit f38d1c1

Browse files
committed
1.3.2
- Add warnIngame MixinConfig option thanks to PR by Nischhelm - Swap to shadow modified Mixin 0.8.7 (https://github.com/fonnymunkey/SpongeMixin) (This is just a patch to merge SpongePowered/Mixin#678 which fixes compatibility with old mods that normally may require the usage of MixinCompat, will be swapped back to mainline once 0.8.8 releases) - Remove forced mixin config additions as it is no longer needed with above - Update MixinExtras to 0.5.0 Release (https://github.com/LlamaLad7/MixinExtras/releases/tag/0.5.0) - Shadow MixinSquared 0.3.3 Release (https://github.com/Bawnorton/MixinSquared/releases/tag/0.3.3) (Note: I have not yet had to use MixinSquared myself so YMMV)
1 parent dd7b26a commit f38d1c1

File tree

5 files changed

+25
-29
lines changed

5 files changed

+25
-29
lines changed

build.gradle

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
url = 'https://repo.spongepowered.org/maven'
88
}
99
maven {
10-
url "https://plugins.gradle.org/m2/"
10+
url = "https://plugins.gradle.org/m2/"
1111
}
1212
mavenCentral()
1313
}
@@ -35,13 +35,29 @@ minecraft {
3535

3636
sourceSets.main.resources { srcDir 'src/generated/resources' }
3737

38+
repositories {
39+
maven {
40+
url = "https://maven.bawnorton.com/releases"
41+
}
42+
flatDir {
43+
dirs 'libs\\'
44+
}
45+
mavenCentral()
46+
}
47+
3848
dependencies {
3949
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
4050

41-
shadow 'io.github.llamalad7:mixinextras-common:0.4.1'
51+
//https://github.com/fonnymunkey/SpongeMixin
52+
//Temporarily shadow patched version of 0.8.7 that fixes compat with old mods, return to mainline when 0.8.8 merges https://github.com/SpongePowered/Mixin/pull/678
53+
shadow files('libs/mixin-0.8.7.jar')
54+
annotationProcessor files('libs/mixin-0.8.7-processor.jar')
55+
56+
shadow 'io.github.llamalad7:mixinextras-common:0.5.0'
57+
annotationProcessor 'io.github.llamalad7:mixinextras-common:0.5.0'
4258

43-
shadow 'org.spongepowered:mixin:0.8.7'
44-
annotationProcessor 'org.spongepowered:mixin:0.8.7:processor'
59+
shadow 'com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3'
60+
annotationProcessor 'com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.3'
4561
}
4662

4763
mixin {

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
mod_id=fermiumbooter
22
mod_name=FermiumBooter
3-
mod_version=1.3.1
3+
mod_version=1.3.2
44
mod_author=["fonnymunkey"]
55
mod_description=Simplistic mixin mod utility to apply toggle-able mixins to both early and late loaded classes
66

src/main/java/fermiumbooter/FermiumBooter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class FermiumBooter {
1111

1212
public static final String MODID = "fermiumbooter";
13-
public static final String VERSION = "1.3.1";
13+
public static final String VERSION = "1.3.2";
1414
public static final String NAME = "FermiumBooter";
1515

1616
@SidedProxy(clientSide = "fermiumbooter.proxy.ClientProxy", serverSide = "fermiumbooter.proxy.CommonProxy")

src/main/java/fermiumbooter/config/FermiumBooterConfig.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ public class FermiumBooterConfig {
2222
@Config.RequiresMcRestart
2323
public static boolean overrideMixinCompatibilityChecks = false;
2424

25-
@Config.Comment("Mixin config json files to forcibly early enqueue, to allow for simple compatibility with older mods that fail to enqueue their mixins")
26-
@Config.Name("Forced Early Mixin Config Additions")
27-
@Config.RequiresMcRestart
28-
public static String[] forcedEarlyMixinConfigAdditions = {};
29-
3025
@Config.Comment("Mixin config json files to forcibly remove from FermiumBooter enqueue")
3126
@Config.Name("Forced Early Mixin Config Removals")
3227
@Config.RequiresMcRestart

src/main/java/fermiumbooter/util/ForcedConfigHandler.java

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import fermiumbooter.FermiumPlugin;
44
import fermiumbooter.FermiumRegistryAPI;
55
import org.apache.logging.log4j.Level;
6-
import org.spongepowered.asm.mixin.Mixins;
76

87
import java.io.File;
98
import java.nio.file.Files;
@@ -13,40 +12,32 @@
1312

1413
public abstract class ForcedConfigHandler {
1514

16-
private static int forcedMixinConfigCount = 0;
1715
private static int removedMixinConfigCount = 0;
1816

1917
public static void handleForcedMixinConfigs() {
2018
FermiumPlugin.LOGGER.log(Level.INFO, "FermiumBooter beginning forced mixin config handling.");
2119
parseForcedMixinConfig();
22-
FermiumPlugin.LOGGER.log(Level.INFO, "FermiumBooter finished forced mixin config handling, enqueued {} mixin configs, removed {} mixin configs.", forcedMixinConfigCount, removedMixinConfigCount);
20+
FermiumPlugin.LOGGER.log(Level.INFO, "FermiumBooter finished forced mixin config handling, removed {} mixin configs.", removedMixinConfigCount);
2321
}
2422

2523
private static void parseForcedMixinConfig() {
2624
//Read config file
2725
File configFile = new File("config", "fermiumbooter.cfg");
28-
List<String> forcedAdds = new ArrayList<>();
2926
List<String> forcedRemoves = new ArrayList<>();
3027
if(configFile.exists() && configFile.isFile()) {
3128
try(Stream<String> stream = Files.lines(configFile.toPath())) {
3229
//Gross but im lazy
33-
final boolean[] parsingAdd = {false};
3430
final boolean[] parsingRemove = {false};
3531
stream.forEachOrdered(s -> {
3632
//weee
3733
String st = s.trim();
3834
if(!st.isEmpty()) {
39-
if(parsingAdd[0]) {
40-
if(st.contains(".json")) forcedAdds.add(st);
41-
else parsingAdd[0] = false;
42-
}
43-
else if(parsingRemove[0]) {
35+
if(parsingRemove[0]) {
4436
if(st.contains(".json")) forcedRemoves.add(st);
4537
else parsingRemove[0] = false;
4638
}
4739
else {
48-
if(st.contains("S:\"Forced Early Mixin Config Additions\"")) parsingAdd[0] = true;
49-
else if(st.contains("S:\"Forced Early Mixin Config Removals\"")) parsingRemove[0] = true;
40+
if(st.contains("S:\"Forced Early Mixin Config Removals\"")) parsingRemove[0] = true;
5041
}
5142
}
5243
});
@@ -59,12 +50,6 @@ else if(parsingRemove[0]) {
5950
FermiumPlugin.LOGGER.log(Level.INFO, "FermiumBooter config missing, assuming first launch.");
6051
}
6152

62-
for(String add : forcedAdds) {
63-
forcedMixinConfigCount++;
64-
FermiumPlugin.LOGGER.log(Level.INFO, "FermiumBooter parsed \"{}\" for forced early mixin enqueue, adding.", add);
65-
//Add directly with null source to force default environment fallback for catching older mod crashes
66-
Mixins.addConfiguration(add, null);
67-
}
6853
for(String remove : forcedRemoves) {
6954
removedMixinConfigCount++;
7055
FermiumRegistryAPI.removeMixin(remove);

0 commit comments

Comments
 (0)