Skip to content

Commit

Permalink
Update forge modid to neoforge & update branding
Browse files Browse the repository at this point in the history
  • Loading branch information
@Technici4n
Technici4n committed Oct 21, 2023
1 parent 2231af0 commit 858e0b2
Show file tree
Hide file tree
Showing 14 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/net/neoforged/fml/VersionChecker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void run()
{
if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK))
{
LOGGER.info("Global Forge version check system disabled, no further processing.");
LOGGER.info("Global NeoForge version check system disabled, no further processing.");
return;
}

Expand Down
10 changes: 5 additions & 5 deletions earlydisplay/src/main/java/net/neoforged/fml/earlydisplay/DisplayWindow.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public String name() {
public Runnable initialize(String[] arguments) {
final OptionParser parser = new OptionParser();
var mcversionopt = parser.accepts("fml.mcVersion").withRequiredArg().ofType(String.class);
var forgeversionopt = parser.accepts("fml.forgeVersion").withRequiredArg().ofType(String.class);
var forgeversionopt = parser.accepts("fml.neoForgeVersion").withRequiredArg().ofType(String.class);
var widthopt = parser.accepts("width")
.withRequiredArg().ofType(Integer.class)
.defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH));
Expand Down Expand Up @@ -452,13 +452,13 @@ public void initWindow(@Nullable String mcVersion) {
try (var glfwImgBuffer = GLFWImage.create(MemoryUtil.getAllocator().malloc(GLFWImage.SIZEOF), 1)) {
final ByteBuffer imgBuffer;
try (GLFWImage glfwImages = GLFWImage.malloc()) {
imgBuffer = STBHelper.loadImageFromClasspath("forge_logo.png", 20000, x, y, channels);
imgBuffer = STBHelper.loadImageFromClasspath("neoforged_icon.png", 20000, x, y, channels);
glfwImgBuffer.put(glfwImages.set(x[0], y[0], imgBuffer));
glfwSetWindowIcon(window, glfwImgBuffer);
STBImage.stbi_image_free(imgBuffer);
}
} catch (NullPointerException e) {
System.err.println("Failed to load forge logo");
System.err.println("Failed to load NeoForged icon");
}
handleLastGLFWError((error, description) -> LOGGER.debug(String.format("Suppressing GLFW icon error: [0x%X]%s", error, description)));

Expand Down Expand Up @@ -582,9 +582,9 @@ public <T> Supplier<T> loadingOverlay(final Supplier<?> mc, final Supplier<?> ri

@Override
public void updateModuleReads(final ModuleLayer layer) {
var fm = layer.findModule("forge").orElseThrow();
var fm = layer.findModule("neoforge").orElseThrow();
getClass().getModule().addReads(fm);
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.neoforged.neoforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
var clz = FMLLoader.getGameLayer().findModule("neoforge").map(l->Class.forName(l, "net.neoforged.neoforge.client.loading.NeoForgeLoadingOverlay")).orElseThrow();
var methods = Arrays.stream(clz.getMethods()).filter(m-> Modifier.isStatic(m.getModifiers())).collect(Collectors.toMap(Method::getName, Function.identity()));
loadingOverlay = methods.get("newInstance");
}
Expand Down
2 changes: 1 addition & 1 deletion loader/src/main/java/net/neoforged/fml/loading/FMLConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class FMLConfig
public enum ConfigValue {
EARLY_WINDOW_CONTROL("earlyWindowControl", Boolean.TRUE, "Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them."),
MAX_THREADS("maxThreads", -1, "Max threads for early initialization parallelism, -1 is based on processor count", FMLConfig::maxThreads),
VERSION_CHECK("versionCheck", Boolean.TRUE, "Enable forge global version checking"),
VERSION_CHECK("versionCheck", Boolean.TRUE, "Enable NeoForge global version checking"),
DEFAULT_CONFIG_PATH("defaultConfigPath", "defaultconfigs", "Default config path for servers"),
DISABLE_OPTIMIZED_DFU("disableOptimizedDFU", Boolean.TRUE, "Disables Optimized DFU client-side - already disabled on servers"),
EARLY_WINDOW_PROVIDER("earlyWindowProvider", "fmlearlywindow", "Early window provider"),
Expand Down
8 changes: 4 additions & 4 deletions loader/src/main/java/net/neoforged/fml/loading/FMLServiceProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ public void initialize(IEnvironment environment) {
arguments.put("modLists", modListsArgumentList);
arguments.put("mods", modsArgumentList);
arguments.put("mavenRoots", mavenRootsArgumentList);
arguments.put("forgeVersion", targetForgeVersion);
arguments.put("neoForgeVersion", targetForgeVersion);
arguments.put("fmlVersion", targetFMLVersion);
arguments.put("mcVersion", targetMcVersion);
arguments.put("mcpVersion", targetMcpVersion);
arguments.put("neoFormVersion", targetMcpVersion);
arguments.put("mcpMappings", targetMcpMappings);
LOGGER.debug(CORE, "Preparing launch handler");
FMLLoader.setupLaunchHandler(environment, arguments);
Expand Down Expand Up @@ -103,10 +103,10 @@ public void onLoad(IEnvironment environment, Set<String> otherServices) throws I
@Override
public void arguments(BiFunction<String, String, OptionSpecBuilder> argumentBuilder)
{
forgeOption = argumentBuilder.apply("forgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required();
forgeOption = argumentBuilder.apply("neoForgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required();
fmlOption = argumentBuilder.apply("fmlVersion", "FML Version number").withRequiredArg().ofType(String.class).required();
mcOption = argumentBuilder.apply("mcVersion", "Minecraft Version number").withRequiredArg().ofType(String.class).required();
mcpOption = argumentBuilder.apply("mcpVersion", "MCP Version number").withRequiredArg().ofType(String.class).required();
mcpOption = argumentBuilder.apply("neoFormVersion", "MCP Version number").withRequiredArg().ofType(String.class).required();
mappingsOption = argumentBuilder.apply("mcpMappings", "MCP Mappings Channel and Version").withRequiredArg().ofType(String.class);
modsOption = argumentBuilder.apply("mods", "List of mods to add").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
modListsOption = argumentBuilder.apply("modLists", "JSON modlists").withRequiredArg().ofType(String.class).withValuesSeparatedBy(",");
Expand Down
2 changes: 1 addition & 1 deletion loader/src/main/java/net/neoforged/fml/loading/ImmediateWindowHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public String getGLVersion() {

@Override
public void updateModuleReads(final ModuleLayer layer) {
var fm = layer.findModule("forge");
var fm = layer.findModule("neoforge");
if (fm.isPresent()) {
getClass().getModule().addReads(fm.get());
var clz = fm.map(l -> Class.forName(l, "net.neoforged.neoforge.client.loading.NoVizFallback")).orElseThrow();
Expand Down
2 changes: 1 addition & 1 deletion loader/src/main/java/net/neoforged/fml/loading/StringSubstitutor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class StringSubstitutor
{
private static final Map<String,String> globals = ImmutableMap.of(
"mcVersion", FMLLoader.versionInfo().mcVersion(),
"forgeVersion", FMLLoader.versionInfo().forgeVersion()
"neoForgeVersion", FMLLoader.versionInfo().neoForgeVersion()
);

public static String replace(final String in, final ModFile file) {
Expand Down
12 changes: 6 additions & 6 deletions loader/src/main/java/net/neoforged/fml/loading/VersionInfo.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@

import java.util.Map;

public record VersionInfo(String forgeVersion, String fmlVersion, String mcVersion, String mcpVersion) {
public record VersionInfo(String neoForgeVersion, String fmlVersion, String mcVersion, String neoFormVersion) {
VersionInfo(Map<String, ?> arguments) {
this((String) arguments.get("forgeVersion"), (String) arguments.get("fmlVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion"));
this((String) arguments.get("neoForgeVersion"), (String) arguments.get("fmlVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("neoFormVersion"));
}

public String mcAndForgeVersion() {
return mcVersion + "-"+ forgeVersion;
public String mcAndNeoForgeVersion() {
return mcVersion + "-"+ neoForgeVersion;
}
public String mcAndFmlVersion() {
return mcVersion+"-"+ fmlVersion;
}

public String mcAndMCPVersion() {
return mcVersion + "-" + mcpVersion;
public String mcAndNeoFormVersion() {
return mcVersion + "-" + neoFormVersion;
}
}
4 changes: 2 additions & 2 deletions loader/src/main/java/net/neoforged/fml/loading/targets/CommonClientLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ protected void runService(String[] arguments, ModuleLayer gameLayer) throws Thro
@Override
public LocatedPaths getMinecraftPaths() {
final var vers = FMLLoader.versionInfo();
var mc = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "srg", vers.mcAndMCPVersion());
var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "extra", vers.mcAndMCPVersion());
var mc = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "srg", vers.mcAndNeoFormVersion());
var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "client", "", "extra", vers.mcAndNeoFormVersion());
var mcstream = Stream.<Path>builder().add(mc).add(mcextra);
var modstream = Stream.<List<Path>>builder();

Expand Down
4 changes: 2 additions & 2 deletions loader/src/main/java/net/neoforged/fml/loading/targets/CommonServerLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ protected void runService(String[] arguments, ModuleLayer gameLayer) throws Thro
@Override
public LocatedPaths getMinecraftPaths() {
final var vers = FMLLoader.versionInfo();
var mc = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "srg", vers.mcAndMCPVersion());
var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "extra", vers.mcAndMCPVersion());
var mc = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "srg", vers.mcAndNeoFormVersion());
var mcextra = LibraryFinder.findPathForMaven("net.minecraft", "server", "", "extra", vers.mcAndNeoFormVersion());
var mcextra_filtered = SecureJar.from( // We only want it for it's resources. So filter everything else out.
(path, base) -> {
return path.equals("META-INF/versions/") || // This is required because it bypasses our filter for the manifest, and it's a multi-release jar.
Expand Down
4 changes: 2 additions & 2 deletions loader/src/main/java/net/neoforged/fml/loading/targets/ForgeClientLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class ForgeClientLaunchHandler extends CommonClientLaunchHandler {

@Override
protected void processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
var forgepatches = LibraryFinder.findPathForMaven("net.neoforged", "forge", "", "client", versionInfo.mcAndForgeVersion());
var forgejar = LibraryFinder.findPathForMaven("net.neoforged", "forge", "", "universal", versionInfo.mcAndForgeVersion());
var forgepatches = LibraryFinder.findPathForMaven("net.neoforged", "neoforge", "", "client", versionInfo.mcAndNeoForgeVersion());
var forgejar = LibraryFinder.findPathForMaven("net.neoforged", "neoforge", "", "universal", versionInfo.mcAndNeoForgeVersion());
mc.add(forgepatches);
mods.add(List.of(forgejar));
}
Expand Down
2 changes: 1 addition & 1 deletion loader/src/main/java/net/neoforged/fml/loading/targets/ForgeGametestDevLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public class ForgeGametestDevLaunchHandler extends CommonDevLaunchHandler {

@Override
public void runService(String[] arguments, ModuleLayer layer) throws Throwable {
Class.forName(layer.findModule("forge").orElseThrow(), "net.neoforged.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
Class.forName(layer.findModule("neoforge").orElseThrow(), "net.neoforged.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
}
}
2 changes: 1 addition & 1 deletion ...er/src/main/java/net/neoforged/fml/loading/targets/ForgeGametestUserdevLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ public class ForgeGametestUserdevLaunchHandler extends ForgeUserdevLaunchHandler

@Override
public void runService(String[] arguments, ModuleLayer layer) throws Throwable {
Class.forName(layer.findModule("forge").orElseThrow(), "net.neoforged.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
Class.forName(layer.findModule("neoforge").orElseThrow(), "net.neoforged.gametest.GameTestMain").getMethod("main", String[].class).invoke(null, (Object)arguments);
}
}
4 changes: 2 additions & 2 deletions loader/src/main/java/net/neoforged/fml/loading/targets/ForgeServerLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class ForgeServerLaunchHandler extends CommonServerLaunchHandler implemen

@Override
protected BiPredicate<String, String> processMCStream(VersionInfo versionInfo, Stream.Builder<Path> mc, BiPredicate<String, String> filter, Stream.Builder<List<Path>> mods) {
var forgepatches = LibraryFinder.findPathForMaven("net.neoforged", "forge", "", "server", versionInfo.mcAndForgeVersion());
var forgejar = LibraryFinder.findPathForMaven("net.neoforged", "forge", "", "universal", versionInfo.mcAndForgeVersion());
var forgepatches = LibraryFinder.findPathForMaven("net.neoforged", "neoforge", "", "server", versionInfo.mcAndNeoForgeVersion());
var forgejar = LibraryFinder.findPathForMaven("net.neoforged", "neoforge", "", "universal", versionInfo.mcAndNeoForgeVersion());
mc.add(forgepatches);
mods.add(List.of(forgejar));
return filter;
Expand Down
6 changes: 3 additions & 3 deletions loader/src/main/java/net/neoforged/fml/loading/targets/ForgeUserdevLaunchHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
public abstract class ForgeUserdevLaunchHandler extends CommonUserdevLaunchHandler {
@Override
protected void processStreams(String[] classpath, VersionInfo versionInfo, Stream.Builder<Path> mc, Stream.Builder<List<Path>> mods) {
var forge = searchJarOnClasspath(classpath, "forge-" + versionInfo.mcAndForgeVersion());
var forge = searchJarOnClasspath(classpath, "neoforge-" + versionInfo.mcAndNeoForgeVersion());
if (forge.isEmpty()) {
forge = searchJarOnClasspath(classpath, "forge-" + versionInfo.forgeVersion());
forge = searchJarOnClasspath(classpath, "neoforge-" + versionInfo.neoForgeVersion());
}
if (forge.isEmpty()) {
throw new RuntimeException("Could not find %s, nor %s jar on classpath".formatted("forge-" + versionInfo.mcAndForgeVersion(), "forge-" + versionInfo.forgeVersion()));
throw new RuntimeException("Could not find %s, nor %s jar on classpath".formatted("neoforge-" + versionInfo.mcAndNeoForgeVersion(), "neoforge-" + versionInfo.neoForgeVersion()));
}
mc.add(forge.get());
}
Expand Down

0 comments on commit 858e0b2

Please sign in to comment.