made a better working multiloader build process
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
package com.vaporvee.loadsupport;
|
||||
|
||||
import me.shedaniel.autoconfig.ConfigData;
|
||||
import me.shedaniel.autoconfig.annotation.Config;
|
||||
|
||||
@Config(name = LoadSupport.MODID)
|
||||
public class LSConfig implements ConfigData {
|
||||
boolean startSound = true;
|
||||
float minMemory = 4.0f;
|
||||
String errorTitle = "Error: Not enough Java memory!";
|
||||
String errorDescription = "Please allocate at least {minMemory} GB of Java memory to your Minecraft Instance! You have currently {currentMemory} GB allocated.";
|
||||
}
|
||||
@@ -1,96 +0,0 @@
|
||||
package com.vaporvee.loadsupport;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiGraphics;
|
||||
import net.minecraft.client.gui.screens.AccessibilityOnboardingScreen;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.gui.screens.TitleScreen;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.client.gui.components.Button;
|
||||
import net.minecraft.util.FormattedCharSequence;
|
||||
|
||||
|
||||
import javax.swing.*;
|
||||
import java.awt.*;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
public class LSWindow {
|
||||
static boolean windowOpen = false;
|
||||
private static JFrame window;
|
||||
|
||||
public static void createWindow(Minecraft minecraftClient, Screen screen) {
|
||||
if(screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen){
|
||||
minecraftClient.setScreen(new BlockedScreen());
|
||||
if(window != null){
|
||||
window.dispose();
|
||||
}
|
||||
return;
|
||||
}
|
||||
try {
|
||||
if (!windowOpen) {
|
||||
windowOpen = true;
|
||||
SwingUtilities.invokeLater(() -> {
|
||||
window = new JFrame(LoadSupport.getWarningMessage()[0]);
|
||||
window.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
|
||||
window.setSize(400, 200);
|
||||
window.setLocationRelativeTo(null);
|
||||
|
||||
JLabel message = new JLabel("<html><p style=\"width:200px\">"+ LoadSupport.getWarningMessage()[1]+"</p></html>", JLabel.CENTER);
|
||||
JButton exitButton = new JButton("OK");
|
||||
|
||||
exitButton.addActionListener(e -> {
|
||||
window.dispose();
|
||||
minecraftClient.stop();
|
||||
});
|
||||
|
||||
window.setLayout(new BorderLayout());
|
||||
window.add(message, BorderLayout.CENTER);
|
||||
window.add(exitButton, BorderLayout.SOUTH);
|
||||
window.setVisible(true);
|
||||
});
|
||||
}
|
||||
} catch (RuntimeException e) {
|
||||
LoadSupport.logger.error(String.valueOf(e));
|
||||
}
|
||||
}
|
||||
public static class BlockedScreen extends Screen {
|
||||
|
||||
protected BlockedScreen() {
|
||||
super(Component.literal("BlockedScreen"));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void init() {
|
||||
Button closeButton = Button.builder(Component.literal("Quit Game"), button -> Minecraft.getInstance().stop())
|
||||
.bounds(this.width / 2 - 100, this.height - 35, 200, 20)
|
||||
.build();
|
||||
|
||||
this.addRenderableWidget(closeButton);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
|
||||
super.render(graphics, mouseX, mouseY, delta);
|
||||
|
||||
String title = LoadSupport.getWarningMessage()[0];
|
||||
String body = LoadSupport.getWarningMessage()[1];
|
||||
|
||||
int lineHeight = this.font.lineHeight + 5;
|
||||
int maxTextWidth = this.width - 40;
|
||||
|
||||
List<FormattedCharSequence> wrappedLines = this.font.split(Component.literal(body), maxTextWidth);
|
||||
|
||||
int totalTextHeight = (wrappedLines.size() * lineHeight) + lineHeight + 10;
|
||||
int startY = (this.height / 2) - (totalTextHeight / 2);
|
||||
|
||||
graphics.drawCenteredString(this.font, Component.literal(title), this.width / 2, startY, 0xf94449);
|
||||
|
||||
int bodyStartY = startY + lineHeight + 10;
|
||||
for (int i = 0; i < wrappedLines.size(); i++) {
|
||||
FormattedCharSequence line = wrappedLines.get(i); // Get each wrapped line
|
||||
graphics.drawCenteredString(this.font, line, this.width / 2, bodyStartY + (i * lineHeight), 0xffffff);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,16 +0,0 @@
|
||||
package com.vaporvee.loadsupport;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
|
||||
public class LoadNotifier {
|
||||
static boolean wasPlayed = false;
|
||||
public static void notifySound(Minecraft client){
|
||||
if(LoadSupport.config.startSound && !wasPlayed) {
|
||||
wasPlayed = true;
|
||||
client.getSoundManager().play(
|
||||
SimpleSoundInstance.forUI(SoundEvents.UI_TOAST_CHALLENGE_COMPLETE, 1.0F) // Use any sound event you like
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,58 +1,21 @@
|
||||
package com.vaporvee.loadsupport;
|
||||
|
||||
import me.shedaniel.autoconfig.AutoConfig;
|
||||
import me.shedaniel.autoconfig.serializer.Toml4jConfigSerializer;
|
||||
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
|
||||
import net.minecraft.client.gui.screens.AccessibilityOnboardingScreen;
|
||||
import net.minecraft.client.gui.screens.Screen;
|
||||
import net.minecraft.client.gui.screens.TitleScreen;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import com.mojang.logging.LogUtils;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.neoforged.bus.api.IEventBus;
|
||||
import net.neoforged.fml.ModContainer;
|
||||
import net.neoforged.fml.common.Mod;
|
||||
|
||||
@Mod(Constants.MOD_ID)
|
||||
public class LoadSupport {
|
||||
|
||||
// The value here should match an entry in the META-INF/neoforge.mods.toml file
|
||||
@Mod(value = LoadSupport.MODID, dist = Dist.CLIENT)
|
||||
public class LoadSupport
|
||||
{
|
||||
public static LSConfig config;
|
||||
private static float allocatedMemoryInGB;
|
||||
// Define mod id in a common place for everything to reference
|
||||
public static final String MODID = "loadsupport";
|
||||
// Directly reference a slf4j logger
|
||||
static final Logger logger = LogUtils.getLogger();
|
||||
public LoadSupport(IEventBus eventBus) {
|
||||
|
||||
// This method is invoked by the NeoForge mod loader when it is ready
|
||||
// to load your mod. You can access NeoForge and Common code in this
|
||||
// project.
|
||||
|
||||
// Use NeoForge to bootstrap the Common mod.
|
||||
Constants.LOG.info("Hello NeoForge world!");
|
||||
CommonClass.init();
|
||||
|
||||
// The constructor for the mod class is the first code that is run when your mod is loaded.
|
||||
// FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically.
|
||||
public LoadSupport(IEventBus modEventBus, ModContainer modContainer)
|
||||
{
|
||||
AutoConfig.register(LSConfig.class, Toml4jConfigSerializer::new);
|
||||
config = AutoConfig.getConfigHolder(LSConfig.class).getConfig();
|
||||
allocatedMemoryInGB = Runtime.getRuntime().maxMemory() / 1073741824f; // Hardcoded value for GB
|
||||
allocatedMemoryInGB = Math.round(allocatedMemoryInGB * 10) / 10f;
|
||||
LoadSupport.logger.info(String.format("Allocated Memory: %.1f GB", allocatedMemoryInGB));
|
||||
ScreenEvents.BEFORE_INIT.register(LoadSupport::beforeWindowInit);
|
||||
}
|
||||
|
||||
private static void beforeWindowInit(Minecraft minecraft, Screen screen, int i, int i1) {
|
||||
if(config.minMemory > allocatedMemoryInGB){
|
||||
System.setProperty("java.awt.headless", "false"); // Hacky stupid thing but it works I guess...
|
||||
LSWindow.createWindow(minecraft, screen);
|
||||
}
|
||||
if (screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen){
|
||||
LoadNotifier.notifySound(minecraft);
|
||||
}
|
||||
}
|
||||
|
||||
public static String[] getWarningMessage(){
|
||||
return new String[]{config.errorTitle, config.errorDescription
|
||||
.replace("{minMemory}", String.valueOf(config.minMemory))
|
||||
.replace("{currentMemory}", String.valueOf(allocatedMemoryInGB))};
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.vaporvee.loadsupport.mixin;
|
||||
|
||||
import com.vaporvee.loadsupport.Constants;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.screens.TitleScreen;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(TitleScreen.class)
|
||||
public class MixinTitleScreen {
|
||||
|
||||
@Inject(at = @At("HEAD"), method = "init()V")
|
||||
private void init(CallbackInfo info) {
|
||||
|
||||
Constants.LOG.info("This line is printed by an example mod mixin from NeoForge!");
|
||||
Constants.LOG.info("MC Version: {}", Minecraft.getInstance().getVersionType());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.vaporvee.loadsupport.platform;
|
||||
|
||||
import com.vaporvee.loadsupport.platform.services.IPlatformHelper;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.fml.ModList;
|
||||
import net.neoforged.fml.loading.FMLEnvironment;
|
||||
import net.neoforged.fml.loading.FMLLoader;
|
||||
|
||||
public class NeoForgePlatformHelper implements IPlatformHelper {
|
||||
|
||||
@Override
|
||||
public String getPlatformName() {
|
||||
|
||||
return "NeoForge";
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isModLoaded(String modId) {
|
||||
|
||||
return ModList.get().isLoaded(modId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEnvServer() {
|
||||
return FMLEnvironment.dist == Dist.DEDICATED_SERVER;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDevelopmentEnvironment() {
|
||||
|
||||
return !FMLLoader.isProduction();
|
||||
}
|
||||
}
|
||||
36
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
36
neoforge/src/main/resources/META-INF/neoforge.mods.toml
Normal file
@@ -0,0 +1,36 @@
|
||||
modLoader = "javafml" #mandatory
|
||||
loaderVersion = "${neoforge_loader_version_range}" #mandatory
|
||||
license = "${license}" # Review your options at https://choosealicense.com/.
|
||||
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
||||
[[mods]] #mandatory
|
||||
modId = "${mod_id}" #mandatory
|
||||
version = "${version}" #mandatory
|
||||
displayName = "${mod_name}" #mandatory
|
||||
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://docs.neoforged.net/docs/misc/updatechecker/)
|
||||
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional (displayed in the mod UI)
|
||||
logoFile="${mod_id}.png" #optional
|
||||
credits="${credits}" #optional
|
||||
authors = "${mod_author}" #optional
|
||||
description = '''${description}''' #mandatory (Supports multiline text)
|
||||
[[mixins]]
|
||||
config = "${mod_id}.mixins.json"
|
||||
[[mixins]]
|
||||
config = "${mod_id}.neoforge.mixins.json"
|
||||
[[dependencies.${mod_id}]] #optional
|
||||
modId = "neoforge" #mandatory
|
||||
type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
|
||||
versionRange = "[${neoforge_version},)" #mandatory
|
||||
ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory
|
||||
side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER'
|
||||
[[dependencies.${mod_id}]]
|
||||
modId = "minecraft"
|
||||
type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged")
|
||||
versionRange = "${minecraft_version_range}"
|
||||
ordering = "NONE"
|
||||
side = "BOTH"
|
||||
|
||||
# Features are specific properties of the game environment, that you may want to declare you require. This example declares
|
||||
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
|
||||
# stop your mod loading on the server for example.
|
||||
#[features.${mod_id}]
|
||||
#openGLVersion="[3.2,)"
|
||||
@@ -0,0 +1 @@
|
||||
com.vaporvee.loadsupport.platform.NeoForgePlatformHelper
|
||||
14
neoforge/src/main/resources/loadsupport.neoforge.mixins.json
Normal file
14
neoforge/src/main/resources/loadsupport.neoforge.mixins.json
Normal file
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"required": true,
|
||||
"minVersion": "0.8",
|
||||
"package": "com.vaporvee.loadsupport.mixin",
|
||||
"compatibilityLevel": "JAVA_21",
|
||||
"mixins": [],
|
||||
"client": [
|
||||
"MixinTitleScreen"
|
||||
],
|
||||
"server": [],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
# This is an example neoforge.mods.toml file. It contains the data relating to the loading mods.
|
||||
# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
|
||||
# The overall format is standard TOML format, v0.5.0.
|
||||
# Note that there are a couple of TOML lists in this file.
|
||||
# Find more information on toml format here: https://github.com/toml-lang/toml
|
||||
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
|
||||
modLoader="javafml" #mandatory
|
||||
|
||||
# A version range to match for said mod loader - for regular FML @Mod it will be the FML version. This is currently 2.
|
||||
loaderVersion="${loader_version_range}" #mandatory
|
||||
|
||||
# The license for you mod. This is mandatory metadata and allows for easier comprehension of your redistributive properties.
|
||||
# Review your options at https://choosealicense.com/. All rights reserved is the default copyright stance, and is thus the default here.
|
||||
license="${mod_license}"
|
||||
|
||||
# A URL to refer people to when problems occur with this mod
|
||||
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
|
||||
|
||||
# A list of mods - how many allowed here is determined by the individual mod loader
|
||||
[[mods]] #mandatory
|
||||
|
||||
# The modid of the mod
|
||||
modId="${mod_id}" #mandatory
|
||||
|
||||
# The version number of the mod
|
||||
version="${mod_version}" #mandatory
|
||||
|
||||
# A display name for the mod
|
||||
displayName="${mod_name}" #mandatory
|
||||
|
||||
# A URL to query for updates for this mod. See the JSON update specification https://docs.neoforged.net/docs/misc/updatechecker/
|
||||
#updateJSONURL="https://change.me.example.invalid/updates.json" #optional
|
||||
|
||||
# A URL for the "homepage" for this mod, displayed in the mod UI
|
||||
#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional
|
||||
|
||||
# A file name (in the root of the mod JAR) containing a logo for display
|
||||
#logoFile="examplemod.png" #optional
|
||||
|
||||
# A text field displayed in the mod UI
|
||||
#credits="" #optional
|
||||
|
||||
# A text field displayed in the mod UI
|
||||
authors="${mod_authors}" #optional
|
||||
|
||||
# The description text for the mod (multi line!) (#mandatory)
|
||||
description='''${mod_description}'''
|
||||
|
||||
# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded.
|
||||
#[[mixins]]
|
||||
#config="${mod_id}.mixins.json"
|
||||
|
||||
# The [[accessTransformers]] block allows you to declare where your AT file is.
|
||||
# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg
|
||||
#[[accessTransformers]]
|
||||
#file="META-INF/accesstransformer.cfg"
|
||||
|
||||
# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json
|
||||
|
||||
# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
|
||||
[[dependencies.${mod_id}]] #optional
|
||||
# the modid of the dependency
|
||||
modId="neoforge" #mandatory
|
||||
# The type of the dependency. Can be one of "required", "optional", "incompatible" or "discouraged" (case insensitive).
|
||||
# 'required' requires the mod to exist, 'optional' does not
|
||||
# 'incompatible' will prevent the game from loading when the mod exists, and 'discouraged' will show a warning
|
||||
type="required" #mandatory
|
||||
# Optional field describing why the dependency is required or why it is incompatible
|
||||
# reason="..."
|
||||
# The version range of the dependency
|
||||
versionRange="${neo_version_range}" #mandatory
|
||||
# An ordering relationship for the dependency.
|
||||
# BEFORE - This mod is loaded BEFORE the dependency
|
||||
# AFTER - This mod is loaded AFTER the dependency
|
||||
ordering="NONE"
|
||||
# Side this dependency is applied on - BOTH, CLIENT, or SERVER
|
||||
side="BOTH"
|
||||
|
||||
# Here's another dependency
|
||||
[[dependencies.${mod_id}]]
|
||||
modId="minecraft"
|
||||
type="required"
|
||||
# This version range declares a minimum of the current minecraft version up to but not including the next major version
|
||||
versionRange="${minecraft_version_range}"
|
||||
ordering="NONE"
|
||||
side="BOTH"
|
||||
|
||||
# Features are specific properties of the game environment, that you may want to declare you require. This example declares
|
||||
# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't
|
||||
# stop your mod loading on the server for example.
|
||||
#[features.${mod_id}]
|
||||
#openGLVersion="[3.2,)"
|
||||
Reference in New Issue
Block a user