From f593528beb5fe3da8828f8a1823e654e5441caec Mon Sep 17 00:00:00 2001 From: makamys Date: Mon, 13 Feb 2023 19:12:14 +0100 Subject: [PATCH] Revert "Implement fabric-modId decorations for Forge mods" I'm moving this inside UniMixins instead, to mirror how Fabric keeps the decoration initialization code inside Fabric loader. This reverts commit 24c5ac4009d7d0fbcbb017daeb0244d231edb06e. --- .../platform/MixinPlatformAgentFMLLegacy.java | 13 -- .../spongepowered/asm/mixin/ForgeUtils.java | 115 ------------------ 2 files changed, 128 deletions(-) delete mode 100644 src/launchwrapper/java/org/spongepowered/asm/mixin/ForgeUtils.java diff --git a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java index f5dd1eba..06388987 100644 --- a/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java +++ b/src/launchwrapper/java/org/spongepowered/asm/launch/platform/MixinPlatformAgentFMLLegacy.java @@ -42,7 +42,6 @@ import org.apache.logging.log4j.core.appender.AbstractAppender; import org.spongepowered.asm.launch.GlobalProperties; import org.spongepowered.asm.launch.platform.container.ContainerHandleURI; import org.spongepowered.asm.launch.platform.container.IContainerHandle; -import org.spongepowered.asm.mixin.ForgeUtils; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.MixinEnvironment; import org.spongepowered.asm.mixin.MixinEnvironment.Phase; @@ -434,18 +433,6 @@ public class MixinPlatformAgentFMLLegacy extends MixinPlatformAgentAbstract impl } } - /** - *

Called after Mixin configs have been loaded. Do Forge-specific - * initialization.

- * - *

Note: The mod bootstrapping Mixin must contain an FML plugin for this - * to get called.

- */ - @Override - public void initPrimaryContainer() { - ForgeUtils.init(); - } - /* (non-Javadoc) * @see org.spongepowered.asm.launch.platform.MixinPlatformAgentAbstract * #getSideName() diff --git a/src/launchwrapper/java/org/spongepowered/asm/mixin/ForgeUtils.java b/src/launchwrapper/java/org/spongepowered/asm/mixin/ForgeUtils.java deleted file mode 100644 index d1213e4b..00000000 --- a/src/launchwrapper/java/org/spongepowered/asm/mixin/ForgeUtils.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * This file is part of Mixin, licensed under the MIT License (MIT). - * - * Copyright (c) SpongePowered - * Copyright (c) contributors - * - * 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 org.spongepowered.asm.mixin; - -// Reference: https://github.com/FabricMC/fabric-loader/blob/2a378f1c563b6ec96ae6620a278ecd23fa09da0f/src/main/java/net/fabricmc/loader/impl/launch/FabricMixinBootstrap.java - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import net.minecraft.launchwrapper.Launch; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.spongepowered.asm.mixin.transformer.Config; - -import java.io.InputStreamReader; -import java.net.URL; -import java.util.*; - -public final class ForgeUtils { - - private static final Logger logger = LogManager.getLogger(); - - public static final String KEY_MOD_ID = "fabric-modId"; - - private ForgeUtils() {} - - public static void init() { - Map jarNameToModid = createJarNameToModidMap(); - - for (Config config : Mixins.getConfigs()) { - URL resource = Launch.classLoader.getResource(config.getName()); - if (resource != null) { - String jarName = getJarNameFromResourceUrl(resource); - if (jarName != null) { - String modid = jarNameToModid.get(jarName); - if (modid != null) { - config.getConfig().decorate(KEY_MOD_ID, modid); - } - } - } - } - } - - private static Map createJarNameToModidMap() { - Map map = new HashMap<>(); - try { - for (URL url : Collections.list(Launch.classLoader.getResources("mcmod.info"))) { - String fileName = getJarNameFromResourceUrl(url); - if (fileName != null) { - List metas = parseMcmodInfo(url); - if (!metas.isEmpty()) { - String modid = metas.get(0).modid; - if (modid != null) { - map.put(fileName, modid); - } - } - } - } - } catch (Exception e) { - logger.warn("Failed to construct jar name -> modid map, mod names will not be shown in errors."); - } - return map; - } - - private static List parseMcmodInfo(URL url) { - try { - JsonElement root = new Gson().fromJson(new InputStreamReader(url.openStream()), JsonElement.class); - if (root.isJsonArray()) { - return Arrays.asList(new Gson().fromJson(new InputStreamReader(url.openStream()), ModMetadata[].class)); - } else { - return Arrays.asList(new Gson().fromJson(new InputStreamReader(url.openStream()), ModMetadata.class)); - } - } catch (Exception e) { - logger.warn("Failed to parse mcmod.info at " + url + ": " + e); - } - return Arrays.asList(); - } - - private static String getJarNameFromResourceUrl(URL url) { - if (url.getPath().contains("!/")) { - String filePath = url.getPath().split("!/")[0]; - String[] parts = filePath.split("/"); - if (parts.length != 0) { - return parts[parts.length - 1]; - } - } - return null; - } - - private static class ModMetadata { - String modid; - } - -}