mmo-ref/mc-neoforge
1
0
Fork 0
mirror of https://github.com/neoforged/NeoForge synced 2026-08-20 08:23:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change modid to neoforge & related changes

Browse source
This commit is contained in:
Technici4n 2023-10-21 23:06:39 +02:00
parent 22eb3bd075
commit 2fbd67761f
20 changed files with 94 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gradle.properties
View file

@ -31,8 +31,7 @@ jetbrains_annotations_version=24.0.1
slf4j_api_version=2.0.7
apache_maven_artifact_version=3.8.5
jarjar_version=0.4.0
# note: this is coming from maven local, you won't find it anywhere else
fancy_mod_loader_version=42.42.11
fancy_mod_loader_version=1.0.1
mojang_logging_version=1.1.1
log4j_version=2.19.0
guava_version=31.1.2-jre

7
patches/net/minecraft/client/server/LanServerPinger.java.patch
View file

@ -1,6 +1,11 @@
--- a/net/minecraft/client/server/LanServerPinger.java
+++ b/net/minecraft/client/server/LanServerPinger.java
@@ -16,7 +16,7 @@
@@ -12,11 +12,11 @@
import net.neoforged.api.distmarker.OnlyIn;
import org.slf4j.Logger;
-@OnlyIn(Dist.CLIENT)
+// NeoForge: Make this client-only class also available on the server
public class LanServerPinger extends Thread {
private static final AtomicInteger UNIQUE_THREAD_ID = new AtomicInteger(0);
private static final Logger LOGGER = LogUtils.getLogger();

9
patches/net/minecraft/world/item/ItemStack.java.patch
View file

@ -19,15 +19,6 @@
private static final Logger LOGGER = LogUtils.getLogger();
public static final ItemStack EMPTY = new ItemStack((Void)null);
public static final DecimalFormat ATTRIBUTE_MODIFIER_FORMAT = Util.make(
@@ -131,7 +134,7 @@
this(p_204116_.value(), 1);
}
- private ItemStack(ItemLike p_41604_, int p_41605_, Optional<CompoundTag> p_41606_) {
+ public ItemStack(ItemLike p_41604_, int p_41605_, Optional<CompoundTag> p_41606_) {
this(p_41604_, p_41605_);
p_41606_.ifPresent(this::setTag);
}
@@ -140,27 +143,39 @@
this(p_220155_.value(), p_220156_);
}

0
projects/forge/.gitignore → projects/neoforge/.gitignore vendored
View file

22
projects/forge/build.gradle → projects/neoforge/build.gradle
View file

@ -91,19 +91,19 @@ runTypes {
singleInstance false
client true
arguments.addAll '--fml.forgeVersion', project.version
arguments.addAll '--fml.neoForgeVersion', project.version
arguments.addAll '--fml.fmlVersion', project.fancy_mod_loader_version
arguments.addAll '--fml.mcVersion', project.minecraft_version
arguments.addAll '--fml.mcpVersion', project.neoform_version
arguments.addAll '--fml.neoFormVersion', project.neoform_version
}
server {
server true
arguments.addAll '--fml.forgeVersion', project.version
arguments.addAll '--fml.neoForgeVersion', project.version
arguments.addAll '--fml.fmlVersion', project.fancy_mod_loader_version
arguments.addAll '--fml.mcVersion', project.minecraft_version
arguments.addAll '--fml.mcpVersion', project.neoform_version
arguments.addAll '--fml.neoFormVersion', project.neoform_version
}
gameTestServer {
@ -122,10 +122,10 @@ runTypes {
dataGenerator true
// Don't set modid here so we can reuse this runType for test datagen
arguments.addAll '--fml.forgeVersion', project.version
arguments.addAll '--fml.neoForgeVersion', project.version
arguments.addAll '--fml.fmlVersion', project.fancy_mod_loader_version
arguments.addAll '--fml.mcVersion', project.minecraft_version
arguments.addAll '--fml.mcpVersion', project.neoform_version
arguments.addAll '--fml.neoFormVersion', project.neoform_version
}
}
@ -141,7 +141,7 @@ runs {
"Data" {
configure project.runTypes.data
programArguments.addAll '--mod', 'forge'
programArguments.addAll '--mod', 'neoforge'
modSources.add project.sourceSets.main
@ -161,26 +161,26 @@ runs.configureEach { it ->
launcherProfile {
arguments {
game '--fml.forgeVersion'
game '--fml.neoForgeVersion'
game project.version
game '--fml.fmlVersion'
game project.fancy_mod_loader_version
game '--fml.mcVersion'
game project.minecraft_version
game '--fml.mcpVersion'
game '--fml.neoFormVersion'
game project.neoform_version
}
}
userdevProfile {
runTypes.configureEach {
argument '--fml.forgeVersion'
argument '--fml.neoForgeVersion'
argument project.version
argument '--fml.fmlVersion'
argument project.fancy_mod_loader_version
argument '--fml.mcVersion'
argument project.minecraft_version
argument '--fml.mcpVersion'
argument '--fml.neoFormVersion'
argument project.neoform_version
}
}

4
settings.gradle
View file

@ -20,10 +20,10 @@ rootProject.name = rootDir.name
dynamicProjects {
include ':base'
include ':forge'
include ':neoforge'
project(":base").projectDir = file("projects/base")
project(":forge").projectDir = file("projects/forge")
project(":neoforge").projectDir = file("projects/neoforge")
}
include ':tests'

8
src/main/java/net/neoforged/neoforge/client/ForgeHooksClient.java
View file

@ -159,11 +159,11 @@ import net.neoforged.fml.VersionChecker;
import net.neoforged.fml.common.Mod;
import net.neoforged.neoforge.forge.snapshots.ForgeSnapshotsModClient;
import net.neoforged.neoforge.gametest.ForgeGameTestHooks;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.neoforge.network.NetworkConstants;
import net.neoforged.neoforge.network.NetworkRegistry;
import net.neoforged.neoforge.network.ServerStatusPing;
import net.neoforged.neoforge.registries.GameData;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
@ -383,7 +383,7 @@ public class ForgeHooksClient
public static void renderMainMenu(TitleScreen gui, GuiGraphics guiGraphics, Font font, int width, int height, int alpha)
{
VersionChecker.Status status = ForgeVersion.getStatus();
VersionChecker.Status status = NeoForgeVersion.getStatus();
ForgeSnapshotsModClient.renderMainMenuWarning(status, gui, guiGraphics, font, width, height, alpha);
forgeStatusLine = switch(status)
@ -391,7 +391,7 @@ public class ForgeHooksClient
// case FAILED -> " Version check failed";
// case UP_TO_DATE -> "Forge up to date";
// case AHEAD -> "Using non-recommended Forge build, issues may arise.";
case OUTDATED, BETA_OUTDATED -> I18n.get("forge.update.newversion", ForgeVersion.getTarget());
case OUTDATED, BETA_OUTDATED -> I18n.get("forge.update.newversion", NeoForgeVersion.getTarget());
default -> null;
};
}
@ -862,7 +862,7 @@ public class ForgeHooksClient
}, () -> target.forgeData = new ExtendedServerListData("VANILLA", NetworkRegistry.canConnectToVanillaServer(),0, null));
}
private static final ResourceLocation ICON_SHEET = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/icons.png");
private static final ResourceLocation ICON_SHEET = new ResourceLocation(NeoForgeVersion.MOD_ID, "textures/gui/icons.png");
public static void drawForgePingInfo(JoinMultiplayerScreen gui, ServerData target, GuiGraphics guiGraphics, int x, int y, int width, int relativeMouseX, int relativeMouseY) {
int idx;
String tooltip;

4
src/main/java/net/neoforged/neoforge/client/gui/TitleScreenModUpdateIndicator.java
View file

@ -13,7 +13,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.fml.loading.FMLConfig;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.fml.VersionChecker;
import net.neoforged.neoforge.client.loading.ClientModLoader;
import net.neoforged.api.distmarker.Dist;
@ -22,7 +22,7 @@ import net.neoforged.api.distmarker.Dist;
public class TitleScreenModUpdateIndicator extends Screen
{
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(NeoForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
private final Button modButton;
private VersionChecker.Status showNotification = null;

4
src/main/java/net/neoforged/neoforge/client/gui/widget/ModListWidget.java
View file

@ -13,7 +13,7 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.FormattedText;
import net.minecraft.locale.Language;
import net.neoforged.neoforge.client.gui.ModListScreen;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.neoforge.common.util.MavenVersionStringHelper;
import net.neoforged.fml.VersionChecker;
import net.neoforged.neoforgespi.language.IModInfo;
@ -23,7 +23,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
public class ModListWidget extends ObjectSelectionList<ModListWidget.ModEntry>
{
private static String stripControlCodes(String value) { return net.minecraft.util.StringUtil.stripColor(value); }
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(NeoForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
private final int listWidth;
private ModListScreen parent;

6
src/main/java/net/neoforged/neoforge/client/loading/ForgeLoadingOverlay.java → src/main/java/net/neoforged/neoforge/client/loading/NeoForgeLoadingOverlay.java
View file

@ -43,7 +43,7 @@ import java.util.function.Supplier;
*
* It is somewhat a copy of the superclass render method.
*/
public class ForgeLoadingOverlay extends LoadingOverlay {
public class NeoForgeLoadingOverlay extends LoadingOverlay {
private final Minecraft minecraft;
private final ReloadInstance reload;
private final Consumer<Optional<Throwable>> onFinish;
@ -51,7 +51,7 @@ public class ForgeLoadingOverlay extends LoadingOverlay {
private final ProgressMeter progress;
private long fadeOutStart = -1L;
public ForgeLoadingOverlay(final Minecraft mc, final ReloadInstance reloader, final Consumer<Optional<Throwable>> errorConsumer, DisplayWindow displayWindow) {
public NeoForgeLoadingOverlay(final Minecraft mc, final ReloadInstance reloader, final Consumer<Optional<Throwable>> errorConsumer, DisplayWindow displayWindow) {
super(mc, reloader, errorConsumer, false);
this.minecraft = mc;
this.reload = reloader;
@ -62,7 +62,7 @@ public class ForgeLoadingOverlay extends LoadingOverlay {
}
public static Supplier<LoadingOverlay> newInstance(Supplier<Minecraft> mc, Supplier<ReloadInstance> ri, Consumer<Optional<Throwable>> handler, DisplayWindow window) {
return ()->new ForgeLoadingOverlay(mc.get(), ri.get(), handler, window);
return ()->new NeoForgeLoadingOverlay(mc.get(), ri.get(), handler, window);
}
@Override

18
src/main/java/net/neoforged/neoforge/common/ForgeMod.java
View file

@ -78,6 +78,8 @@ import net.neoforged.fml.*;
import net.neoforged.fml.config.ModConfig;
import net.neoforged.fml.event.lifecycle.*;
import net.neoforged.neoforge.forge.snapshots.ForgeSnapshotsMod;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.neoforge.internal.versions.neoform.NeoFormVersion;
import net.neoforged.neoforge.registries.*;
import net.neoforged.neoforge.registries.holdersets.AndHolderSet;
import net.neoforged.neoforge.registries.holdersets.AnyHolderSet;
@ -94,8 +96,6 @@ import net.neoforged.neoforge.server.command.ModIdArgument;
import net.neoforged.neoforge.server.permission.events.PermissionGatherEvent;
import net.neoforged.neoforge.server.permission.nodes.PermissionNode;
import net.neoforged.neoforge.server.permission.nodes.PermissionTypes;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import net.neoforged.neoforge.versions.mcp.MCPVersion;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -123,12 +123,12 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@Mod("forge")
@Mod(NeoForgeVersion.MOD_ID)
public class ForgeMod
{
public static final String VERSION_CHECK_CAT = "version_checking";
private static final Logger LOGGER = LogManager.getLogger();
private static final Marker FORGEMOD = MarkerManager.getMarker("FORGEMOD");
private static final Marker NEOFORGEMOD = MarkerManager.getMarker("NEOFORGE-MOD");
private static final DeferredRegister<Attribute> ATTRIBUTES = DeferredRegister.create(ForgeRegistries.Keys.ATTRIBUTES, "forge");
private static final DeferredRegister<ArgumentTypeInfo<?, ?>> COMMAND_ARGUMENT_TYPES = DeferredRegister.create(Registries.COMMAND_ARGUMENT_TYPE, "forge");
@ -435,7 +435,7 @@ public class ForgeMod
public ForgeMod()
{
LOGGER.info(FORGEMOD,"NeoForge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion());
LOGGER.info(NEOFORGEMOD,"NeoForge mod loading, version {}, for MC {} with MCP {}", NeoForgeVersion.getVersion(), NeoFormVersion.getMCVersion(), NeoFormVersion.getMCPVersion());
ForgeSnapshotsMod.logStartupWarning();
INSTANCE = this;
MinecraftForge.initialize();
@ -445,9 +445,9 @@ public class ForgeMod
return uuid.toString();
});
LOGGER.debug(FORGEMOD, "Loading Network data for FML net version: {}", NetworkConstants.init());
CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec);
CrashReportCallables.registerCrashCallable("NeoForge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion());
LOGGER.debug(NEOFORGEMOD, "Loading Network data for FML net version: {}", NetworkConstants.init());
CrashReportCallables.registerCrashCallable("FML", NeoForgeVersion::getSpec);
CrashReportCallables.registerCrashCallable("NeoForge", ()-> NeoForgeVersion.getGroup()+":"+ NeoForgeVersion.getVersion());
final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
// Forge-provided datapack registries
@ -480,7 +480,7 @@ public class ForgeMod
ForgeDeferredRegistriesSetup.setup(modEventBus);
// Forge does not display problems when the remote is not matching.
ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, ()->new IExtensionPoint.DisplayTest(()->"ANY", (remote, isServer)-> true));
StartupMessageManager.addModMessage("NeoForge version "+ForgeVersion.getVersion());
StartupMessageManager.addModMessage("NeoForge version "+ NeoForgeVersion.getVersion());
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);

4
src/main/java/net/neoforged/neoforge/common/MinecraftForge.java
View file

@ -11,8 +11,8 @@ import net.neoforged.bus.api.BusBuilder;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.event.IModBusEvent;
import net.neoforged.fml.loading.FMLEnvironment;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.neoforge.network.DualStackUtils;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.Marker;
@ -43,7 +43,7 @@ public class MinecraftForge
*/
public static void initialize()
{
LOGGER.info(FORGE,"NeoForge v{} Initialized", ForgeVersion.getVersion());
LOGGER.info(FORGE,"NeoForge v{} Initialized", NeoForgeVersion.getVersion());
UsernameCache.load();
TierSortingRegistry.init();

4
src/main/java/net/neoforged/neoforge/gametest/ForgeGameTestHooks.java
View file

@ -33,12 +33,12 @@ public class ForgeGameTestHooks
public static boolean isGametestEnabled()
{
return !FMLLoader.isProduction() && (SharedConstants.IS_RUNNING_IN_IDE || isGametestServer() || Boolean.getBoolean("forge.enableGameTest"));
return !FMLLoader.isProduction() && (SharedConstants.IS_RUNNING_IN_IDE || isGametestServer() || Boolean.getBoolean("neoforge.enableGameTest"));
}
public static boolean isGametestServer()
{
return !FMLLoader.isProduction() && Boolean.getBoolean("forge.gameTestServer");
return !FMLLoader.isProduction() && Boolean.getBoolean("neoforge.gameTestServer");
}
@SuppressWarnings("deprecation")

4
src/main/java/net/neoforged/neoforge/gametest/GameTestMain.java
View file

@ -11,8 +11,8 @@ public class GameTestMain
{
public static void main(String[] args) throws Exception
{
System.setProperty("forge.enableGameTest", "true");
System.setProperty("forge.gameTestServer", "true");
System.setProperty("neoforge.enableGameTest", "true");
System.setProperty("neoforge.gameTestServer", "true");
Main.main(args);
}
}

8
src/main/java/net/neoforged/neoforge/internal/BrandingControl.java
View file

@ -17,8 +17,8 @@ import net.neoforged.neoforge.client.ForgeHooksClient;
import net.neoforged.neoforge.common.ForgeI18n;
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.forge.snapshots.ForgeSnapshotsMod;
import net.neoforged.neoforge.versions.forge.ForgeVersion;
import net.neoforged.neoforge.versions.mcp.MCPVersion;
import net.neoforged.neoforge.internal.versions.neoforge.NeoForgeVersion;
import net.neoforged.neoforge.internal.versions.neoform.NeoFormVersion;
public class BrandingControl
@ -32,8 +32,8 @@ public class BrandingControl
if (brandings == null)
{
ImmutableList.Builder<String> brd = ImmutableList.builder();
brd.add(ForgeSnapshotsMod.BRANDING_NAME + ' ' + ForgeVersion.getVersion());
brd.add("Minecraft " + MCPVersion.getMCVersion());
brd.add(ForgeSnapshotsMod.BRANDING_NAME + ' ' + NeoForgeVersion.getVersion());
brd.add("Minecraft " + NeoFormVersion.getMCVersion());
int tModCount = ModList.get().size();
brd.add(ForgeI18n.parseMessage("fml.menu.loadingmods", tModCount));
brandings = brd.build();

42
src/main/java/net/neoforged/neoforge/versions/forge/ForgeVersion.java → src/main/java/net/neoforged/neoforge/internal/versions/neoforge/NeoForgeVersion.java
View file

@ -3,7 +3,7 @@
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.neoforged.neoforge.versions.forge;
package net.neoforged.neoforge.internal.versions.neoforge;
import net.neoforged.fml.Logging;
import net.neoforged.fml.ModList;
@ -14,37 +14,37 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Nullable;
public class ForgeVersion
public class NeoForgeVersion
{
private static final Logger LOGGER = LogManager.getLogger();
// This is Forge's Mod Id, used for the ForgeMod and resource locations
public static final String MOD_ID = "forge";
public static final String MOD_ID = "neoforge";
private static final String forgeVersion;
private static final String forgeSpec;
private static final String forgeGroup;
private static final String neoForgeVersion;
private static final String neoForgeSpec;
private static final String neoForgeGroup;
static {
LOGGER.debug(Logging.CORE, "NeoForge Version package {} from {}", ForgeVersion.class.getPackage(), ForgeVersion.class.getClassLoader());
String vers = JarVersionLookupHandler.getImplementationVersion(ForgeVersion.class).orElse(FMLLoader.versionInfo().forgeVersion());
if (vers == null) throw new RuntimeException("Missing forge version, cannot continue");
String spec = JarVersionLookupHandler.getSpecificationVersion(ForgeVersion.class).orElse(System.getenv("FORGE_SPEC"));
if (spec == null) throw new RuntimeException("Missing forge spec, cannot continue");
String group = JarVersionLookupHandler.getImplementationTitle(ForgeVersion.class).orElse("net.neoforged");
LOGGER.debug(Logging.CORE, "NeoForge Version package {} from {}", NeoForgeVersion.class.getPackage(), NeoForgeVersion.class.getClassLoader());
String vers = JarVersionLookupHandler.getImplementationVersion(NeoForgeVersion.class).orElse(FMLLoader.versionInfo().neoForgeVersion());
if (vers == null) throw new RuntimeException("Missing NeoForge version, cannot continue");
String spec = JarVersionLookupHandler.getSpecificationVersion(NeoForgeVersion.class).orElse(System.getenv("NEOFORGE_SPEC"));
if (spec == null) throw new RuntimeException("Missing NeoForge spec, cannot continue");
String group = JarVersionLookupHandler.getImplementationTitle(NeoForgeVersion.class).orElse("net.neoforged");
if (group == null) {
group = "net.neoforged"; // If all else fails, Our normal group
}
forgeVersion = vers;
forgeSpec = spec;
forgeGroup = group;
LOGGER.debug(Logging.CORE, "Found NeoForge version {}", forgeVersion);
LOGGER.debug(Logging.CORE, "Found NeoForge spec {}", forgeSpec);
LOGGER.debug(Logging.CORE, "Found NeoForge group {}", forgeGroup);
neoForgeVersion = vers;
neoForgeSpec = spec;
neoForgeGroup = group;
LOGGER.debug(Logging.CORE, "Found NeoForge version {}", neoForgeVersion);
LOGGER.debug(Logging.CORE, "Found NeoForge spec {}", neoForgeSpec);
LOGGER.debug(Logging.CORE, "Found NeoForge group {}", neoForgeGroup);
}
public static String getVersion()
{
return forgeVersion;
return neoForgeVersion;
}
public static VersionChecker.Status getStatus()
@ -60,11 +60,11 @@ public class ForgeVersion
}
public static String getSpec() {
return forgeSpec;
return neoForgeSpec;
}
public static String getGroup() {
return forgeGroup;
return neoForgeGroup;
}
}

23
src/main/java/net/neoforged/neoforge/versions/mcp/MCPVersion.java → src/main/java/net/neoforged/neoforge/internal/versions/neoform/NeoFormVersion.java
View file

@ -3,7 +3,7 @@
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.neoforged.neoforge.versions.mcp;
package net.neoforged.neoforge.internal.versions.neoform;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -12,31 +12,26 @@ import net.neoforged.fml.Logging;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.fml.loading.JarVersionLookupHandler;
public class MCPVersion {
public class NeoFormVersion {
private static final Logger LOGGER = LogManager.getLogger();
private static final String mcVersion;
private static final String mcpVersion;
private static final String neoFormVersion;
static {
LOGGER.debug(Logging.CORE, "MCP Version package {} from {}", MCPVersion.class.getPackage(), MCPVersion.class.getClassLoader());
mcVersion = JarVersionLookupHandler.getSpecificationVersion(MCPVersion.class).orElse(FMLLoader.versionInfo().mcVersion());
LOGGER.debug(Logging.CORE, "NeoForm Version package {} from {}", NeoFormVersion.class.getPackage(), NeoFormVersion.class.getClassLoader());
mcVersion = JarVersionLookupHandler.getSpecificationVersion(NeoFormVersion.class).orElse(FMLLoader.versionInfo().mcVersion());
if (mcVersion == null) throw new RuntimeException("Missing MC version, cannot continue");
mcpVersion = JarVersionLookupHandler.getImplementationVersion(MCPVersion.class).orElse(FMLLoader.versionInfo().mcpVersion());
if (mcpVersion == null) throw new RuntimeException("Missing MCP version, cannot continue");
neoFormVersion = JarVersionLookupHandler.getImplementationVersion(NeoFormVersion.class).orElse(FMLLoader.versionInfo().neoFormVersion());
if (neoFormVersion == null) throw new RuntimeException("Missing NeoForm version, cannot continue");
LOGGER.debug(Logging.CORE, "Found MC version information {}", mcVersion);
LOGGER.debug(Logging.CORE, "Found MCP version information {}", mcpVersion);
LOGGER.debug(Logging.CORE, "Found NeoForm version information {}", neoFormVersion);
}
public static String getMCVersion() {
return mcVersion;
}
public static String getMCPVersion() {
return mcpVersion;
}
public static String getMCPandMCVersion()
{
return mcVersion+"-"+mcpVersion;
return neoFormVersion;
}
}

2
src/main/resources/META-INF/MANIFEST.MF
View file

@ -1 +1 @@
FML-System-Mods: forge
FML-System-Mods: neoforge

8
src/main/resources/META-INF/mods.toml
View file

@ -1,13 +1,13 @@
modLoader="javafml"
loaderVersion="[24,]"
loaderVersion="[1,]"
issueTrackerURL="https://github.com/neoforged/NeoForge/issues"
logoFile="neoforged_logo.png"
license="LGPL v2.1"
[[mods]]
modId="forge"
# We use the global forge version
version="${global.forgeVersion}"
modId="neoforge"
# We use the global NeoForge version
version="${global.neoForgeVersion}"
updateJSONURL="https://maven.neoforged.net/releases/net/neoforged/forge/promotions_slim.json"
displayName="NeoForge"
credits="Anyone who has contributed on Github and supports our development"

18
tests/build.gradle
View file

@ -1,7 +1,7 @@
apply plugin: 'net.neoforged.gradle.platform'
apply plugin: 'java'
def forgeProject = project(':forge')
def neoforgeProject = project(':neoforge')
repositories {
mavenLocal()
@ -24,7 +24,7 @@ sourceSets {
}
dependencies {
implementation forgeProject
implementation neoforgeProject
implementation "org.junit.jupiter:junit-jupiter-api:${project.jupiter_api_version}"
implementation "org.junit.vintage:junit-vintage-engine:${project.vintage_engine_version}"
@ -36,19 +36,19 @@ dependencies {
runs {
client {
configure forgeProject.runTypes.client
configure neoforgeProject.runTypes.client
}
server {
configure forgeProject.runTypes.server
configure neoforgeProject.runTypes.server
}
"GameTest Server" {
configure forgeProject.runTypes.gameTestServer
configure neoforgeProject.runTypes.gameTestServer
}
"GameTest Client" {
configure forgeProject.runTypes.gameTestClient
configure neoforgeProject.runTypes.gameTestClient
}
data {
configure forgeProject.runTypes.data
configure neoforgeProject.runTypes.data
programArguments.addAll '--flat', '--all', '--validate',
'--mod', 'data_gen_test',
@ -77,8 +77,8 @@ runs {
//We need the assets and natives tasks from the forge project.
runs.configureEach {
dependsOn(forgeProject.runtime.assets, forgeProject.runtime.natives)
modSource forgeProject.sourceSets.main
dependsOn(neoforgeProject.runtime.assets, neoforgeProject.runtime.natives)
modSource neoforgeProject.sourceSets.main
}
afterEvaluate {