From 9bf227afeb1312006910484d858b3a6db793f2de Mon Sep 17 00:00:00 2001 From: SizableShrimp Date: Sun, 13 Mar 2022 16:48:55 -0500 Subject: [PATCH] [1.18.x] Fix FMLOnly in forgedev and userdev (#8512) Signed-off-by: SizableShrimp --- .../fmlonly/FMLOnlyBindings.java | 5 +++++ .../net/minecraftforge/fmlonly/FMLOnlyMod.java | 11 +++++++++++ .../fmlonlyclient/ClientModLoader.java | 18 ++---------------- fmlonly/src/main/resources/META-INF/mods.toml | 16 ++++++++++++++++ 4 files changed, 34 insertions(+), 16 deletions(-) create mode 100644 fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyMod.java create mode 100644 fmlonly/src/main/resources/META-INF/mods.toml diff --git a/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyBindings.java b/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyBindings.java index 6cf1421968..97f6c5eb22 100644 --- a/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyBindings.java +++ b/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyBindings.java @@ -1,3 +1,8 @@ +/* + * Minecraft Forge - Forge Development LLC + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.fmlonly; import net.minecraftforge.eventbus.api.BusBuilder; diff --git a/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyMod.java b/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyMod.java new file mode 100644 index 0000000000..006bcdebab --- /dev/null +++ b/fmlonly/src/main/java/net/minecraftforge/fmlonly/FMLOnlyMod.java @@ -0,0 +1,11 @@ +/* + * Minecraft Forge - Forge Development LLC + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.fmlonly; + +import net.minecraftforge.fml.common.Mod; + +@Mod("fmlonly") +public class FMLOnlyMod {} diff --git a/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java b/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java index 0473b03f22..3d733aa63d 100644 --- a/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java +++ b/fmlonly/src/main/java/net/minecraftforge/fmlonlyclient/ClientModLoader.java @@ -1,20 +1,6 @@ /* - * Minecraft Forge - * Copyright (c) 2016-2021. - * - * This library 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 version 2.1 - * of the License. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Minecraft Forge - Forge Development LLC + * SPDX-License-Identifier: LGPL-2.1-only */ package net.minecraftforge.fmlonlyclient; diff --git a/fmlonly/src/main/resources/META-INF/mods.toml b/fmlonly/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000000..2c6e362090 --- /dev/null +++ b/fmlonly/src/main/resources/META-INF/mods.toml @@ -0,0 +1,16 @@ +modLoader="javafml" +loaderVersion="[24,]" +issueTrackerURL="https://www.minecraftforge.net/" +license="LGPL v2.1" + +[[mods]] +modId="fmlonly" +# We use the global forge version +version="${global.forgeVersion}" +updateJSONURL="https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json" +displayName="Forge" +credits="Anyone who has contributed on Github and supports our development" +authors="LexManos,cpw" +description=''' + Forge, a broad compatibility API. + '''