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) {
- }
-}
\ No newline at end of file
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/MinecraftURLClassPath.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/MinecraftURLClassPath.java
deleted file mode 100644
index c90dfdf..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/MinecraftURLClassPath.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Copyright 2020 TimeConqueror
- *
- * 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:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * 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;
-
-@Deprecated
-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() {
- }
-}
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/Tags.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/Tags.java
deleted file mode 100644
index 3448c9c..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/Tags.java
+++ /dev/null
@@ -1,13 +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!
-
-@Deprecated
-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";
-}
\ No newline at end of file
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/core/GasStationCore.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/core/GasStationCore.java
deleted file mode 100644
index 0513db4..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/core/GasStationCore.java
+++ /dev/null
@@ -1,84 +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")
-@Deprecated
-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 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;
- }
-}
-
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/DevMixinPlugin.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/DevMixinPlugin.java
deleted file mode 100644
index 23beb17..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/DevMixinPlugin.java
+++ /dev/null
@@ -1,47 +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;
-
-@Deprecated
-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 myTargets, Set otherTargets) {
-
- }
-
- @Override
- public List 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) {
-
- }
-}
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/IModDiscovererMixin.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/IModDiscovererMixin.java
deleted file mode 100644
index fbcf74e..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/IModDiscovererMixin.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.falsepattern.gasstation.mixins;
-
-import cpw.mods.fml.common.discovery.ModCandidate;
-
-import java.util.List;
-
-@Deprecated
-public interface IModDiscovererMixin {
- List getCandidates();
-}
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/LoadControllerMixin.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/LoadControllerMixin.java
deleted file mode 100644
index 4483f60..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/LoadControllerMixin.java
+++ /dev/null
@@ -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 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);
- }
- }
-}
\ No newline at end of file
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/LoaderMixin.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/LoaderMixin.java
deleted file mode 100644
index dac425a..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/LoaderMixin.java
+++ /dev/null
@@ -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 removeDuplicateFiles(ModDiscoverer instance) {
- List candidates = ((IModDiscovererMixin)instance).getCandidates();
- List uniques = new ArrayList<>();
- List 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();
- }
-}
diff --git a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/ModDiscovererMixin.java b/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/ModDiscovererMixin.java
deleted file mode 100644
index 66ca0ab..0000000
--- a/module-gasstation/src/main/java/com/falsepattern/gasstation/mixins/mixin/dev/ModDiscovererMixin.java
+++ /dev/null
@@ -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 candidates;
-
- @Override
- public List 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 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) {
-
- }
-}
diff --git a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java b/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java
deleted file mode 100644
index 97ce785..0000000
--- a/module-gasstation/src/main/java/io/github/legacymoddingmc/unimixins/gasstation/GasStationModule.java
+++ /dev/null
@@ -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 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;
- }
-
-
-
-}
diff --git a/module-gasstation/src/main/resources/mcmod.info b/module-gasstation/src/main/resources/mcmod.info
deleted file mode 100644
index 6053a33..0000000
--- a/module-gasstation/src/main/resources/mcmod.info
+++ /dev/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": []
- }
-]
diff --git a/module-gasstation/src/main/resources/mixins.gasstation.json b/module-gasstation/src/main/resources/mixins.gasstation.json
deleted file mode 100644
index f2f7bd7..0000000
--- a/module-gasstation/src/main/resources/mixins.gasstation.json
+++ /dev/null
@@ -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"
-}
-
diff --git a/module-gasstation/src/main/resources/mixins.gasstation.refmap.json b/module-gasstation/src/main/resources/mixins.gasstation.refmap.json
deleted file mode 100644
index 2f158e8..0000000
--- a/module-gasstation/src/main/resources/mixins.gasstation.refmap.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "mappings": {},
- "data": {}
-}
diff --git a/module-gtnhmixins/build.gradle b/module-gtnhmixins/build.gradle
index 0e35600..83c72e4 100644
--- a/module-gtnhmixins/build.gradle
+++ b/module-gtnhmixins/build.gradle
@@ -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
diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java
deleted file mode 100644
index 66ffa46..0000000
--- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsConfig.java
+++ /dev/null
@@ -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;
-}
diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java
index a8a29b4..4e4efe9 100644
--- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java
+++ b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/GTNHMixinsModule.java
@@ -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;
}
-
-
}
diff --git a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/asm/LegacyGTNHMixinExtrasGenerator.java b/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/asm/LegacyGTNHMixinExtrasGenerator.java
deleted file mode 100644
index c7c166f..0000000
--- a/module-gtnhmixins/src/main/java/io/github/legacymoddingmc/unimixins/gtnhmixins/asm/LegacyGTNHMixinExtrasGenerator.java
+++ /dev/null
@@ -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));
- }
-}
diff --git a/module-mixin/build.gradle b/module-mixin/build.gradle
index 40a0863..fae1310 100644
--- a/module-mixin/build.gradle
+++ b/module-mixin/build.gradle
@@ -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", "gtnh"]) + ["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", gtnh: "GTNH", unimix: "UniMix"][mixinFlavor]
def mixinVersion = "UNKNOWN"
configurations.create("shadow$_flavor")
@@ -47,21 +47,14 @@ flavors.each {
if (mixinFlavor == "fabric" || mixinFlavor == "unimix") {
def uniLocal = mixinFlavor == "unimix" && project.hasProperty("local")
- def uniJitpack = mixinFlavor == "unimix" && !uniLocal
-
- mixinVersion = mixinFlavor == "fabric" ? fabricMixinVersion : unimixMixinVersion
+ mixinVersion = mixinFlavor == "fabric" ? fabricMixinVersion : unimixMixinVersion
if (uniLocal) {
mixinVersion += "-local"
}
- // 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)
-
- def mixinGroup = mixinFlavor == "fabric" ? "net.fabricmc" : "${uniJitpack ? 'com' : 'io'}.github.legacymoddingmc"
- def mixinArtifactId = uniJitpack ? "UniMix" : "sponge-mixin"
- def mixinDepVersion = uniJitpack ? mixinVersion.replace('+', '_') : mixinVersion
+ def mixinGroup = mixinFlavor == "fabric" ? "net.fabricmc" : "io.github.legacymoddingmc"
+ def mixinArtifactId = "sponge-mixin"
+ def mixinDepVersion = mixinVersion
def mixinDep = "$mixinGroup:$mixinArtifactId:$mixinDepVersion"
mixinFlavorClassifier = "$mixinFlavor.${mixinVersion.replace('+', '-')}"
@@ -198,35 +191,10 @@ flavors.each {
}
}
- 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
+ // Common
task("createMcmodInfo$_flavor", type: Copy) {
outputs.upToDateWhen { false }
diff --git a/module-mixin/gradle.properties b/module-mixin/gradle.properties
index c2b855b..9adf411 100644
--- a/module-mixin/gradle.properties
+++ b/module-mixin/gradle.properties
@@ -1,7 +1,6 @@
fabricMixinVersion=0.15.3+mixin.0.8.7
-unimixMixinVersion=0.15.4+mixin.0.8.7
+unimixMixinVersion=0.15.5+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
diff --git a/module-mixinbooterlegacy/build.gradle b/module-mixinbooterlegacy/build.gradle
index e586306..88ebc70 100644
--- a/module-mixinbooterlegacy/build.gradle
+++ b/module-mixinbooterlegacy/build.gradle
@@ -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 (
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java
index 9839337..ccb19c1 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjectionInfo.java
@@ -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")
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java
index a5dc5d1..1c6afe6 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyExpressionValueInjector.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java
index f29260e..aadaa84 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjectionInfo.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java
index 12fbd50..40f60f9 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReceiverInjector.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java
index eda511a..c496893 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjectionInfo.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java
index d726364..b56777b 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/ModifyReturnValueInjector.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java
index 14a3a8b..15932b5 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjectionInfo.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java
index 7ee2262..2dbd00d 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/injector/WrapWithConditionInjector.java
@@ -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;
diff --git a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java
index 512508d..9fda55b 100644
--- a/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java
+++ b/module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinextras/utils/InjectorUtils.java
@@ -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 {
diff --git a/publish/publish-1.7.10.properties b/publish/publish-1.7.10.properties
index cf08978..6fef198 100644
--- a/publish/publish-1.7.10.properties
+++ b/publish/publish-1.7.10.properties
@@ -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
diff --git a/scripts/check_upstream.py b/scripts/check_upstream.py
index c00d030..f5f386f 100644
--- a/scripts/check_upstream.py
+++ b/scripts/check_upstream.py
@@ -112,13 +112,6 @@ 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"))
diff --git a/settings.gradle b/settings.gradle
index 7d60482..faf4e88 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -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'