mirror of
https://github.com/LegacyModdingMC/UniMixins.git
synced 2026-10-26 14:34:00 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 danyadev
|
93d8ebf6c6 | ||
|
Roadhog360
|
4ed4fde3cf | ||
|
danyadev
|
c47090bcae | ||
|
ah-OOG-ah
|
b7e3384ceb | ||
|
danyadev
|
c5c5cbeca1 | ||
|
danyadev
|
6e8f572f7e | ||
|
ah-OOG-ah
|
e60b681529 | ||
|
ah-OOG-ah
|
0ef643d32f | ||
|
ah-OOG-ah
|
cb08fbd2f1 | ||
|
rjnasers
|
6a6265993e | ||
|
Jason Mitchell
|
dbf46b5445 | ||
|
FalsePattern
|
84aabd1c6c | ||
|
Alexdoru
|
4cf9abd071 |
No files matched your search
@@ -15,11 +15,6 @@ LICENSE: LGPLv3
|
||||
Directory: module-mixinbooterlegacy
|
||||
LICENSE: LGPLv2.1
|
||||
|
||||
## GasStation
|
||||
|
||||
Directory: module-gasstation
|
||||
LICENSE: LGPLv3+SNEED
|
||||
|
||||
## GTNHMixins
|
||||
|
||||
Directory: module-gtnhmixins
|
||||
|
||||
@@ -61,10 +61,7 @@ All modules depend on the Mixin module. Note that the dependents don't necessari
|
||||
* **SpongeMixins** <sup>[1.7.10 only]</sup>: Provides an emulation of [SpongeMixins](https://github.com/GTNewHorizons/SpongeMixins)'s extras.
|
||||
* **MixinBooterLegacy** <sup>[1.7.10 only]</sup>: Provides an emulation of [MixinBooterLegacy](https://github.com/tox1cozZ/mixin-booter-legacy)'s extras, and a relocated MixinExtras.
|
||||
* **MixinExtras**: Provides [MixinExtras](https://github.com/LlamaLad7/MixinExtras).
|
||||
* **GasStation** <sup>[1.7.10 only]</sup>: Provides an emulation of [GasStation](https://github.com/FalsePattern/GasStation)'s extras.
|
||||
* Depends on SpongeMixins.
|
||||
* Depends on MixinBooterLegacy.
|
||||
* Depends on MixinExtras
|
||||
* ~~**GasStation**~~ <sup>[1.7.10 only]</sup>: Deprecated in 0.1.23; removed in 0.2.0.
|
||||
* **GTNHMixins** <sup>[1.7.10 only]</sup>: Provides an emulation of [GTNHMixins](https://github.com/GTNewHorizons/GTNHMixins)'s extras, and a relocated MixinExtras.
|
||||
* Depends on SpongeMixins.
|
||||
* **Compat**: Various compatibility tweaks:
|
||||
@@ -82,7 +79,6 @@ These are not included in releases, they mainly exist for testing purposes. (Not
|
||||
|
||||
* **Mixin (SpongePowered)**: Provides [the upstream fork](https://github.com/SpongePowered/Mixin) of Mixin.
|
||||
* **Mixin (Fabric)**: Provides [the Fabric fork](https://github.com/FabricMC/Mixin) of Mixin.
|
||||
* **Mixin (GasMix)**: Provides [the GasStation fork](https://github.com/FalsePattern/GasMix) of Mixin.
|
||||
* **Mixin (GTNH)**: Provides [the GTNH fork](https://github.com/GTNewHorizons/SpongePoweredMixin) of Mixin.
|
||||
|
||||
## FAQ
|
||||
@@ -99,8 +95,8 @@ The Fabric fork of Mixin is more actively maintained than the upstream fork, and
|
||||
|
||||
### What do the "extras" do anyway?
|
||||
|
||||
* SpongeMixins, Grimoire, MixinBooterLegacy, GasStation and GTNHMixins offer various ways to let you mix into the classes of non-coremods. (This is something Mixin does not natively support, since all of its phases occur before Forge discovers non-coremods and puts them on the classpath.)
|
||||
- **MixinBooterLegacy**, **GasStation** and **GTNHMixins** add a "late" mixin phase that is fired right before the first mod construction event is dispatched. At this point all mods have been discovered.
|
||||
* SpongeMixins, Grimoire, MixinBooterLegacy, and GTNHMixins offer various ways to let you mix into the classes of non-coremods. (This is something Mixin does not natively support, since all of its phases occur before Forge discovers non-coremods and puts them on the classpath.)
|
||||
- **MixinBooterLegacy** and **GTNHMixins** add a "late" mixin phase that is fired right before the first mod construction event is dispatched. At this point all mods have been discovered.
|
||||
- **SpongeMixins** lets you manually add mods to the classpath early using their file names. An old, hacky solution.
|
||||
- We recommend new mods to use **GTNHMixins** as it's the most actively used and maintained option.
|
||||
* **Mixingasm** fixes [a Mixin issue](https://github.com/SpongePowered/Mixin/issues/309) that breaks some ASM transformers due to Mixin altering how they are called.
|
||||
|
||||
+9
-10
@@ -13,7 +13,7 @@ buildscript {
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.11'
|
||||
classpath 'com.anatawa12.forge:ForgeGradle:1.2-1.1.+'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,14 +43,14 @@ allprojects {
|
||||
maven {
|
||||
url = "https://mvn.falsepattern.com/releases"
|
||||
}
|
||||
maven {
|
||||
name = "GTNH Maven"
|
||||
url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
|
||||
allowInsecureProtocol = true
|
||||
}
|
||||
maven {
|
||||
url 'https://jitpack.io'
|
||||
}
|
||||
maven {
|
||||
name = "GTNH Maven"
|
||||
url = "https://nexus.gtnewhorizons.com/"
|
||||
}
|
||||
maven {
|
||||
name = "GTNH Maven (Third-Party)"
|
||||
url = "https://nexus.gtnewhorizons.com/repository/thirdparty"
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "${project.rootDir}/buildscript/forge-1.7.gradle"
|
||||
@@ -124,7 +124,6 @@ allprojects {
|
||||
if (System.getenv("MAVEN_USER") != null) {
|
||||
maven {
|
||||
url = System.getenv("MAVEN_URL")
|
||||
allowInsecureProtocol = System.getenv("MAVEN_URL").startsWith("http://") // Mostly for the GTNH maven
|
||||
credentials {
|
||||
username = System.getenv("MAVEN_USER") ?: "NONE"
|
||||
password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
|
||||
|
||||
+15
-15
@@ -1,18 +1,18 @@
|
||||
| | SpongeMixins | Grimoire | MBL | GasStation | GTNHMixins | UniMixins |
|
||||
| -- | -- | -- | -- | -- | -- | -- |
|
||||
| Mixin 0.7 | ✅ (0.7.11/0.7.12) | ✅ (0.7.11) | | ✴️ (Partial compat) | | ✴️ (Partial compat) |
|
||||
| Mixin 0.8 | | | ✅ (0.8.2) | ✅ (0.8.5-GasMix) | ✅ (0.8.5-GTNH) | ✅ (0.8.5-UniMix)
|
||||
| ASM (legacy package) | ✅ (5.2) | ✅ (5.2) | | ✅ (5.2) | | ✅ (9.4) |
|
||||
| ASM (relocated) | | | ✅ (5.2) | | ✅ (9.4) | ✴️ (Emulated) |
|
||||
| SpongeMixins extras | ✅ | | | ✅ | ✅ | ✅ |
|
||||
| Grimoire extras | | ✅ | | | | |
|
||||
| MixinBooterLegacy extras | | | ✅ | ✅ | | ✅ |
|
||||
| GasStation extras <sup>[NOP]</sup> | | | | ✅ | | ✅ |
|
||||
| MixinExtras (upstream package) | | | | ✅ | | ✅ |
|
||||
| MixinExtras (MixinBooterLegacy package) | | | ✅ | | | ✅ |
|
||||
| MixinExtras (GTNH package) | | | | | ✅ | ✅ |
|
||||
| GTNHMixins extras | | | | | ✅ | ✅ |
|
||||
| Mixingasm <sup>[SEP]</sup> | | | | ✅ | | ✅ |
|
||||
| | SpongeMixins | Grimoire | MBL | GasStation | GTNHMixins | UniMixins |
|
||||
|-----------------------------------------|-------------------|------------|-----------|---------------------|----------------|---------------------|
|
||||
| Mixin 0.7 | ✅ (0.7.11/0.7.12) | ✅ (0.7.11) | | ✴️ (Partial compat) | | ✴️ (Partial compat) |
|
||||
| Mixin 0.8 | | | ✅ (0.8.2) | ✅ (0.8.5-GasMix) | ✅ (0.8.5-GTNH) | ✅ (0.8.5-UniMix) |
|
||||
| ASM (legacy package) | ✅ (5.2) | ✅ (5.2) | | ✅ (5.2) | | ✅ (9.4) |
|
||||
| ASM (relocated) | | | ✅ (5.2) | | ✅ (9.4) | ✴️ (Emulated) |
|
||||
| SpongeMixins extras | ✅ | | | ✅ | ✅ | ✅ |
|
||||
| Grimoire extras | | ✅ | | | | |
|
||||
| MixinBooterLegacy extras | | | ✅ | ✅ | | ✅ |
|
||||
| GasStation extras <sup>[NOP]</sup> | | | | ✅ | | Removed in 0.2.0 |
|
||||
| MixinExtras (upstream package) | | | | ✅ | | ✅ |
|
||||
| MixinExtras (MixinBooterLegacy package) | | | ✅ | | | ✅ |
|
||||
| MixinExtras (GTNH package) | | | | | ✅ | ✅ |
|
||||
| GTNHMixins extras | | | | | ✅ | ✅ |
|
||||
| Mixingasm <sup>[SEP]</sup> | | | | ✅ | | ✅ |
|
||||
|
||||
* <sup>[NOP]</sup>: Module does not do anything. [(issue)](https://github.com/FalsePattern/GasStation/issues/15)
|
||||
* <sup>[SEP]</sup>: Module is available as a separate mod.
|
||||
@@ -1,5 +1,9 @@
|
||||
# Developer usage
|
||||
|
||||
To publish a release, you must publish a **draft release** (not pre-release) on GitHub. Make sure to create a tag (or pick the latest one if you screwed up the release), autogenerate (or manually write, I suppose) the description, and set it as the latest release.
|
||||
|
||||
If that doesn't get the GH action to build the mod, attach it to the release, and mark it un-draft, please figure out what broke and correct this section.
|
||||
|
||||
An example mod showcasing the mod's various features is available in the `example-*` branches of the repo:
|
||||
- [`example-fg-g4`](https://github.com/LegacyModdingMC/UniMixins/tree/example-fg-g4) - ForgeGradle-based build script with Gradle 4
|
||||
- [`example-fg-g6`](https://github.com/LegacyModdingMC/UniMixins/tree/example-fg-g6) - ForgeGradle-based build script with Gradle 6
|
||||
@@ -24,7 +28,6 @@ dependencies {
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-compat-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-spongemixins-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-mixinbooterlegacy-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-gasstation-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-mixinextras-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-gtnhmixins-1.7.10:$unimixinsVersion:dev")
|
||||
implementation("com.github.LegacyModdingMC.UniMixins:unimixins-mixingasm-1.7.10:$unimixinsVersion:dev")
|
||||
@@ -40,7 +43,6 @@ And here's how you depend on the Very Optional modules (not published on Jitpack
|
||||
```gradle
|
||||
//implementation("io.github.legacymoddingmc.unimixins:unimixins-mixin-1.7.10-spongepowered:$unimixinsVersion")
|
||||
//implementation("io.github.legacymoddingmc.unimixins:unimixins-mixin-1.7.10-fabric:$unimixinsVersion")
|
||||
//implementation("io.github.legacymoddingmc.unimixins:unimixins-mixin-1.7.10-gasmix:$unimixinsVersion")
|
||||
//implementation("io.github.legacymoddingmc.unimixins:unimixins-mixin-1.7.10-gtnh:$unimixinsVersion")
|
||||
```
|
||||
|
||||
|
||||
@@ -23,16 +23,6 @@ All test cases assume default configs for mods.
|
||||
* ❔ MixinExtras (MixinBooterLegacy package name)
|
||||
* No mods are known to use this.
|
||||
|
||||
* [x] GasStation
|
||||
* [x] Mod annotation
|
||||
* [x] [RightProperGUIScale 2.1.0](https://github.com/basdxz/RightProperGUIScale/releases/download/2.1.0/RightProperGUIScale-mc1.7.10-2.1.0.jar) + [FalsePatternLib 0.11.4](https://github.com/FalsePattern/FalsePatternLib/releases/download/0.11.4/falsepatternlib-mc1.7.10-0.11.4.jar)
|
||||
* [x] GUI Scale slider can be set to fractional values.
|
||||
* The mod hard depends on GasStation in [its mod annotation](https://github.com/basdxz/RightProperGUIScale/blob/a14814a00f7f360491f72367c40fcb31341abf7e/src/main/java/com/github/basdxz/rightproperguiscale/Tags.java#L17).
|
||||
* ❔ Early loader
|
||||
* No mods are known to use this.
|
||||
* ❔ Late loader
|
||||
* No mods are known to use this.
|
||||
|
||||
* [x] MixinExtras
|
||||
* ❔ MixinExtras (upstream package name)
|
||||
* No mods are known to use this.
|
||||
|
||||
@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
archivesBaseName = archivesBaseName.replace("-1.7.10", "-all-1.7.10")
|
||||
|
||||
// The order of these determines the order embedded core plugins get initialized in
|
||||
ext.moduleNames = ["module-mixin", "module-compat", "module-mixingasm", "module-spongemixins", "module-mixinbooterlegacy", "module-gasstation", "module-gtnhmixins", "module-mixinextras"]
|
||||
ext.moduleNames = ["module-mixin", "module-compat", "module-mixingasm", "module-spongemixins", "module-mixinbooterlegacy", "module-gtnhmixins", "module-mixinextras"]
|
||||
|
||||
def getJarTaskName(name, classifier) {
|
||||
if(name == "module-mixin") {
|
||||
@@ -147,7 +147,7 @@ tasks.withType(ShadowJar) {
|
||||
'FMLCorePluginContainsFMLMod': true,
|
||||
'ForceLoadAsMod': true,
|
||||
'FMLCorePlugin': 'io.github.legacymoddingmc.unimixins.all.AllCore',
|
||||
'MixinConfigs': 'mixins.gtnhmixins.json,mixins.gasstation.json,mixins.gtnhmixins.json,mixingasm.mixin.json',
|
||||
'MixinConfigs': 'mixins.gtnhmixins.json,mixingasm.init.mixin.json,mixingasm.mixin.json',
|
||||
'Premain-Class': 'org.spongepowered.tools.agent.MixinAgent',
|
||||
'Agent-Class': 'org.spongepowered.tools.agent.MixinAgent',
|
||||
'Can-Redefine-Classes': true,
|
||||
|
||||
+70
-71
@@ -2,7 +2,6 @@ package io.github.legacymoddingmc.unimixins.compat.asm;
|
||||
|
||||
import static io.github.legacymoddingmc.unimixins.compat.CompatCore.LOGGER;
|
||||
|
||||
import com.google.common.primitives.Bytes;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
@@ -10,13 +9,11 @@ import org.objectweb.asm.ClassReader;
|
||||
import org.objectweb.asm.ClassWriter;
|
||||
import org.objectweb.asm.commons.Remapper;
|
||||
import org.objectweb.asm.commons.RemappingClassAdapter;
|
||||
import org.objectweb.asm.tree.AnnotationNode;
|
||||
import org.objectweb.asm.tree.ClassNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* <p>The ASM package name used by Mixin differs between mixin loaders. This transformer remaps references to ASM to use the
|
||||
@@ -24,16 +21,16 @@ import java.util.stream.Collectors;
|
||||
* were compiled against.</p>
|
||||
* <p>The following packages are remapped:</p>
|
||||
* <li><code>org.spongepowered.libraries.org.objectweb.asm</code> (MixinBooterLegacy, GTNHMixins) in all classes</li>
|
||||
* <li><code>org.spongepowered.asm.lib</code> (Mixin 0.7, GasStation, UniMixins) in all classes</li>
|
||||
* <li><code>org.spongepowered.asm.lib</code> (Mixin 0.7, UniMixins) in all classes</li>
|
||||
* <li><code>org.objectweb.asm</code> (Mixin 0.8) in classes implementing {@link org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin} or annotated with {@link io.github.legacymoddingmc.unimixins.compat.api.RemapASMForMixin}</li>
|
||||
*/
|
||||
|
||||
// TODO Measure the performance impact of this and switch to doing it selectively if it would improve things.
|
||||
public class ASMRemapperTransformer implements IClassTransformer {
|
||||
|
||||
private static final String ASM_PACKAGE_UNSHADED = "org/objectweb/asm/";
|
||||
private static final String ASM_PACKAGE_LEGACY = "org/spongepowered/asm/lib/";
|
||||
private static final String ASM_PACKAGE_MBL = "org/spongepowered/libraries/org/objectweb/asm/";
|
||||
private static final String REMAP_ANNOTATION = "Lio/github/legacymoddingmc/unimixins/compat/api/RemapASMForMixin;";
|
||||
|
||||
private static final List<String> ASM_PACKAGE_PREFIXES = Arrays.asList(
|
||||
ASM_PACKAGE_UNSHADED,
|
||||
@@ -41,79 +38,95 @@ public class ASMRemapperTransformer implements IClassTransformer {
|
||||
ASM_PACKAGE_MBL
|
||||
);
|
||||
|
||||
private static final List<byte[]> SHADED_ASM_PACKAGE_PREFIXES_RAW = Arrays.asList(
|
||||
ASM_PACKAGE_LEGACY.getBytes(StandardCharsets.UTF_8),
|
||||
ASM_PACKAGE_MBL.getBytes(StandardCharsets.UTF_8)
|
||||
);
|
||||
|
||||
private static String realASMPackagePrefix;
|
||||
private static List<byte[]> wrongASMPackagePrefixesRaw;
|
||||
private static List<String> wrongASMPackagePrefixes;
|
||||
private final BytePatternMatcher wrongAsmMatcher;
|
||||
private final BytePatternMatcher shadedAsmMatcher;
|
||||
private final BytePatternMatcher remapAnnotationMatcher;
|
||||
|
||||
public ASMRemapperTransformer() {
|
||||
final String[] wrongAsmPackagePrefixes = ASM_PACKAGE_PREFIXES.stream()
|
||||
.filter(x -> !x.equals(getRealASMPackagePrefix()))
|
||||
.toArray(String[]::new);
|
||||
|
||||
final String[] shadedAsmPackagePrefixes = new String[] { ASM_PACKAGE_LEGACY, ASM_PACKAGE_MBL };
|
||||
|
||||
this.wrongAsmMatcher = new BytePatternMatcher(wrongAsmPackagePrefixes, BytePatternMatcher.Mode.Contains);
|
||||
this.shadedAsmMatcher = new BytePatternMatcher(shadedAsmPackagePrefixes, BytePatternMatcher.Mode.Contains);
|
||||
this.remapAnnotationMatcher = new BytePatternMatcher(REMAP_ANNOTATION, BytePatternMatcher.Mode.Equals);
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if(basicClass == null) {
|
||||
if (basicClass == null) {
|
||||
return null;
|
||||
}
|
||||
if(transformedName.startsWith("io.github.legacymoddingmc.unimixins.compat.asm.")
|
||||
if (transformedName.startsWith("io.github.legacymoddingmc.unimixins.compat.asm.")
|
||||
|| transformedName.startsWith("com.google.")
|
||||
|| transformedName.startsWith("org.apache.")
|
||||
|| transformedName.startsWith("org.objectweb.asm.")
|
||||
) return basicClass;
|
||||
) {
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
boolean foundWrongAsm = containsAnyPattern(basicClass, getWrongASMPackagePrefixesRaw());
|
||||
ClassReader classReader = new ClassReader(basicClass);
|
||||
|
||||
if(!foundWrongAsm) return basicClass;
|
||||
boolean foundWrongAsm = matchUtf8Constant(classReader, basicClass, wrongAsmMatcher);
|
||||
if (!foundWrongAsm) return basicClass;
|
||||
|
||||
boolean foundShadedAsm = containsAnyPattern(basicClass, SHADED_ASM_PACKAGE_PREFIXES_RAW);
|
||||
boolean doRemap = matchUtf8Constant(classReader, basicClass, shadedAsmMatcher);
|
||||
|
||||
boolean doRemap = foundShadedAsm;
|
||||
|
||||
if(!doRemap) {
|
||||
ClassNode classNode = new ClassNode();
|
||||
ClassReader classReaderForNode = new ClassReader(basicClass);
|
||||
classReaderForNode.accept(classNode, 0);
|
||||
|
||||
if(classNode.interfaces != null) {
|
||||
for (String itf : classNode.interfaces) {
|
||||
if (itf.equals("org/spongepowered/asm/mixin/extensibility/IMixinConfigPlugin")) {
|
||||
doRemap = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!doRemap) {
|
||||
if(classNode.visibleAnnotations != null) {
|
||||
for (AnnotationNode ann : classNode.visibleAnnotations) {
|
||||
if (ann.desc.equals("Lio/github/legacymoddingmc/unimixins/compat/api/RemapASMForMixin;")) {
|
||||
doRemap = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!doRemap) {
|
||||
for (String itf : classReader.getInterfaces()) {
|
||||
if (itf.equals("org/spongepowered/asm/mixin/extensibility/IMixinConfigPlugin")) {
|
||||
doRemap = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(doRemap) {
|
||||
ClassReader classReader = new ClassReader(basicClass);
|
||||
LOGGER.info("Transforming class " + transformedName + " to fit current mixin environment.");
|
||||
ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
RemappingClassAdapter remapAdapter = new SpongepoweredASMRemappingAdapter(classWriter);
|
||||
classReader.accept(remapAdapter, ClassReader.EXPAND_FRAMES);
|
||||
basicClass = classWriter.toByteArray();
|
||||
if (!doRemap) {
|
||||
doRemap = matchUtf8Constant(classReader, basicClass, remapAnnotationMatcher);
|
||||
}
|
||||
return basicClass;
|
||||
|
||||
if (!doRemap) {
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
LOGGER.info("Transforming class {} to fit current mixin environment.", transformedName);
|
||||
ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
RemappingClassAdapter remapAdapter = new SpongepoweredASMRemappingAdapter(classWriter);
|
||||
classReader.accept(remapAdapter, ClassReader.EXPAND_FRAMES);
|
||||
return classWriter.toByteArray();
|
||||
}
|
||||
|
||||
private static boolean containsAnyPattern(byte[] array, List<byte[]> patterns) {
|
||||
if(array == null) {
|
||||
return false;
|
||||
}
|
||||
for(byte[] pattern : patterns) {
|
||||
if(Bytes.indexOf(array, pattern) != -1) {
|
||||
private static boolean matchUtf8Constant(ClassReader classReader, byte[] basicClass, BytePatternMatcher matcher) {
|
||||
final int itemCount = classReader.getItemCount();
|
||||
|
||||
// Constant pool entries start from index 1
|
||||
for (int i = 1; i < itemCount; i++) {
|
||||
final int itemOffset = classReader.getItem(i);
|
||||
|
||||
// Long and double take two CP slots, the second slot has no item
|
||||
if (itemOffset == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Only match the UTF8 constant (which tag is 1).
|
||||
// getItem(i) points after the tag byte, i.e. at the first length byte.
|
||||
// [tag][u2 length][bytes...]
|
||||
if (basicClass[itemOffset - 1] != 1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Length takes 2 bytes, so we read them and skip these 2 bytes
|
||||
final int utfLen = classReader.readUnsignedShort(itemOffset);
|
||||
final int utfStart = itemOffset + 2;
|
||||
|
||||
if (matcher.matches(basicClass, utfStart, utfLen)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -146,20 +159,6 @@ public class ASMRemapperTransformer implements IClassTransformer {
|
||||
}
|
||||
return realASMPackagePrefix;
|
||||
}
|
||||
|
||||
private static List<String> getWrongASMPackagePrefixes() {
|
||||
if(wrongASMPackagePrefixes == null) {
|
||||
wrongASMPackagePrefixes = ASM_PACKAGE_PREFIXES.stream().filter(x -> !x.equals(getRealASMPackagePrefix())).collect(Collectors.toList());
|
||||
}
|
||||
return wrongASMPackagePrefixes;
|
||||
}
|
||||
|
||||
private static List<byte[]> getWrongASMPackagePrefixesRaw() {
|
||||
if(wrongASMPackagePrefixesRaw == null) {
|
||||
wrongASMPackagePrefixesRaw = getWrongASMPackagePrefixes().stream().map(x -> x.getBytes(StandardCharsets.UTF_8)).collect(Collectors.toList());
|
||||
}
|
||||
return wrongASMPackagePrefixesRaw;
|
||||
}
|
||||
|
||||
private static class SpongepoweredASMRemappingAdapter extends RemappingClassAdapter {
|
||||
public SpongepoweredASMRemappingAdapter(ClassWriter classWriter) {
|
||||
|
||||
+145
@@ -0,0 +1,145 @@
|
||||
package io.github.legacymoddingmc.unimixins.compat.asm;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Was taken from <a href="https://github.com/GTNewHorizons/RetroFuturaBootstrap/pull/20">RFB</a>
|
||||
*/
|
||||
public class BytePatternMatcher {
|
||||
final Mode mode;
|
||||
// first byte -> matched patterns
|
||||
final byte[][][] byFirst = new byte[256][][];
|
||||
int minPatternLen = Integer.MAX_VALUE;
|
||||
|
||||
public enum Mode {
|
||||
/** Checks if the constant pool entry contains a pattern */
|
||||
Contains,
|
||||
/** Checks if the whole constant pool entry equals a pattern */
|
||||
Equals,
|
||||
/** Checks if the constant pool entry starts with a pattern */
|
||||
StartsWith
|
||||
}
|
||||
|
||||
public BytePatternMatcher(String strPattern, Mode mode) {
|
||||
this(new String[] {strPattern}, mode);
|
||||
}
|
||||
|
||||
public BytePatternMatcher(String[] strPatterns, Mode mode) {
|
||||
this.mode = mode;
|
||||
|
||||
final byte[][] patterns = new byte[strPatterns.length][];
|
||||
final int[] bucketSizes = new int[256];
|
||||
final int[] bucketIndices = new int[Math.min(strPatterns.length, 256)];
|
||||
int bucketsCount = 0;
|
||||
|
||||
for (int i = 0; i < strPatterns.length; i++) {
|
||||
final byte[] pattern = strPatterns[i].getBytes(StandardCharsets.UTF_8);
|
||||
patterns[i] = pattern;
|
||||
|
||||
if (pattern.length < minPatternLen) {
|
||||
minPatternLen = pattern.length;
|
||||
}
|
||||
|
||||
final int bucketIndex = pattern[0] & 0xFF;
|
||||
if (bucketSizes[bucketIndex]++ == 0) {
|
||||
bucketIndices[bucketsCount++] = bucketIndex;
|
||||
}
|
||||
}
|
||||
|
||||
// Ascending sorting by length
|
||||
Arrays.sort(patterns, (a, b) -> Integer.compare(a.length, b.length));
|
||||
|
||||
for (int i = 0; i < bucketsCount; i++) {
|
||||
final int bucketIndex = bucketIndices[i];
|
||||
byFirst[bucketIndex] = new byte[bucketSizes[bucketIndex]][];
|
||||
bucketSizes[bucketIndex] = 0; // reuse as write index
|
||||
}
|
||||
|
||||
for (final byte[] pattern : patterns) {
|
||||
final int bucketIndex = pattern[0] & 0xFF;
|
||||
byFirst[bucketIndex][bucketSizes[bucketIndex]++] = pattern;
|
||||
}
|
||||
}
|
||||
|
||||
public boolean matches(byte[] bytes, int start, int len) {
|
||||
if (len < minPatternLen) {
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (mode) {
|
||||
case Contains:
|
||||
return contains(bytes, start, len);
|
||||
case Equals:
|
||||
return equals(bytes, start, len);
|
||||
case StartsWith:
|
||||
return startsWith(bytes, start, len);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean contains(byte[] bytes, int start, int len) {
|
||||
final int end = start + len;
|
||||
|
||||
for (int pos = start; pos <= end - minPatternLen; pos++) {
|
||||
final byte[][] patterns = byFirst[bytes[pos] & 0xFF];
|
||||
if (patterns == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (final byte[] pattern : patterns) {
|
||||
if (pattern.length > end - pos) {
|
||||
break;
|
||||
}
|
||||
|
||||
int k = pattern.length - 1;
|
||||
while (k > 0 && bytes[pos + k] == pattern[k]) k--;
|
||||
if (k == 0) return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean equals(byte[] bytes, int start, int len) {
|
||||
final byte[][] patterns = byFirst[bytes[start] & 0xFF];
|
||||
if (patterns == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (final byte[] pattern : patterns) {
|
||||
if (pattern.length < len) {
|
||||
continue;
|
||||
}
|
||||
if (pattern.length > len) {
|
||||
break;
|
||||
}
|
||||
|
||||
int k = pattern.length - 1;
|
||||
while (k > 0 && bytes[start + k] == pattern[k]) k--;
|
||||
if (k == 0) return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean startsWith(byte[] bytes, int start, int len) {
|
||||
final byte[][] patterns = byFirst[bytes[start] & 0xFF];
|
||||
if (patterns == null) {
|
||||
return false;
|
||||
}
|
||||
|
||||
for (final byte[] pattern : patterns) {
|
||||
if (pattern.length > len) {
|
||||
break;
|
||||
}
|
||||
|
||||
int k = pattern.length - 1;
|
||||
while (k > 0 && bytes[start + k] == pattern[k]) k--;
|
||||
if (k == 0) return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+5
-9
@@ -24,8 +24,6 @@ public class HackClasspathModDiscoveryTransformer implements IClassTransformer {
|
||||
if(basicClass == null) {
|
||||
return null;
|
||||
}
|
||||
if(transformedName.startsWith("org.objectweb.asm.")) return basicClass;
|
||||
|
||||
if(transformedName.equals("cpw.mods.fml.common.discovery.ModDiscoverer")) {
|
||||
basicClass = doTransformModDiscoverer(basicClass);
|
||||
}
|
||||
@@ -41,22 +39,20 @@ public class HackClasspathModDiscoveryTransformer implements IClassTransformer {
|
||||
classReader.accept(classNode, 0);
|
||||
for(MethodNode m : classNode.methods) {
|
||||
if(m.name.equals("findClasspathMods")) {
|
||||
Iterator<AbstractInsnNode> it = m.instructions.iterator();
|
||||
|
||||
while(it.hasNext()) {
|
||||
AbstractInsnNode i = it.next();
|
||||
for (AbstractInsnNode i = m.instructions.getFirst(); i != null; i = i.getNext()) {
|
||||
if(i.getOpcode() == INVOKESTATIC) {
|
||||
MethodInsnNode mi = (MethodInsnNode)i;
|
||||
if(mi.owner.equals("cpw/mods/fml/relauncher/CoreModManager") && mi.name.equals("getReparseableCoremods") && mi.desc.equals("()Ljava/util/List;")) {
|
||||
m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/HackClasspathModDiscoveryTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc));
|
||||
it.remove();
|
||||
m.instructions.insertBefore(mi, new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/HackClasspathModDiscoveryTransformer$Hooks", "redirectGetReparseableCoremods", mi.desc, false));
|
||||
m.instructions.remove(mi);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
|
||||
ClassWriter writer = new ClassWriter(0);
|
||||
classNode.accept(writer);
|
||||
return writer.toByteArray();
|
||||
} catch(Exception e) {
|
||||
|
||||
+3
-2
@@ -74,11 +74,12 @@ public class IgnoreDuplicateJarsTransformer implements IClassTransformer {
|
||||
if(m.name.equals("identifyMods")) {
|
||||
InsnList patch = new InsnList();
|
||||
patch.add(new VarInsnNode(ALOAD, 0));
|
||||
patch.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer$Hooks", "preIdentifyMods", "(Lcpw/mods/fml/common/discovery/ModDiscoverer;)V"));
|
||||
patch.add(new MethodInsnNode(INVOKESTATIC, "io/github/legacymoddingmc/unimixins/compat/asm/IgnoreDuplicateJarsTransformer$Hooks", "preIdentifyMods", "(Lcpw/mods/fml/common/discovery/ModDiscoverer;)V", false));
|
||||
m.instructions.insert(patch);
|
||||
break;
|
||||
}
|
||||
}
|
||||
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
|
||||
ClassWriter writer = new ClassWriter(ClassWriter.COMPUTE_MAXS);
|
||||
classNode.accept(writer);
|
||||
return writer.toByteArray();
|
||||
} catch(Exception e) {
|
||||
|
||||
@@ -1,674 +0,0 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
@@ -1,165 +0,0 @@
|
||||
GNU LESSER GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
|
||||
This version of the GNU Lesser General Public License incorporates
|
||||
the terms and conditions of version 3 of the GNU General Public
|
||||
License, supplemented by the additional permissions listed below.
|
||||
|
||||
0. Additional Definitions.
|
||||
|
||||
As used herein, "this License" refers to version 3 of the GNU Lesser
|
||||
General Public License, and the "GNU GPL" refers to version 3 of the GNU
|
||||
General Public License.
|
||||
|
||||
"The Library" refers to a covered work governed by this License,
|
||||
other than an Application or a Combined Work as defined below.
|
||||
|
||||
An "Application" is any work that makes use of an interface provided
|
||||
by the Library, but which is not otherwise based on the Library.
|
||||
Defining a subclass of a class defined by the Library is deemed a mode
|
||||
of using an interface provided by the Library.
|
||||
|
||||
A "Combined Work" is a work produced by combining or linking an
|
||||
Application with the Library. The particular version of the Library
|
||||
with which the Combined Work was made is also called the "Linked
|
||||
Version".
|
||||
|
||||
The "Minimal Corresponding Source" for a Combined Work means the
|
||||
Corresponding Source for the Combined Work, excluding any source code
|
||||
for portions of the Combined Work that, considered in isolation, are
|
||||
based on the Application, and not on the Linked Version.
|
||||
|
||||
The "Corresponding Application Code" for a Combined Work means the
|
||||
object code and/or source code for the Application, including any data
|
||||
and utility programs needed for reproducing the Combined Work from the
|
||||
Application, but excluding the System Libraries of the Combined Work.
|
||||
|
||||
1. Exception to Section 3 of the GNU GPL.
|
||||
|
||||
You may convey a covered work under sections 3 and 4 of this License
|
||||
without being bound by section 3 of the GNU GPL.
|
||||
|
||||
2. Conveying Modified Versions.
|
||||
|
||||
If you modify a copy of the Library, and, in your modifications, a
|
||||
facility refers to a function or data to be supplied by an Application
|
||||
that uses the facility (other than as an argument passed when the
|
||||
facility is invoked), then you may convey a copy of the modified
|
||||
version:
|
||||
|
||||
a) under this License, provided that you make a good faith effort to
|
||||
ensure that, in the event an Application does not supply the
|
||||
function or data, the facility still operates, and performs
|
||||
whatever part of its purpose remains meaningful, or
|
||||
|
||||
b) under the GNU GPL, with none of the additional permissions of
|
||||
this License applicable to that copy.
|
||||
|
||||
3. Object Code Incorporating Material from Library Header Files.
|
||||
|
||||
The object code form of an Application may incorporate material from
|
||||
a header file that is part of the Library. You may convey such object
|
||||
code under terms of your choice, provided that, if the incorporated
|
||||
material is not limited to numerical parameters, data structure
|
||||
layouts and accessors, or small macros, inline functions and templates
|
||||
(ten or fewer lines in length), you do both of the following:
|
||||
|
||||
a) Give prominent notice with each copy of the object code that the
|
||||
Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the object code with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
4. Combined Works.
|
||||
|
||||
You may convey a Combined Work under terms of your choice that,
|
||||
taken together, effectively do not restrict modification of the
|
||||
portions of the Library contained in the Combined Work and reverse
|
||||
engineering for debugging such modifications, if you also do each of
|
||||
the following:
|
||||
|
||||
a) Give prominent notice with each copy of the Combined Work that
|
||||
the Library is used in it and that the Library and its use are
|
||||
covered by this License.
|
||||
|
||||
b) Accompany the Combined Work with a copy of the GNU GPL and this license
|
||||
document.
|
||||
|
||||
c) For a Combined Work that displays copyright notices during
|
||||
execution, include the copyright notice for the Library among
|
||||
these notices, as well as a reference directing the user to the
|
||||
copies of the GNU GPL and this license document.
|
||||
|
||||
d) Do one of the following:
|
||||
|
||||
0) Convey the Minimal Corresponding Source under the terms of this
|
||||
License, and the Corresponding Application Code in a form
|
||||
suitable for, and under terms that permit, the user to
|
||||
recombine or relink the Application with a modified version of
|
||||
the Linked Version to produce a modified Combined Work, in the
|
||||
manner specified by section 6 of the GNU GPL for conveying
|
||||
Corresponding Source.
|
||||
|
||||
1) Use a suitable shared library mechanism for linking with the
|
||||
Library. A suitable mechanism is one that (a) uses at run time
|
||||
a copy of the Library already present on the user's computer
|
||||
system, and (b) will operate properly with a modified version
|
||||
of the Library that is interface-compatible with the Linked
|
||||
Version.
|
||||
|
||||
e) Provide Installation Information, but only if you would otherwise
|
||||
be required to provide such information under section 6 of the
|
||||
GNU GPL, and only to the extent that such information is
|
||||
necessary to install and execute a modified version of the
|
||||
Combined Work produced by recombining or relinking the
|
||||
Application with a modified version of the Linked Version. (If
|
||||
you use option 4d0, the Installation Information must accompany
|
||||
the Minimal Corresponding Source and Corresponding Application
|
||||
Code. If you use option 4d1, you must provide the Installation
|
||||
Information in the manner specified by section 6 of the GNU GPL
|
||||
for conveying Corresponding Source.)
|
||||
|
||||
5. Combined Libraries.
|
||||
|
||||
You may place library facilities that are a work based on the
|
||||
Library side by side in a single library together with other library
|
||||
facilities that are not Applications and are not covered by this
|
||||
License, and convey such a combined library under terms of your
|
||||
choice, if you do both of the following:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work based
|
||||
on the Library, uncombined with any other library facilities,
|
||||
conveyed under the terms of this License.
|
||||
|
||||
b) Give prominent notice with the combined library that part of it
|
||||
is a work based on the Library, and explaining where to find the
|
||||
accompanying uncombined form of the same work.
|
||||
|
||||
6. Revised Versions of the GNU Lesser General Public License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions
|
||||
of the GNU Lesser General Public License from time to time. Such new
|
||||
versions will be similar in spirit to the present version, but may
|
||||
differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Library as you received it specifies that a certain numbered version
|
||||
of the GNU Lesser General Public License "or any later version"
|
||||
applies to it, you have the option of following the terms and
|
||||
conditions either of that published version or of any later version
|
||||
published by the Free Software Foundation. If the Library as you
|
||||
received it does not specify a version number of the GNU Lesser
|
||||
General Public License, you may choose any version of the GNU Lesser
|
||||
General Public License ever published by the Free Software Foundation.
|
||||
|
||||
If the Library as you received it specifies that a proxy can decide
|
||||
whether future versions of the GNU Lesser General Public License shall
|
||||
apply, that proxy's public statement of acceptance of any version is
|
||||
permanent authorization for you to choose that version for the
|
||||
Library.
|
||||
@@ -1,14 +0,0 @@
|
||||
Source: https://github.com/FalsePattern/GasStation/tree/0.5.1
|
||||
|
||||
Classes used:
|
||||
|
||||
com.falsepattern.gasstation.*
|
||||
|
||||
Modifications:
|
||||
|
||||
- Removed Mixin and MixinExtras bootstrap from GasStationCore.
|
||||
- Disabled dev mixin plugin because UniMixins's Compat module does the same thing.
|
||||
- Added call to "unimixins.mixinModidDecorator.refresh" after loading early mixins in GasStationCore and late mixins in LoadControllerMixin
|
||||
- Added 1.8+ @Mod and @IFMLPlugin annotations
|
||||
|
||||
License: LGPL3+SNEED (see LICENSE, COPYING and COPYING.LESSER)
|
||||
@@ -1,20 +0,0 @@
|
||||
GasStation
|
||||
|
||||
Copyright (C) 2022 FalsePattern
|
||||
All Rights Reserved
|
||||
|
||||
The above copyright notice, this permission notice and the word "SNEED"
|
||||
shall be included in all copies or substantial portions of the Software.
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU Lesser General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
@@ -1,39 +0,0 @@
|
||||
# GasStation
|
||||
|
||||
GasStation is library that gives mods the ability of loading mixins without embedding the entire SpongePowered Mixins
|
||||
library inside themselves.
|
||||
|
||||
This library is based on SpongeMixins, but with several significant differences:
|
||||
- This library provides Mixin 0.8.5 instead of 0.7.11 (new mixin features that are not available in mixin 0.7)
|
||||
- MixinExtras is included, which has some neat QoL utilities that can be used by mod developers.
|
||||
- The early/late mixin loading feature from mixin-booter-legacy is included as a part of the library
|
||||
- Mixingasm is included
|
||||
|
||||
GasStation is designed to be 100% backwards compatible with SpongeMixins, and in most cases it's a simple delete and
|
||||
drag&drop upgrade. However, mods designed to run on GasStation *might not* work on SpongeMixins if they use any of the
|
||||
extra features included in this library.
|
||||
|
||||
Integrated into the buildscript of https://github.com/FalsePattern/ExampleMod1.7.10
|
||||
|
||||
### Important: do not remove the 00 prefix from the jar, it's used for making forge load this mod first before others (alphabetical sorting when loading coremods)
|
||||
|
||||
## Licenses
|
||||
|
||||
GasStation is licensed under LGPLv3.<br>
|
||||
Full license notice here: https://github.com/FalsePattern/GasStation/blob/master/LICENSE
|
||||
|
||||
### Embedded code licenses:
|
||||
SpongePowered Mixins is licensed under MIT, and is compatible with LGPLv3.<br>
|
||||
Full license notice here: https://github.com/SpongePowered/Mixin/blob/master/LICENSE.txt
|
||||
|
||||
MixinExtras is licensed under MIT, and is compatible with LGPLv3.<br>
|
||||
Full license notice here: https://github.com/LlamaLad7/MixinExtras/blob/master/LICENSE
|
||||
|
||||
MixinBooterLegacy is licensed under LGPLv2.1+, and is compatible with LGPLv3.<br>
|
||||
Full license notice here: https://github.com/tox1cozZ/mixin-booter-legacy/blob/master/LICENSE
|
||||
|
||||
SpongeMixins is licensed under MIT, and is compatible with LGPLv3.<br>
|
||||
Full license notice here: https://github.com/TimeConqueror/SpongeMixins/blob/master/LICENSE
|
||||
|
||||
Mixingasm is licensed under Unlicense, and is compatible with LGPLv3.<br>
|
||||
Full license notice here: https://github.com/makamys/Mixingasm/blob/master/UNLICENSE
|
||||
@@ -1,44 +0,0 @@
|
||||
dependencies {
|
||||
compileOnly("org.spongepowered:mixin:$gasMixVersion")
|
||||
compileOnly project(':module-mixinbooterlegacy')
|
||||
shadow(project(":module-common")) {
|
||||
transitive = false
|
||||
}
|
||||
}
|
||||
|
||||
archivesBaseName = archivesBaseName.replace("-1.7.10", "-gasstation-1.7.10")
|
||||
|
||||
shadowJar {
|
||||
configurations = [project.configurations.shadow]
|
||||
classifier = ''
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gasstation.repackage.common'
|
||||
|
||||
manifest {
|
||||
attributes (
|
||||
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
|
||||
'FMLCorePluginContainsFMLMod': true,
|
||||
'ForceLoadAsMod': true,
|
||||
'MixinConfigs': 'mixins.gasstation.json',
|
||||
'FMLCorePlugin': 'com.falsepattern.gasstation.core.GasStationCore'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
jar {
|
||||
enabled = false
|
||||
dependsOn shadowJar
|
||||
}
|
||||
|
||||
// Obfuscation is unnecessary since this module does not reference Minecraft classes
|
||||
reobf.enabled = false
|
||||
|
||||
ext.uniVersion = version
|
||||
ext.mcversion = "1.7.10"
|
||||
version += "+" + ext.extraVersion
|
||||
|
||||
minecraft {
|
||||
replace("GRADLETOKEN_MODID", "gasstation")
|
||||
replace("GRADLETOKEN_MODNAME", "GasStation")
|
||||
replace("GRADLETOKEN_VERSION", extraVersion)
|
||||
replace("GRADLETOKEN_GROUPNAME", "com.falsepattern.gasstation")
|
||||
}
|
||||
@@ -1,2 +0,0 @@
|
||||
extraVersion=0.5.1
|
||||
gasMixVersion=0.8.5-gasstation_7
|
||||
@@ -1,14 +0,0 @@
|
||||
package com.falsepattern.gasstation;
|
||||
|
||||
import cpw.mods.fml.common.Mod;
|
||||
|
||||
@Mod(modid = Tags.MODID,
|
||||
version = Tags.VERSION,
|
||||
name = Tags.MODNAME,
|
||||
acceptableRemoteVersions = "*")
|
||||
@net.minecraftforge.fml.common.Mod(modid = Tags.MODID,
|
||||
version = Tags.VERSION,
|
||||
name = Tags.MODNAME,
|
||||
acceptableRemoteVersions = "*")
|
||||
public class GasStation {
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
package com.falsepattern.gasstation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Early mixins are defined as mixins that affects vanilla or forge classes.
|
||||
* Or technically, classes that can be queried via the current state of {@link net.minecraft.launchwrapper.LaunchClassLoader}
|
||||
* <p>
|
||||
* If you want to add mixins that affect mods, use {@link ILateMixinLoader}
|
||||
* <p>
|
||||
* Implement this in your {@link cpw.mods.fml.relauncher.IFMLLoadingPlugin}.
|
||||
* Return all early mixin configs you want MixinBooter to queue and send to Mixin library.
|
||||
*/
|
||||
public interface IEarlyMixinLoader {
|
||||
|
||||
/**
|
||||
* @return mixin configurations to be queued and sent to Mixin library.
|
||||
*/
|
||||
List<String> getMixinConfigs();
|
||||
|
||||
/**
|
||||
* Runs when a mixin config is successfully queued and sent to Mixin library.
|
||||
*
|
||||
* @param mixinConfig mixin config name, queried via {@link IEarlyMixinLoader#getMixinConfigs()}.
|
||||
* @return true if the mixinConfig should be queued, false if it should not.
|
||||
*/
|
||||
default boolean shouldMixinConfigQueue(String mixinConfig) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs when a mixin config is successfully queued and sent to Mixin library.
|
||||
*
|
||||
* @param mixinConfig mixin config name, queried via {@link IEarlyMixinLoader#getMixinConfigs()}.
|
||||
*/
|
||||
default void onMixinConfigQueued(String mixinConfig) {
|
||||
}
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
package com.falsepattern.gasstation;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Late mixins are defined as mixins that affects mod classes.
|
||||
* Or technically, classes that can be queried via the current state of
|
||||
* {@link net.minecraft.launchwrapper.LaunchClassLoader}
|
||||
* <p>
|
||||
* Majority if not all vanilla and forge classes would have been loaded here.
|
||||
* If you want to add mixins that affect vanilla or forge, use and consult {@link IEarlyMixinLoader}
|
||||
* <p>
|
||||
* Implement this in any arbitrary class. Said class will be constructed when mixins are ready to be queued.
|
||||
* Return all late mixin configs you want MixinBooter to queue and send to Mixin library.
|
||||
*/
|
||||
public interface ILateMixinLoader {
|
||||
|
||||
/**
|
||||
* @return mixin configurations to be queued and sent to Mixin library.
|
||||
*/
|
||||
List<String> getMixinConfigs();
|
||||
|
||||
/**
|
||||
* Runs when a mixin config is successfully queued and sent to Mixin library.
|
||||
*
|
||||
* @param mixinConfig mixin config name, queried via {@link ILateMixinLoader#getMixinConfigs()}.
|
||||
* @return true if the mixinConfig should be queued, false if it should not.
|
||||
*/
|
||||
default boolean shouldMixinConfigQueue(String mixinConfig) {
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs when a mixin config is successfully queued and sent to Mixin library.
|
||||
*
|
||||
* @param mixinConfig mixin config name, queried via {@link ILateMixinLoader#getMixinConfigs()}.
|
||||
*/
|
||||
default void onMixinConfigQueued(String mixinConfig) {
|
||||
}
|
||||
}
|
||||
-91
@@ -1,91 +0,0 @@
|
||||
/**
|
||||
* Copyright 2020 TimeConqueror
|
||||
* <p>
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
|
||||
* <p>
|
||||
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
* <p>
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
package com.falsepattern.gasstation;
|
||||
|
||||
import com.google.common.io.Files;
|
||||
import sun.misc.URLClassPath;
|
||||
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import net.minecraft.launchwrapper.LaunchClassLoader;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.URL;
|
||||
import java.nio.file.Path;
|
||||
|
||||
public class MinecraftURLClassPath {
|
||||
/**
|
||||
* Utility to manipulate the minecraft URL ClassPath
|
||||
*/
|
||||
private static final Path MOD_DIRECTORY_PATH = new File(Launch.minecraftHome, "mods/").toPath();
|
||||
private static final URLClassPath ucp;
|
||||
|
||||
static {
|
||||
try {
|
||||
Field ucpField = LaunchClassLoader.class.getSuperclass().getDeclaredField("ucp");
|
||||
ucpField.setAccessible(true);
|
||||
|
||||
ucp = (URLClassPath)ucpField.get(Launch.classLoader);
|
||||
} catch (NoSuchFieldException | IllegalAccessException e) {
|
||||
throw new RuntimeException(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a jar within the minecraft mods directory
|
||||
*/
|
||||
@SuppressWarnings("All")
|
||||
public static File getJarInModPath(final String jarname) {
|
||||
try {
|
||||
return java.nio.file.Files.walk(MOD_DIRECTORY_PATH)
|
||||
.filter( p -> {
|
||||
final String filename = p.toString();
|
||||
final String extension = Files.getFileExtension(filename);
|
||||
|
||||
return Files.getNameWithoutExtension(filename).contains(jarname) && ("jar".equals(extension) || "litemod".equals(extension));
|
||||
})
|
||||
.map(Path::toFile)
|
||||
.findFirst()
|
||||
.orElse(null);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the given mod is found within the class path; generally useful for identifying if a mod has been loaded
|
||||
* while running in dev due to a compile dependency
|
||||
*/
|
||||
@SuppressWarnings("All")
|
||||
public static boolean findJarInClassPath(final String jarname) {
|
||||
for(URL url : ucp.getURLs()) {
|
||||
final String filename = url.getFile();
|
||||
final String extension = Files.getFileExtension(filename);
|
||||
|
||||
if(Files.getNameWithoutExtension(filename).contains(jarname) && ("jar".equals(extension) || "litemod".equals(extension))) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a Jar to the Minecraft URL ClassPath
|
||||
* - Needed when using mixins on classes outside of Minecraft or other coremods
|
||||
*/
|
||||
public static void addJar(File pathToJar) throws Exception {
|
||||
ucp.addURL(pathToJar.toURI().toURL());
|
||||
}
|
||||
|
||||
private MinecraftURLClassPath() {
|
||||
}
|
||||
}
|
||||
@@ -1,12 +0,0 @@
|
||||
package com.falsepattern.gasstation;
|
||||
|
||||
// Use this class for Strings only. Do not import any classes here. It will lead to issues with Mixins if in use!
|
||||
|
||||
public class Tags {
|
||||
|
||||
// GRADLETOKEN_* will be replaced by your configuration values at build time
|
||||
public static final String MODID = "GRADLETOKEN_MODID";
|
||||
public static final String MODNAME = "GRADLETOKEN_MODNAME";
|
||||
public static final String VERSION = "GRADLETOKEN_VERSION";
|
||||
public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
|
||||
}
|
||||
@@ -1,83 +0,0 @@
|
||||
package com.falsepattern.gasstation.core;
|
||||
|
||||
import com.google.common.util.concurrent.Runnables;
|
||||
import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
|
||||
|
||||
import com.falsepattern.gasstation.Tags;
|
||||
import com.falsepattern.gasstation.IEarlyMixinLoader;
|
||||
import io.github.legacymoddingmc.unimixins.gasstation.GasStationModule;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.spongepowered.asm.mixin.Mixins;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@IFMLLoadingPlugin.MCVersion("1.7.10")
|
||||
@IFMLLoadingPlugin.SortingIndex(Integer.MIN_VALUE + 5)
|
||||
@IFMLLoadingPlugin.Name(GasStationCore.PLUGIN_NAME)
|
||||
@IFMLLoadingPlugin.TransformerExclusions("com.falsepattern.gasstation.core")
|
||||
@net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.SortingIndex(Integer.MIN_VALUE + 5)
|
||||
@net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name(GasStationCore.PLUGIN_NAME)
|
||||
@net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions("com.falsepattern.gasstation.core")
|
||||
public class GasStationCore implements IFMLLoadingPlugin {
|
||||
public static final String PLUGIN_NAME = Tags.MODNAME + " Core Plugin";
|
||||
public static final Logger LOGGER = LogManager.getLogger(PLUGIN_NAME);
|
||||
|
||||
static {
|
||||
LOGGER.info("Initializing " + Tags.MODNAME + "Core");
|
||||
GasStationModule.init();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String[] getASMTransformerClass() {
|
||||
return new String[0];
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getModContainerClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getSetupClass() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void injectData(Map<String, Object> data) {
|
||||
Object coremodList = data.get("coremodList");
|
||||
if (coremodList instanceof List) {
|
||||
// noinspection rawtypes
|
||||
for (Object coremod : (List)coremodList) {
|
||||
try {
|
||||
Field field = coremod.getClass().getField("coreModInstance");
|
||||
field.setAccessible(true);
|
||||
Object theMod = field.get(coremod);
|
||||
if (theMod instanceof IEarlyMixinLoader) {
|
||||
IEarlyMixinLoader loader = (IEarlyMixinLoader)theMod;
|
||||
for (String mixinConfig : loader.getMixinConfigs()) {
|
||||
if (loader.shouldMixinConfigQueue(mixinConfig)) {
|
||||
LOGGER.info("Adding {} mixin configuration.", mixinConfig);
|
||||
Mixins.addConfiguration(mixinConfig);
|
||||
loader.onMixinConfigQueued(mixinConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
LOGGER.error("Unexpected error", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
((Runnable) Launch.blackboard.getOrDefault("unimixins.mixinModidDecorator.refresh", Runnables.doNothing())).run();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getAccessTransformerClass() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
package com.falsepattern.gasstation.mixins;
|
||||
|
||||
import org.spongepowered.asm.lib.tree.ClassNode;
|
||||
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
|
||||
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class DevMixinPlugin implements IMixinConfigPlugin {
|
||||
@Override
|
||||
public void onLoad(String mixinPackage) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRefMapperConfig() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getMixins() {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void preApply(String s, ClassNode classNode, String s1, IMixinInfo iMixinInfo) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postApply(String s, ClassNode classNode, String s1, IMixinInfo iMixinInfo) {
|
||||
|
||||
}
|
||||
}
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
package com.falsepattern.gasstation.mixins;
|
||||
|
||||
import cpw.mods.fml.common.discovery.ModCandidate;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public interface IModDiscovererMixin {
|
||||
List<ModCandidate> getCandidates();
|
||||
}
|
||||
-101
@@ -1,101 +0,0 @@
|
||||
package com.falsepattern.gasstation.mixins.mixin;
|
||||
|
||||
import com.google.common.util.concurrent.Runnables;
|
||||
import cpw.mods.fml.common.*;
|
||||
import cpw.mods.fml.common.discovery.ASMDataTable;
|
||||
|
||||
import com.falsepattern.gasstation.core.GasStationCore;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.MixinEnvironment;
|
||||
import org.spongepowered.asm.mixin.Mixins;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.transformer.Proxy;
|
||||
import com.falsepattern.gasstation.ILateMixinLoader;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(value = LoadController.class, remap = false)
|
||||
public abstract class LoadControllerMixin {
|
||||
|
||||
@Shadow
|
||||
private Loader loader;
|
||||
|
||||
@Inject(method = "distributeStateMessage(Lcpw/mods/fml/common/LoaderState;[Ljava/lang/Object;)V",
|
||||
at = @At("HEAD"))
|
||||
private void beforeConstructing(LoaderState state, Object[] eventData, CallbackInfo ci) throws Throwable {
|
||||
// This state is where Forge adds mod files to ModClassLoader
|
||||
if (state != LoaderState.CONSTRUCTING) {
|
||||
return;
|
||||
}
|
||||
|
||||
ModClassLoader modClassLoader = (ModClassLoader)eventData[0];
|
||||
ASMDataTable asmDataTable = (ASMDataTable)eventData[1];
|
||||
|
||||
GasStationCore.LOGGER.info("Instantiating all ILateMixinLoader implemented classes...");
|
||||
List<ASMDataTable.ASMData> asmDatas = new ArrayList<>(asmDataTable.getAll(ILateMixinLoader.class.getName().replace('.', '/')));
|
||||
asmDatas.addAll(asmDataTable.getAll(io.github.tox1cozz.mixinbooterlegacy.ILateMixinLoader.class.getName().replace('.', '/')));
|
||||
for (ASMDataTable.ASMData asmData : asmDatas) {
|
||||
modClassLoader.addFile(asmData.getCandidate().getModContainer()); // Add to path before `newInstance`
|
||||
Class<?> clazz = Class.forName(asmData.getClassName().replace('/', '.'));
|
||||
GasStationCore.LOGGER.info("Instantiating {} for its mixins.", clazz);
|
||||
ILateMixinLoader loader = (ILateMixinLoader)clazz.newInstance();
|
||||
for (String mixinConfig : loader.getMixinConfigs()) {
|
||||
if (loader.shouldMixinConfigQueue(mixinConfig)) {
|
||||
GasStationCore.LOGGER.info("Adding {} mixin configuration.", mixinConfig);
|
||||
Mixins.addConfiguration(mixinConfig);
|
||||
loader.onMixinConfigQueued(mixinConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
((Runnable)Launch.blackboard.getOrDefault("unimixins.mixinModidDecorator.refresh", Runnables.doNothing())).run();
|
||||
|
||||
for (ModContainer container : loader.getActiveModList()) {
|
||||
modClassLoader.addFile(container.getSource());
|
||||
}
|
||||
|
||||
Field transformerField = Proxy.class.getDeclaredField("transformer");
|
||||
transformerField.setAccessible(true);
|
||||
@SuppressWarnings("OptionalGetWithoutIsPresent")
|
||||
Object transformer = transformerField.get(Launch.classLoader.getTransformers().stream().filter(Proxy.class::isInstance).findFirst().get());
|
||||
|
||||
Class<?> mixinTransformerClass = Class.forName("org.spongepowered.asm.mixin.transformer.MixinTransformer");
|
||||
|
||||
Field processorField = mixinTransformerClass.getDeclaredField("processor");
|
||||
processorField.setAccessible(true);
|
||||
Object processor = processorField.get(transformer);
|
||||
|
||||
Class<?> mixinProcessorClass = Class.forName("org.spongepowered.asm.mixin.transformer.MixinProcessor");
|
||||
|
||||
Method selectConfigsMethod = mixinProcessorClass.getDeclaredMethod("selectConfigs", MixinEnvironment.class);
|
||||
selectConfigsMethod.setAccessible(true);
|
||||
|
||||
MixinEnvironment env = MixinEnvironment.getCurrentEnvironment();
|
||||
selectConfigsMethod.invoke(processor, env);
|
||||
|
||||
try {
|
||||
Method prepareConfigsMethod = mixinProcessorClass.getDeclaredMethod("prepareConfigs", MixinEnvironment.class);
|
||||
prepareConfigsMethod.setAccessible(true);
|
||||
prepareConfigsMethod.invoke(processor, env);
|
||||
} catch (NoSuchMethodException e) { // 0.8.3+
|
||||
Class<?> extensionsClass = Class.forName("org.spongepowered.asm.mixin.transformer.ext.Extensions");
|
||||
@SuppressWarnings("JavaReflectionMemberAccess")
|
||||
Method prepareConfigsMethod = mixinProcessorClass.getDeclaredMethod("prepareConfigs", MixinEnvironment.class, extensionsClass);
|
||||
prepareConfigsMethod.setAccessible(true);
|
||||
|
||||
Field extensionsField = mixinProcessorClass.getDeclaredField("extensions");
|
||||
extensionsField.setAccessible(true);
|
||||
Object extensions = extensionsField.get(processor);
|
||||
|
||||
//noinspection JavaReflectionInvocation
|
||||
prepareConfigsMethod.invoke(processor, env, extensions);
|
||||
}
|
||||
}
|
||||
}
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
package com.falsepattern.gasstation.mixins.mixin.dev;
|
||||
|
||||
import com.falsepattern.gasstation.mixins.IModDiscovererMixin;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.discovery.ModCandidate;
|
||||
import cpw.mods.fml.common.discovery.ModDiscoverer;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(value = Loader.class,
|
||||
remap = false)
|
||||
public abstract class LoaderMixin {
|
||||
@Redirect(method = "identifyMods",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lcpw/mods/fml/common/discovery/ModDiscoverer;identifyMods()Ljava/util/List;"),
|
||||
require = 1)
|
||||
private List<ModContainer> removeDuplicateFiles(ModDiscoverer instance) {
|
||||
List<ModCandidate> candidates = ((IModDiscovererMixin)instance).getCandidates();
|
||||
List<ModCandidate> uniques = new ArrayList<>();
|
||||
List<ModCandidate> dupes = new ArrayList<>();
|
||||
for(ModCandidate candidate: candidates) {
|
||||
File file = candidate.getModContainer().getAbsoluteFile().toPath().normalize().toFile();
|
||||
boolean isUnique = true;
|
||||
for (ModCandidate uniqueCandidate: uniques) {
|
||||
File uniqueFile = uniqueCandidate.getModContainer().getAbsoluteFile().toPath().normalize().toFile();
|
||||
if (file.equals(uniqueFile)) {
|
||||
isUnique = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (isUnique) {
|
||||
uniques.add(candidate);
|
||||
} else {
|
||||
dupes.add(candidate);
|
||||
}
|
||||
}
|
||||
candidates.removeAll(dupes);
|
||||
return instance.identifyMods();
|
||||
}
|
||||
}
|
||||
-48
@@ -1,48 +0,0 @@
|
||||
package com.falsepattern.gasstation.mixins.mixin.dev;
|
||||
|
||||
import com.falsepattern.gasstation.mixins.IModDiscovererMixin;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
|
||||
|
||||
import cpw.mods.fml.common.FMLLog;
|
||||
import cpw.mods.fml.common.ModClassLoader;
|
||||
import cpw.mods.fml.common.discovery.ContainerType;
|
||||
import cpw.mods.fml.common.discovery.ModCandidate;
|
||||
import cpw.mods.fml.common.discovery.ModDiscoverer;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(value = ModDiscoverer.class,
|
||||
remap = false)
|
||||
public abstract class ModDiscovererMixin implements IModDiscovererMixin {
|
||||
@Shadow private List<ModCandidate> candidates;
|
||||
|
||||
@Override
|
||||
public List<ModCandidate> getCandidates() {
|
||||
return candidates;
|
||||
}
|
||||
|
||||
@Inject(method = "findClasspathMods",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lcpw/mods/fml/common/FMLLog;finer(Ljava/lang/String;[Ljava/lang/Object;)V"),
|
||||
locals = LocalCapture.CAPTURE_FAILHARD,
|
||||
require = 1)
|
||||
private void smartCheck(ModClassLoader modClassLoader, CallbackInfo ci, List<String> knownLibraries, File[] minecraftSources, int i) {
|
||||
FMLLog.fine("Found a minecraft related file at %s, examining for mod candidates", minecraftSources[i].getAbsolutePath());
|
||||
candidates.add(new ModCandidate(minecraftSources[i], minecraftSources[i], ContainerType.JAR, i == 0, true));
|
||||
}
|
||||
|
||||
@Redirect(method = "findClasspathMods",
|
||||
at = @At(value = "INVOKE",
|
||||
target = "Lcpw/mods/fml/common/FMLLog;finer(Ljava/lang/String;[Ljava/lang/Object;)V"),
|
||||
require = 1)
|
||||
private void noLog(String format, Object[] data) {
|
||||
|
||||
}
|
||||
}
|
||||
-55
@@ -1,55 +0,0 @@
|
||||
package io.github.legacymoddingmc.unimixins.gasstation;
|
||||
|
||||
import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class GasStationModule {
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger("unimixins-gasstation");
|
||||
|
||||
public static void init() {
|
||||
if(SanityCheckHelper.isEnabled()) {
|
||||
SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("gasstation-", "mixinbooterlegacy-", "spongemixins-", "mixingasm-"));
|
||||
checkComponentIntegrity();
|
||||
}
|
||||
}
|
||||
|
||||
// Logic copied from FalsePatternLib for interoperability
|
||||
private static void checkComponentIntegrity() {
|
||||
List<String> missingComponents = new ArrayList<>();
|
||||
|
||||
if(!classExists("com.falsepattern.gasstation.core.GasStationCore")) {
|
||||
missingComponents.add("GasStation");
|
||||
}
|
||||
if(!classExists("makamys.mixingasm.api.TransformerInclusions")) {
|
||||
missingComponents.add("Mixingasm");
|
||||
}
|
||||
if(!classExists("ru.timeconqueror.spongemixins.core.SpongeMixinsCore")) {
|
||||
missingComponents.add("SpongeMixins");
|
||||
}
|
||||
if(!classExists("io.github.tox1cozz.mixinbooterlegacy.MixinBooterLegacyPlugin")) {
|
||||
missingComponents.add("MixinBooterLegacy");
|
||||
}
|
||||
if(!classExists("org.spongepowered.asm.lib.Opcodes") || classExists("org.spongepowered.libraries.org.objectweb.asm.Opcodes")) {
|
||||
missingComponents.add("MixinBooterLegacy");
|
||||
}
|
||||
|
||||
if(!missingComponents.isEmpty()) {
|
||||
LOGGER.error("The following missing components were detected: " + missingComponents);
|
||||
LOGGER.error("Please obtain mods which provide them.");
|
||||
throw new RuntimeException("Missing components detected");
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean classExists(String string) {
|
||||
return GasStationModule.class.getResource("/" + string.replaceAll("\\.", "/") + ".class") != null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
[
|
||||
{
|
||||
"modid": "gasstation",
|
||||
"name": "UniMixins: GasStation",
|
||||
"description": "UniMixins module that provides GasStation extras.\nDepends on: SpongeMixins, MixinBooterLegacy, MixinExtras",
|
||||
"version": "${extraVersion}+uni.${uniVersion}",
|
||||
"mcversion": "${mcversion}",
|
||||
"url": "${project_url}",
|
||||
"updateUrl": "",
|
||||
"authorList": [
|
||||
"FalsePattern"
|
||||
],
|
||||
"credits": "",
|
||||
"logoFile": "",
|
||||
"screenshots": [],
|
||||
"dependencies": []
|
||||
}
|
||||
]
|
||||
@@ -1,13 +0,0 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8.3",
|
||||
"package": "com.falsepattern.gasstation.mixins.mixin",
|
||||
"refmap": "mixins.gasstation.refmap.json",
|
||||
"target": "@env(PREINIT)",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"mixins": [
|
||||
|
||||
],
|
||||
"plugin": "com.falsepattern.gasstation.mixins.DevMixinPlugin"
|
||||
}
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
{
|
||||
"mappings": {},
|
||||
"data": {}
|
||||
}
|
||||
@@ -1,34 +1,14 @@
|
||||
def mixinExtrasVersion = "0.1.1"
|
||||
|
||||
configurations.create("shadowMixinExtras")
|
||||
|
||||
dependencies {
|
||||
compileOnly('org.spongepowered:mixin:0.8.7')
|
||||
shadow(project(":module-common")) {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly(project(":module-mixingasm")) {
|
||||
transitive = false
|
||||
}
|
||||
compileOnly("com.github.LlamaLad7:MixinExtras:$mixinExtrasVersion")
|
||||
shadowMixinExtras("com.github.LlamaLad7:MixinExtras:$mixinExtrasVersion")
|
||||
}
|
||||
|
||||
archivesBaseName = archivesBaseName.replace("-1.7.10", "-gtnhmixins-1.7.10")
|
||||
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
|
||||
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
|
||||
|
||||
task mixinExtrasJar(type: ShadowJar) {
|
||||
destinationDirectory = file("build/tmp")
|
||||
archiveClassifier.set("mixinExtras")
|
||||
archiveVersion = mixinExtrasVersion
|
||||
configurations = [project.configurations.shadowMixinExtras]
|
||||
relocate 'com.llamalad7.mixinextras', 'com.gtnewhorizon.mixinextras'
|
||||
relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
|
||||
}
|
||||
|
||||
shadowJar {
|
||||
classifier = ''
|
||||
configurations = [project.configurations.shadow]
|
||||
@@ -36,12 +16,6 @@ shadowJar {
|
||||
relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gtnhmixins.repackage.common'
|
||||
|
||||
from(zipTree(tasks.mixinExtrasJar.archiveFile)) {
|
||||
eachFile({
|
||||
setPath("data/legacy_gtnh_mixinextras/" + getPath().replaceAll("\\.class", ".klass"))
|
||||
})
|
||||
}
|
||||
|
||||
manifest {
|
||||
attributes (
|
||||
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
|
||||
@@ -58,8 +32,6 @@ jar {
|
||||
enabled = false
|
||||
}
|
||||
|
||||
shadowJar.dependsOn mixinExtrasJar
|
||||
|
||||
// Obfuscation is unnecessary since this module does not reference Minecraft classes
|
||||
reobf.enabled = false
|
||||
|
||||
|
||||
+8
-3
@@ -66,13 +66,18 @@ public class LateMixinOrchestrationMixin {
|
||||
GTNHMixins.log("Loading mixins from ILateMixinLoader [{}]", lateLoader.getClass().getName());
|
||||
final String mixinConfig = lateLoader.getMixinConfig();
|
||||
final Config config = Config.create(mixinConfig, null);
|
||||
final List<String> mixins = new ArrayList<>();
|
||||
final Object o = Reflection.mixinClassesField.get(Reflection.configField.get(config));
|
||||
final List<String> mixins;
|
||||
if (o instanceof List) {
|
||||
mixins = (List<String>) o;
|
||||
} else {
|
||||
mixins = new ArrayList<>();
|
||||
Reflection.mixinClassesField.set(Reflection.configField.get(config), mixins);
|
||||
}
|
||||
mixins.addAll(lateLoader.getMixins(loadedMods));
|
||||
mixins.addAll((List<String>) Reflection.mixinClassesField.get(Reflection.configField.get(config)));
|
||||
for (String mixin : mixins) {
|
||||
GTNHMixins.log("Loading [{}] {}", mixinConfig, mixin);
|
||||
}
|
||||
Reflection.mixinClassesField.set(Reflection.configField.get(config), mixins);
|
||||
Reflection.registerConfigurationMethod.invoke(null, config);
|
||||
|
||||
}
|
||||
|
||||
-8
@@ -1,8 +0,0 @@
|
||||
package io.github.legacymoddingmc.unimixins.gtnhmixins;
|
||||
|
||||
import io.github.legacymoddingmc.unimixins.common.config.AnnotatedProperties;
|
||||
|
||||
public class GTNHMixinsConfig {
|
||||
@AnnotatedProperties.ConfigString(def = "true", com = "Provide the deprecated `com.gtnewhorizons.mixinextras` relocation of MixinExtras 0.1.1. May be required by some older mods.", cat = "gtnhmixins")
|
||||
public static boolean enableLegacyGTNHMixinExtrasPackage;
|
||||
}
|
||||
+2
-35
@@ -4,10 +4,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import io.github.legacymoddingmc.unimixins.common.abstraction.ComparableVersion;
|
||||
import io.github.legacymoddingmc.unimixins.common.config.ConfigUtil;
|
||||
import io.github.legacymoddingmc.unimixins.common.sanitycheck.SanityCheckHelper;
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -16,38 +13,10 @@ public class GTNHMixinsModule {
|
||||
public static final Logger LOGGER = LogManager.getLogger("unimixins-gtnhmixins");
|
||||
|
||||
public static void init() {
|
||||
if(SanityCheckHelper.isEnabled()) {
|
||||
if (SanityCheckHelper.isEnabled()) {
|
||||
SanityCheckHelper.warnIfJarPrefixesExist(Arrays.asList("gasstation-", "mixinbooterlegacy-", "spongemixins-"));
|
||||
checkComponentIntegrity();
|
||||
}
|
||||
|
||||
ConfigUtil.load(GTNHMixinsConfig.class);
|
||||
|
||||
if(isLegacyGTNHMixinExtrasEnabled()) {
|
||||
Launch.classLoader.registerTransformer("io.github.legacymoddingmc.unimixins.gtnhmixins.asm.LegacyGTNHMixinExtrasGenerator");
|
||||
try {
|
||||
Class.forName("com.gtnewhorizon.mixinextras.MixinExtrasBootstrap").getMethod("init").invoke(null);
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
throw new RuntimeException("Failed to initialize MixinExtrasBootstrap");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isLegacyGTNHMixinExtrasEnabled() {
|
||||
if(!GTNHMixinsConfig.enableLegacyGTNHMixinExtrasPackage) return false;
|
||||
|
||||
String requiredVersion = "0.8.5";
|
||||
String mixinVersion = (String)Launch.blackboard.get("mixin.initialised");
|
||||
if(mixinVersion != null && new ComparableVersion(mixinVersion).compareTo(new ComparableVersion(requiredVersion)) >= 0) {
|
||||
LOGGER.debug("Initializing MixinExtras");
|
||||
return true;
|
||||
} else if(!SanityCheckHelper.isEnabled()){
|
||||
LOGGER.warn("Skipping MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")");
|
||||
return false;
|
||||
} else {
|
||||
throw new RuntimeException("Cannot load MixinExtras because Mixin version (" + mixinVersion + ") is lower than the required (" + requiredVersion + ")");
|
||||
}
|
||||
}
|
||||
|
||||
private static void checkComponentIntegrity() {
|
||||
@@ -62,7 +31,7 @@ public class GTNHMixinsModule {
|
||||
}
|
||||
|
||||
if(!missingComponents.isEmpty()) {
|
||||
LOGGER.error("The following missing components were detected: " + missingComponents);
|
||||
LOGGER.error("The following missing components were detected: {}", missingComponents);
|
||||
LOGGER.error("Please obtain mods which provide them.");
|
||||
throw new RuntimeException("Missing components detected");
|
||||
}
|
||||
@@ -71,7 +40,5 @@ public class GTNHMixinsModule {
|
||||
public static boolean classExists(String string) {
|
||||
return GTNHMixinsModule.class.getResource("/" + string.replaceAll("\\.", "/") + ".class") != null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
-50
@@ -1,50 +0,0 @@
|
||||
package io.github.legacymoddingmc.unimixins.gtnhmixins.asm;
|
||||
|
||||
import static io.github.legacymoddingmc.unimixins.gtnhmixins.GTNHMixinsModule.LOGGER;
|
||||
|
||||
import io.github.legacymoddingmc.unimixins.gtnhmixins.util.LaunchClassLoaderUtils;
|
||||
import makamys.mixingasm.api.MixinSafeTransformer;
|
||||
import makamys.mixingasm.api.TransformerInclusions;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@MixinSafeTransformer
|
||||
public class LegacyGTNHMixinExtrasGenerator implements IClassTransformer {
|
||||
static {
|
||||
if(LegacyGTNHMixinExtrasGenerator.class.getResource("/makamys/mixingasm/api/TransformerInclusions.class") != null
|
||||
&& LegacyGTNHMixinExtrasGenerator.class.getResource("/makamys/mixingasm/api/MixinSafeTransformer.class") == null) {
|
||||
// Mixingasm < 0.3 compat
|
||||
TransformerInclusions.getTransformerInclusionList().add("io.github.legacymoddingmc.unimixins.compat.asm.LegacyGTNHMixinExtrasGenerator");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if(basicClass == null && name.startsWith("com.gtnewhorizon.mixinextras") && !name.startsWith("org.apache.commons.io.")) {
|
||||
try {
|
||||
LOGGER.trace("Generating class " + name);
|
||||
byte[] bytes = getClassBytes(name);
|
||||
|
||||
if(bytes != null) {
|
||||
// If NEI is on the class path before CCL (which would cause the game to crash immediately in
|
||||
// production, but is possible in a dev env), ClassHeirachyTransformer will try to call getClassBytes,
|
||||
// and if it fails, it will call Class.forName for the class being loaded, causing a
|
||||
// ClassCircularityError.
|
||||
// So we need to populate the cache to avoid that from happening.
|
||||
LaunchClassLoaderUtils.putInResourceCache(name, bytes);
|
||||
return bytes;
|
||||
}
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("Failed to generate class " + name);
|
||||
}
|
||||
}
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
private byte[] getClassBytes(String name) throws IOException {
|
||||
final String resourcePath = "/data/legacy_gtnh_mixinextras/" + name.replace('.', '/').concat(".klass");
|
||||
return IOUtils.toByteArray(LegacyGTNHMixinExtrasGenerator.class.getResourceAsStream(resourcePath));
|
||||
}
|
||||
}
|
||||
+101
-162
@@ -23,13 +23,13 @@ dependencies {
|
||||
|
||||
apply plugin: "com.github.johnrengelman.shadow"
|
||||
|
||||
def flavors = (!project.hasProperty("enableAltMixin") ? [] : ["spongepowered", "fabric", "gasmix", "gtnh"]) + ["unimix"]
|
||||
def flavors = (!project.hasProperty("enableAltMixin") ? [] : ["spongepowered", "fabric"]) + ["unimix"]
|
||||
|
||||
flavors.each {
|
||||
def mixinFlavor = it
|
||||
def _flavor = it.capitalize()
|
||||
def mixinFlavorClassifier = "UNKNOWN"
|
||||
def mixinFlavorCapitalized = [spongepowered: "SpongePowered", fabric: "Fabric", gasmix: "GasMix", gtnh: "GTNH", unimix: "UniMix"][mixinFlavor]
|
||||
def mixinFlavorCapitalized = [spongepowered: "SpongePowered", fabric: "Fabric", unimix: "UniMix"][mixinFlavor]
|
||||
def mixinVersion = "UNKNOWN"
|
||||
|
||||
configurations.create("shadow$_flavor")
|
||||
@@ -42,191 +42,130 @@ flavors.each {
|
||||
})
|
||||
}
|
||||
|
||||
if (mixinFlavor == "fabric" || mixinFlavor == "spongepowered" || mixinFlavor == "unimix" || mixinFlavor == "gtnh") {
|
||||
// Fabric / SpongePowered / UniMix / GTNH
|
||||
|
||||
if (mixinFlavor == "fabric" || mixinFlavor == "unimix") {
|
||||
def uniLocal = mixinFlavor == "unimix" && project.hasProperty("local")
|
||||
def uniJitpack = mixinFlavor == "unimix" && !uniLocal
|
||||
if (mixinFlavor == "fabric" || mixinFlavor == "unimix") {
|
||||
def uniLocal = mixinFlavor == "unimix" && project.hasProperty("local")
|
||||
mixinVersion = mixinFlavor == "fabric" ? fabricMixinVersion : unimixMixinVersion
|
||||
if (uniLocal) {
|
||||
mixinVersion += "-local"
|
||||
}
|
||||
|
||||
mixinVersion = mixinFlavor == "fabric" ? fabricMixinVersion : unimixMixinVersion
|
||||
if (uniLocal) {
|
||||
mixinVersion += "-local"
|
||||
}
|
||||
def mixinGroup = mixinFlavor == "fabric" ? "net.fabricmc" : "io.github.legacymoddingmc"
|
||||
def mixinArtifactId = "sponge-mixin"
|
||||
def mixinDepVersion = mixinVersion
|
||||
def mixinDep = "$mixinGroup:$mixinArtifactId:$mixinDepVersion"
|
||||
|
||||
// jitpack differences:
|
||||
// - domain is com instead of io (for some strange reason)
|
||||
// - we have to use _ instead of + in version string because the latter is not supported (for some strange reason)
|
||||
// - artifact id is UniMix, not sponge-mixin (this one makes sense at least)
|
||||
mixinFlavorClassifier = "$mixinFlavor.${mixinVersion.replace('+', '-')}"
|
||||
|
||||
def mixinGroup = mixinFlavor == "fabric" ? "net.fabricmc" : "${uniJitpack ? 'com' : 'io'}.github.legacymoddingmc"
|
||||
def mixinArtifactId = uniJitpack ? "UniMix" : "sponge-mixin"
|
||||
def mixinDepVersion = uniJitpack ? mixinVersion.replace('+', '_') : mixinVersion
|
||||
def mixinDep = "$mixinGroup:$mixinArtifactId:$mixinDepVersion"
|
||||
dependencies {
|
||||
add("shadow$_flavor", "$mixinDep", {
|
||||
exclude group: "org.ow2.asm"
|
||||
})
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
|
||||
|
||||
mixinFlavorClassifier = "$mixinFlavor.${mixinVersion.replace('+', '-')}"
|
||||
|
||||
dependencies {
|
||||
add("shadow$_flavor", "$mixinDep", {
|
||||
exclude group: "org.ow2.asm"
|
||||
})
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
|
||||
add("shadowBridge$_flavor", "$mixinDep", {
|
||||
transitive = false
|
||||
})
|
||||
|
||||
add("shadowBridge$_flavor", "$mixinDep", {
|
||||
transitive = false
|
||||
})
|
||||
add("shadowSources$_flavor", "$mixinDep:sources", {
|
||||
transitive = false
|
||||
})
|
||||
}
|
||||
} else if(mixinFlavor == "spongepowered") {
|
||||
mixinVersion = spongepoweredMixinVersion
|
||||
|
||||
add("shadowSources$_flavor", "$mixinDep:sources", {
|
||||
transitive = false
|
||||
})
|
||||
}
|
||||
} else if(mixinFlavor == "spongepowered") {
|
||||
mixinVersion = spongepoweredMixinVersion
|
||||
|
||||
mixinFlavorClassifier = "spongepowered.$mixinVersion"
|
||||
|
||||
dependencies {
|
||||
add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
|
||||
add("shadowBridge$_flavor", "org.spongepowered:mixin:$mixinVersion", {
|
||||
transitive = false
|
||||
})
|
||||
add("shadow$_flavor", "com.google.guava:guava:21.0")
|
||||
add("shadow$_flavor", "com.google.code.gson:gson:2.2.4")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
|
||||
mixinFlavorClassifier = "spongepowered.$mixinVersion"
|
||||
|
||||
add("shadowSources$_flavor", "org.spongepowered:mixin:$mixinVersion:sources")
|
||||
}
|
||||
} else if(mixinFlavor == "gtnh") {
|
||||
// Adapted from GTNHMixins's build script
|
||||
dependencies {
|
||||
add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
|
||||
add("shadowBridge$_flavor", "org.spongepowered:mixin:$mixinVersion", {
|
||||
transitive = false
|
||||
})
|
||||
add("shadow$_flavor", "com.google.guava:guava:21.0")
|
||||
add("shadow$_flavor", "com.google.code.gson:gson:2.2.4")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
|
||||
|
||||
mixinVersion = gtnhMixinVersion
|
||||
mixinFlavorClassifier = "gtnh.$mixinVersion"
|
||||
|
||||
dependencies {
|
||||
add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
|
||||
add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
|
||||
add("shadow$_flavor", "com.google.guava:guava:21.0")
|
||||
add("shadowBridge$_flavor", "org.spongepowered:mixin:$spongepoweredMixinVersion")
|
||||
add("shadowSources$_flavor", "org.spongepowered:mixin:$spongepoweredMixinVersion:sources")
|
||||
}
|
||||
add("shadowSources$_flavor", "org.spongepowered:mixin:$mixinVersion:sources")
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
// We want to *not* relocate ASM in the bridge classes. So we use a multi-step
|
||||
// build procedure:
|
||||
|
||||
// We want to *not* relocate ASM in the bridge classes. So we use a multi-step
|
||||
// build procedure:
|
||||
// 1. Create relocated Mixin jar, without the bridge classes
|
||||
task("mixinJar$_flavor", type: ShadowJar) {
|
||||
destinationDirectory = file("build/tmp")
|
||||
classifier = "tmpMixin$_flavor"
|
||||
configurations = [project.configurations."shadow$_flavor"]
|
||||
|
||||
// 1. Create relocated Mixin jar, without the bridge classes
|
||||
task("mixinJar$_flavor", type: ShadowJar) {
|
||||
destinationDirectory = file("build/tmp")
|
||||
classifier = "tmpMixin$_flavor"
|
||||
configurations = [project.configurations."shadow$_flavor"]
|
||||
relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
|
||||
relocate 'com.google', 'org.spongepowered.libraries.com.google'
|
||||
|
||||
relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
|
||||
if(mixinFlavor != "gtnh") {
|
||||
relocate 'com.google', 'org.spongepowered.libraries.com.google'
|
||||
} else {
|
||||
// we don't use this ASM package name
|
||||
//relocate 'org.objectweb.asm', 'org.spongepowered.libraries.org.objectweb.asm'
|
||||
relocate 'com.google.common', 'org.spongepowered.libraries.com.google.common'
|
||||
relocate 'com.google.thirdparty.publicsuffix', 'org.spongepowered.libraries.com.google.thirdparty.publicsuffix'
|
||||
}
|
||||
exclude 'org/spongepowered/asm/bridge/RemapperAdapter.class'
|
||||
exclude 'org/spongepowered/asm/bridge/RemapperAdapterFML.class'
|
||||
|
||||
exclude 'org/spongepowered/asm/bridge/RemapperAdapter.class'
|
||||
exclude 'org/spongepowered/asm/bridge/RemapperAdapterFML.class'
|
||||
// Exclude stuff that's compiled for Java 16
|
||||
|
||||
// Exclude stuff that's compiled for Java 16
|
||||
exclude 'org/spongepowered/asm/service/modlauncher/*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinTransformationServiceLegacy*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinLaunchPlugin*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinTransformationService*'
|
||||
exclude 'org/spongepowered/asm/launch/platform/container/ContainerHandleModLauncherEx*'
|
||||
|
||||
exclude 'org/spongepowered/asm/service/modlauncher/*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinTransformationServiceLegacy*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinLaunchPlugin*'
|
||||
exclude 'org/spongepowered/asm/launch/MixinTransformationService*'
|
||||
exclude 'org/spongepowered/asm/launch/platform/container/ContainerHandleModLauncherEx*'
|
||||
exclude 'META-INF/services/cpw.mods.modlauncher.api.ITransformationService'
|
||||
exclude 'META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService'
|
||||
|
||||
exclude 'META-INF/services/cpw.mods.modlauncher.api.ITransformationService'
|
||||
exclude 'META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService'
|
||||
|
||||
exclude '**/module-info.class'
|
||||
exclude '**/module-info.class'
|
||||
|
||||
// Exclude jar-specific stuff
|
||||
// Exclude jar-specific stuff
|
||||
|
||||
exclude 'META-INF/MANIFEST.MF', 'META-INF/maven/**', 'META-INF/*.RSA', 'META-INF/*.SF'
|
||||
}
|
||||
exclude 'META-INF/MANIFEST.MF', 'META-INF/maven/**', 'META-INF/*.RSA', 'META-INF/*.SF'
|
||||
}
|
||||
|
||||
// 2. Create Mixin jar without relocation, with *only* the bridge classes
|
||||
task("bridgeJar$_flavor", type: ShadowJar) {
|
||||
destinationDirectory = file("build/tmp")
|
||||
classifier = "tmpBridge$_flavor"
|
||||
configurations = [project.configurations."shadowBridge$_flavor"]
|
||||
// 2. Create Mixin jar without relocation, with *only* the bridge classes
|
||||
task("bridgeJar$_flavor", type: ShadowJar) {
|
||||
destinationDirectory = file("build/tmp")
|
||||
classifier = "tmpBridge$_flavor"
|
||||
configurations = [project.configurations."shadowBridge$_flavor"]
|
||||
|
||||
include '*.jar'
|
||||
include 'org/spongepowered/asm/bridge/*'
|
||||
}
|
||||
include '*.jar'
|
||||
include 'org/spongepowered/asm/bridge/*'
|
||||
}
|
||||
|
||||
// 3. Combine the two jars
|
||||
task("shadowJar$_flavor", type: ShadowJar) {
|
||||
version = versionBase + "+" + mixinFlavorClassifier
|
||||
from(sourceSets.main.output) {
|
||||
exclude "mcmod.info"
|
||||
}
|
||||
// 3. Combine the two jars
|
||||
task("shadowJar$_flavor", type: ShadowJar) {
|
||||
version = versionBase + "+" + mixinFlavorClassifier
|
||||
from(sourceSets.main.output) {
|
||||
exclude "mcmod.info"
|
||||
}
|
||||
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixin.repackage.common'
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixin.repackage.common'
|
||||
|
||||
dependsOn "mixinJar$_flavor"
|
||||
dependsOn "bridgeJar$_flavor"
|
||||
dependsOn "mixinJar$_flavor"
|
||||
dependsOn "bridgeJar$_flavor"
|
||||
dependsOn "mixinJar$_flavor"
|
||||
dependsOn "bridgeJar$_flavor"
|
||||
dependsOn "mixinJar$_flavor"
|
||||
dependsOn "bridgeJar$_flavor"
|
||||
|
||||
from zipTree(tasks."mixinJar$_flavor".archiveFile).matching {
|
||||
exclude 'module-info.class'
|
||||
eachFile {
|
||||
if(it.path.startsWith("META-INF/services/")) {
|
||||
it.filter({l -> !l.startsWith("org.spongepowered.asm.service.modlauncher.") ? l : null})
|
||||
}
|
||||
}
|
||||
}
|
||||
from zipTree(tasks."bridgeJar$_flavor".archiveFile).matching { include 'org/spongepowered/asm/bridge/*' }
|
||||
from zipTree(tasks."mixinJar$_flavor".archiveFile).matching {
|
||||
exclude 'module-info.class'
|
||||
eachFile {
|
||||
if(it.path.startsWith("META-INF/services/")) {
|
||||
it.filter({l -> !l.startsWith("org.spongepowered.asm.service.modlauncher.") ? l : null})
|
||||
}
|
||||
}
|
||||
}
|
||||
from zipTree(tasks."bridgeJar$_flavor".archiveFile).matching { include 'org/spongepowered/asm/bridge/*' }
|
||||
|
||||
doLast {
|
||||
delete tasks."mixinJar$_flavor".archiveFile
|
||||
delete tasks."bridgeJar$_flavor".archiveFile
|
||||
}
|
||||
}
|
||||
|
||||
jar.dependsOn("shadowJar$_flavor")
|
||||
} else if (mixinFlavor == "gasmix") {
|
||||
// GasMix
|
||||
|
||||
mixinVersion = gasmixMixinVersion
|
||||
|
||||
mixinFlavorClassifier = "gasmix.$mixinVersion"
|
||||
|
||||
dependencies {
|
||||
add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
|
||||
add("shadowSources$_flavor", "org.spongepowered:mixin:$mixinVersion:sources")
|
||||
}
|
||||
|
||||
task("shadowJar$_flavor", type: ShadowJar) {
|
||||
from(sourceSets.main.output) {
|
||||
exclude "mcmod.info"
|
||||
}
|
||||
|
||||
version = versionBase + "+" + mixinFlavorClassifier
|
||||
classifier = ''
|
||||
configurations = [project.configurations."shadow$_flavor"]
|
||||
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixin.repackage.common'
|
||||
}
|
||||
|
||||
jar.dependsOn("shadowJar$_flavor")
|
||||
}
|
||||
|
||||
// Common
|
||||
doLast {
|
||||
delete tasks."mixinJar$_flavor".archiveFile
|
||||
delete tasks."bridgeJar$_flavor".archiveFile
|
||||
}
|
||||
}
|
||||
|
||||
jar.dependsOn("shadowJar$_flavor")
|
||||
|
||||
task("createMcmodInfo$_flavor", type: Copy) {
|
||||
outputs.upToDateWhen { false }
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
fabricMixinVersion=0.15.3+mixin.0.8.7
|
||||
unimixMixinVersion=0.15.4+mixin.0.8.7
|
||||
unimixMixinVersion=0.15.6+mixin.0.8.7
|
||||
spongepoweredMixinVersion=0.8.7
|
||||
gtnhMixinVersion=0.8.7-GTNH-2
|
||||
gasmixMixinVersion=0.8.7-gasstation_7
|
||||
|
||||
asmVersion=9.8
|
||||
asmVersion=9.9.1
|
||||
@@ -9,7 +9,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly('org.spongepowered:mixin:0.8.5-gasstation_7')
|
||||
compileOnly('io.github.legacymoddingmc:sponge-mixin:0.15.5+mixin.0.8.7')
|
||||
shadow(project(":module-common")) {
|
||||
transitive = false
|
||||
}
|
||||
@@ -24,6 +24,7 @@ shadowJar {
|
||||
configurations = [project.configurations.shadow]
|
||||
|
||||
relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixinbooterlegacy.repackage.common'
|
||||
relocate "org.objectweb.asm", "org.spongepowered.asm.lib"
|
||||
|
||||
manifest {
|
||||
attributes (
|
||||
|
||||
+2
-2
@@ -1,12 +1,12 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import org.objectweb.asm.tree.AnnotationNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix;
|
||||
import org.spongepowered.asm.mixin.transformer.MixinTargetContext;
|
||||
import org.spongepowered.asm.lib.tree.AnnotationNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
|
||||
@AnnotationType(ModifyExpressionValue.class)
|
||||
@HandlerPrefix("modifyExpressionValue")
|
||||
|
||||
+9
-3
@@ -1,9 +1,15 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.Type;
|
||||
import org.spongepowered.asm.lib.tree.*;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.TypeInsnNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode;
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import org.objectweb.asm.tree.AnnotationNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType;
|
||||
import org.spongepowered.asm.lib.tree.AnnotationNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix;
|
||||
|
||||
+7
-3
@@ -3,9 +3,13 @@ package io.github.tox1cozz.mixinextras.injector;
|
||||
import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper;
|
||||
import io.github.tox1cozz.mixinextras.utils.InjectorUtils;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.Type;
|
||||
import org.spongepowered.asm.lib.tree.*;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode;
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import org.objectweb.asm.tree.AnnotationNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType;
|
||||
import org.spongepowered.asm.lib.tree.AnnotationNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix;
|
||||
|
||||
+4
-4
@@ -1,10 +1,10 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.tree.InsnList;
|
||||
import org.spongepowered.asm.lib.tree.InsnNode;
|
||||
import org.spongepowered.asm.lib.tree.VarInsnNode;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.VarInsnNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode;
|
||||
|
||||
+6
-6
@@ -1,12 +1,12 @@
|
||||
package io.github.tox1cozz.mixinextras.injector;
|
||||
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.AnnotationNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.objectweb.asm.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.AnnotationType;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.Type;
|
||||
import org.spongepowered.asm.lib.tree.AbstractInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.AnnotationNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo.HandlerPrefix;
|
||||
|
||||
+9
-3
@@ -3,9 +3,15 @@ package io.github.tox1cozz.mixinextras.injector;
|
||||
import io.github.tox1cozz.mixinextras.utils.CompatibilityHelper;
|
||||
import io.github.tox1cozz.mixinextras.utils.InjectorUtils;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.Type;
|
||||
import org.spongepowered.asm.lib.tree.*;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.objectweb.asm.Type;
|
||||
import org.objectweb.asm.tree.AbstractInsnNode;
|
||||
import org.objectweb.asm.tree.FieldInsnNode;
|
||||
import org.objectweb.asm.tree.InsnList;
|
||||
import org.objectweb.asm.tree.InsnNode;
|
||||
import org.objectweb.asm.tree.JumpInsnNode;
|
||||
import org.objectweb.asm.tree.LabelNode;
|
||||
import org.objectweb.asm.tree.MethodInsnNode;
|
||||
import org.spongepowered.asm.mixin.injection.code.Injector;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionInfo;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionNodes.InjectionNode;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
package io.github.tox1cozz.mixinextras.utils;
|
||||
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.objectweb.asm.Opcodes;
|
||||
import org.spongepowered.asm.mixin.injection.struct.InjectionNodes;
|
||||
|
||||
public class InjectorUtils {
|
||||
|
||||
@@ -1 +1 @@
|
||||
mixinExtrasVersion=0.4.1
|
||||
mixinExtrasVersion=0.5.0
|
||||
@@ -21,7 +21,7 @@ shadowJar {
|
||||
'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
|
||||
'FMLCorePluginContainsFMLMod': true,
|
||||
'ForceLoadAsMod': true,
|
||||
'MixinConfigs': 'mixingasm.mixin.json',
|
||||
'MixinConfigs': 'mixingasm.init.mixin.json,mixingasm.mixin.json',
|
||||
'TweakOrder': 0,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.6",
|
||||
"target": "@env(INIT)",
|
||||
"package": "makamys.mixingasm.mixin",
|
||||
"compatibilityLevel": "JAVA_8",
|
||||
"mixins": [],
|
||||
"plugin": "makamys.mixingasm.MixinConfigPlugin"
|
||||
}
|
||||
+1
-1
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
|
||||
@@ -1,3 +1,3 @@
|
||||
buildPath=../build/tmp/ci
|
||||
modrinthRelations =
|
||||
curseForgeRelations = embeddedLibrary:spongemixins;embeddedLibrary:mixinbooterlegacy;embeddedLibrary:gasstation;embeddedLibrary:gtnhmixins
|
||||
curseForgeRelations = embeddedLibrary:spongemixins;embeddedLibrary:mixinbooterlegacy;embeddedLibrary:gtnhmixins
|
||||
@@ -108,17 +108,6 @@ compareVersion("Mixin (UniMix)",
|
||||
stripBuildIdentifiers(property(localFile("module-mixin/gradle.properties"), "unimixMixinVersion")),
|
||||
property(githubFile("LegacyModdingMC", "UniMix/main", "gradle.properties"), "buildVersion"))
|
||||
|
||||
compareVersion("Mixin (GTNH)",
|
||||
stripBuildIdentifiers(property(localFile("module-mixin/gradle.properties"), "gtnhMixinVersion")),
|
||||
lastVersionTag("GTNewHorizons/SpongePoweredMixin")) # GTNH doesn't have a master branch
|
||||
|
||||
compareVersion("Mixin (GasMix)",
|
||||
stripBuildIdentifiers(property(localFile("module-mixin/gradle.properties"), "gasmixMixinVersion")),
|
||||
property(githubFile("FalsePattern/GasMix", "master", "gradle.properties"), "buildVersion"))
|
||||
|
||||
compareVersions("GasStation",
|
||||
creditsSources("module-gasstation"))
|
||||
|
||||
compareVersions("GTNHMixins",
|
||||
creditsSources("module-gtnhmixins"))
|
||||
|
||||
|
||||
@@ -4,7 +4,6 @@ include 'module-compatfuture'
|
||||
include 'module-mixingasm'
|
||||
include 'module-spongemixins'
|
||||
include 'module-mixinbooterlegacy'
|
||||
include 'module-gasstation'
|
||||
include 'module-gtnhmixins'
|
||||
include 'module-mixinextras'
|
||||
include 'module-all'
|
||||
|
||||
Reference in new issue
Block a user