xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

agony

Browse Source
This commit is contained in:
Boblet 2025-08-11 11:52:48 +02:00
parent 5444f57cad
commit b374f4088b
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/hbm/main/MainRegistry.java
View File

@ -40,6 +40,7 @@ import com.hbm.lib.HbmWorld;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.packet.PacketDispatcher; import com.hbm.packet.PacketDispatcher;
import com.hbm.potion.HbmPotion; import com.hbm.potion.HbmPotion;
import com.hbm.qmaw.QMAWLoader;
import com.hbm.saveddata.satellites.Satellite; import com.hbm.saveddata.satellites.Satellite;
import com.hbm.tileentity.TileMappings; import com.hbm.tileentity.TileMappings;
import com.hbm.tileentity.bomb.TileEntityLaunchPadBase; import com.hbm.tileentity.bomb.TileEntityLaunchPadBase;
@ -254,6 +255,8 @@ public class MainRegistry {
public void PreLoad(FMLPreInitializationEvent PreEvent) { public void PreLoad(FMLPreInitializationEvent PreEvent) {
CrashHelper.init(); CrashHelper.init();
QMAWLoader.registerModFileURL(FMLCommonHandler.instance().findContainerFor(RefStrings.MODID).getSource());
startupTime = System.currentTimeMillis(); startupTime = System.currentTimeMillis();
configDir = PreEvent.getModConfigurationDirectory(); configDir = PreEvent.getModConfigurationDirectory();
configHbmDir = new File(configDir.getAbsolutePath() + File.separatorChar + "hbmConfig"); configHbmDir = new File(configDir.getAbsolutePath() + File.separatorChar + "hbmConfig");

16
src/main/java/com/hbm/qmaw/QMAWLoader.java
View File

@ -48,7 +48,7 @@ public class QMAWLoader implements IResourceManagerReloadListener {
MainRegistry.logger.info("[QMAW] Loaded " + qmaw.size() + " manual entries! (" + (System.currentTimeMillis() - timestamp) + "ms)"); MainRegistry.logger.info("[QMAW] Loaded " + qmaw.size() + " manual entries! (" + (System.currentTimeMillis() - timestamp) + "ms)");
} }
/** For the like 2 people who might consider making an NTM addon and want to include manual pages */ /** For the like 2 people who might consider making an NTM addon and want to include manual pages. Requires the mod's actual JAR file as the parameter. */
public static void registerModFileURL(File file) { public static void registerModFileURL(File file) {
registeredModFiles.add(file); registeredModFiles.add(file);
} }
@ -56,12 +56,14 @@ public class QMAWLoader implements IResourceManagerReloadListener {
/** Searches the asset folder for QMAW format JSON files and adds entries based on that */ /** Searches the asset folder for QMAW format JSON files and adds entries based on that */
public static void init() { public static void init() {
//the mod's file, assuming the mod is a file (not the case in a dev env, fuck!) /*//the mod's file, assuming the mod is a file (not the case in a dev env, fuck!)
//no fucking null check, if this fails then the entire game will sink along with the ship //no fucking null check, if this fails then the entire game will sink along with the ship
String path = QMAWLoader.class.getProtectionDomain().getCodeSource().getLocation().getPath(); String path = QMAWLoader.class.getProtectionDomain().getCodeSource().getLocation().getPath();
// exclude .class in the case of a dev env // exclude .class in the case of a dev env
MainRegistry.logger.info("[QMAW] Current running file: " + path); MainRegistry.logger.info("[QMAW] Current running file: " + path);
if(!path.endsWith(".class")) registerModFileURL(new File(path)); // i am going to shit myself if(!path.endsWith(".class")) registerModFileURL(new File(path)); // i am going to shit myself*/ // deactivated because it likely doesn't even fucking work
// registering of the mod file now happens in the MainRegistry during preinit
qmaw.clear(); qmaw.clear();
triggers.clear(); triggers.clear();
@ -153,7 +155,7 @@ public class QMAWLoader implements IResourceManagerReloadListener {
/** Opens a resource pack folder, skips to the manual folder, then tries to dissect that */ /** Opens a resource pack folder, skips to the manual folder, then tries to dissect that */
public static void dissectFolder(File folder) { public static void dissectFolder(File folder) {
File manualFolder = new File(folder, "/assets/manual"); File manualFolder = new File(folder, "/assets/hbm/manual");
if(manualFolder.exists() && manualFolder.isDirectory()) dissectManualFolder(manualFolder); if(manualFolder.exists() && manualFolder.isDirectory()) dissectManualFolder(manualFolder);
} }
@ -180,6 +182,12 @@ public class QMAWLoader implements IResourceManagerReloadListener {
public static void registerJson(String file, JsonObject json) { public static void registerJson(String file, JsonObject json) {
String name = json.get("name").getAsString(); String name = json.get("name").getAsString();
if(QMAWLoader.qmaw.containsKey(name)) {
MainRegistry.logger.info("[QMAW] Skipping existing entry " + file);
return;
}
QuickManualAndWiki qmaw = new QuickManualAndWiki(name); QuickManualAndWiki qmaw = new QuickManualAndWiki(name);
if(json.has("icon")) { if(json.has("icon")) {