[1.21.1] New architecture

.github/workflows/build-and-test.yml

@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+          submodules: 'recursive'
       - name: Checkout workflows repo
         uses: actions/checkout@v4
         with:
@@ -42,7 +43,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Compile the mod
-        run: ./gradlew --build-cache --info --stacktrace assemble
+        run: ./gradlew --build-cache --info --stacktrace :core:test assemble
       - name: Attach compilation artifacts
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release-tags.yml

@@ -23,6 +23,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 32
+          submodules: 'recursive'
 
       - name: Set up JDK versions
         uses: actions/setup-java@v4
@@ -70,7 +71,12 @@ jobs:
             -f tag_name="${RELEASE_VERSION}" \
             --jq ".body" > "${CHANGELOG_FILE}"
           cat "${CHANGELOG_FILE}"
-          gh release create "${RELEASE_VERSION}" -F "${CHANGELOG_FILE}" $PRERELEASE ./build/libs/*.jar
+          mapfile -t RELEASE_JARS < <(find build/libs -maxdepth 1 -name '*.jar' ! -name '*-sources*' ! -name '*-slim*')
+          if [[ ${#RELEASE_JARS[@]} -eq 0 ]]; then
+            echo "No production jar found in build/libs"
+            exit 1
+          fi
+          gh release create "${RELEASE_VERSION}" -F "${CHANGELOG_FILE}" $PRERELEASE "${RELEASE_JARS[@]}"
         shell: bash
         continue-on-error: true
         env:

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "core"]
+	path = core
+	url = https://github.com/kuba6000/AE2-Web-Integration.git
+	branch = core

build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'net.neoforged.moddev' version '2.0.113'
+    id 'com.gradleup.shadow' version '9.4.2'
     id 'idea'
     id 'maven-publish'
     id 'com.diffplug.spotless' version '7.0.2'
@@ -72,6 +73,9 @@ afterEvaluate {
 }
 
 apply from: "$rootDir/gradle/scripts/jars.gradle"
+if (findProperty('usesShadowedDependencies')?.toString()?.toBoolean()) {
+    apply from: "$rootDir/gradle/scripts/shadow.gradle"
+}
 apply from: "$rootDir/gradle/scripts/moddevgradle.gradle"
 apply from: "$rootDir/gradle/scripts/repositories.gradle"
 apply from: "$rootDir/dependencies.gradle"

core_compile_output.txt

@@ -0,0 +1,30 @@
+
+[Incubating] Problems report is available at: file:///C:/github/AE2-Web-Integration/build/reports/problems/problems-report.html
+.\gradlew.bat : 
+At C:\Users\TellingSalamander\AppData\Local\Temp\.ctx-mode-ocpAC8\script.ps1:1 char:35
++ ... hub\AE2-Web-Integration; .\gradlew.bat :core:compileJava 2>&1 | Out-F ...
++                              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    + CategoryInfo          : NotSpecified: (:String) [], RemoteException
+    + FullyQualifiedErrorId : NativeCommandError
+
+FAILURE: Build failed with an exception.
+
+* What went wrong:
+Cannot locate tasks that match ':core:compileJava' as project 'core' not found in root project 'ae2webintegration'.
+
+* Try:
+> Run gradlew projects to get a list of available projects.
+> For more on name expansion, please refer to https://docs.gradle.org/9.1.0/userguide/command_line_interface.html#sec:n
+ame_abbreviation in the Gradle documentation.
+> Run with --stacktrace option to get the stack trace.
+> Run with --info or --debug option to get more log output.
+> Run with --scan to generate a Build Scan (Powered by Develocity).
+> Get more help at https://help.gradle.org.
+
+Deprecated Gradle features were used in this build, making it incompatible with Gradle 10.
+
+You can use '--warning-mode all' to show the individual deprecation warnings and determine if they come from your own scripts or plugins.
+
+For more on this, please refer to https://docs.gradle.org/9.1.0/userguide/command_line_interface.html#sec:command_line_warnings in the Gradle documentation.
+
+BUILD FAILED in 2s

dependencies.gradle

@@ -1,6 +1,9 @@
 dependencies {
     compileOnly(libs.jetbrains.annotations)
 
+    // Core submodule (pure Java — no NeoForge/MC/AE2 references)
+    implementation project(':core')
+
     // AE2
     implementation(neoforge.ae2)
     compileOnly(neoforge.ae2wtlib)

gradle.properties

@@ -12,3 +12,8 @@ mod_license = LGPL-3.0 license
 mod_url = https://github.com/kuba6000/AE2-Web-Integration
 mod_issue_tracker = https://github.com/kuba6000/AE2-Web-Integration/issues/
 maven_group =
+
+# Shadow core submodule into the production jar (see gradle/scripts/shadow.gradle)
+usesShadowedDependencies = true
+minimizeShadowedDependencies = false
+relocateShadowedDependencies = true

gradle/scripts/jars.gradle

@@ -11,14 +11,14 @@ java {
     withSourcesJar()
 }
 
-jar.archiveClassifier = "dev"
-
 base {
     archivesName = "${project.name}" // -${libs.versions.minecraft.get()}
 }
 
 afterEvaluate {
-    jar.archiveClassifier = ""
+    if (!findProperty('usesShadowedDependencies')?.toString()?.toBoolean()) {
+        jar.archiveClassifier = ''
+    }
     tasks.withType(org.gradle.jvm.tasks.Jar).configureEach {
         destinationDirectory = file('build/libs/')
         manifest.attributes([

gradle/scripts/shadow.gradle

@@ -0,0 +1,49 @@
+def shadowRelocationPrefix = 'pl.kuba6000.ae2webintegration.shadow'
+
+configurations {
+    coreShadow {
+        canBeConsumed = false
+        canBeResolved = true
+    }
+}
+
+dependencies {
+    coreShadow(project(':core')) {
+        transitive = true
+    }
+}
+
+tasks.named('shadowJar').configure {
+    dependsOn(':core:jar')
+    archiveClassifier = ''
+    configurations = [project.configurations.coreShadow]
+
+    dependencies {
+        exclude(dependency('org.apache.logging.log4j:log4j-api:.*'))
+        exclude(dependency('org.apache.logging.log4j:log4j-core:.*'))
+    }
+
+    if (findProperty('relocateShadowedDependencies')?.toString()?.toBoolean() != false) {
+        relocate('com.google', "${shadowRelocationPrefix}.com.google")
+        relocate('org.apache.commons', "${shadowRelocationPrefix}.org.apache.commons")
+        relocate('commons-io', "${shadowRelocationPrefix}.commons-io")
+        relocate('club.minnced', "${shadowRelocationPrefix}.club.minnced")
+        relocate(
+            'pl.kuba6000.ae2webintegration.core',
+            "${shadowRelocationPrefix}.pl.kuba6000.ae2webintegration.core")
+    }
+}
+
+tasks.named('jar', Jar).configure {
+    enabled = false
+    finalizedBy(tasks.named('shadowJar'))
+}
+
+configurations.runtimeElements.outgoing.artifacts.clear()
+configurations.apiElements.outgoing.artifacts.clear()
+configurations.runtimeElements.outgoing.artifact(tasks.named('shadowJar'))
+configurations.apiElements.outgoing.artifact(tasks.named('shadowJar'))
+
+configurations.named('shadowRuntimeElements') {
+    outgoing.artifacts.clear()
+}

settings.gradle

@@ -20,3 +20,5 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "${mod_id}"
+
+include ':core'

src/main/java/pl/kuba6000/ae2webintegration/ae2interface/AE2WebIntegration.java

@@ -1,41 +1,75 @@
 package pl.kuba6000.ae2webintegration.ae2interface;
 
 import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.ModContainer;
+import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
+import net.neoforged.fml.config.ModConfig;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.neoforge.event.RegisterCommandsEvent;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
+import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import pl.kuba6000.ae2webintegration.ae2interface.commands.CommandBuilder;
+import pl.kuba6000.ae2webintegration.ae2interface.config.Config;
 import pl.kuba6000.ae2webintegration.ae2interface.implementations.AE;
+import pl.kuba6000.ae2webintegration.ae2interface.platform.Platform;
+import pl.kuba6000.ae2webintegration.ae2interface.proxy.CommonProxy;
+import pl.kuba6000.ae2webintegration.core.CommandBootstrap;
 import pl.kuba6000.ae2webintegration.core.api.IAEWebInterface;
 
 @Mod(value = AE2WebIntegration.MODID)
+@EventBusSubscriber(modid = AE2WebIntegration.MODID)
 public class AE2WebIntegration {
 
-    public static final String MODID = "ae2webintegration_interface";
+    public static final String MODID = "ae2webintegration";
     public static final Logger LOG = LogManager.getLogger(MODID);
 
+    private static final CommonProxy PROXY = new CommonProxy();
+
     public AE2WebIntegration() {
-        // ModLoadingContext.get()
-        // .registerExtensionPoint(
-        // IExtensionPoint.DisplayTest.class,
-        // () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
-        // SecurityCache.registerOpPlayer(
-        // IAEWebInterface.getInstance()
-        // .getAEWebGameProfile());
+        Platform platform = new Platform();
+        String version = ModLoadingContext.get()
+            .getActiveContainer()
+            .getModInfo()
+            .getVersion()
+            .toString();
+
+        // Register config before anything that depends on it
+        ModContainer container = ModLoadingContext.get()
+            .getActiveContainer();
+        container.registerConfig(ModConfig.Type.COMMON, Config.SPEC, "ae2webintegration/ae2webintegration.toml");
+
+        // Delegate remaining init to the proxy
+        PROXY.preInit(platform, version);
     }
 
     @EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD)
-    private static class eventHandler {
+    private static class ModEventHandler {
 
         @SubscribeEvent
         public static void commonSetup(FMLCommonSetupEvent event) {
-            // This is where you can do common setup tasks
             IAEWebInterface.getInstance()
                 .initAEInterface(AE.instance);
         }
     }
 
+    @SubscribeEvent
+    public static void commandsRegister(RegisterCommandsEvent event) {
+        CommandBootstrap.init(new CommandBuilder(event.getDispatcher()));
+    }
+
+    @SubscribeEvent
+    public static void serverStarted(ServerStartedEvent event) {
+        PROXY.onServerStarted();
+    }
+
+    @SubscribeEvent
+    public static void serverStopping(ServerStoppingEvent event) {
+        PROXY.onServerStopping();
+    }
 }

src/main/java/pl/kuba6000/ae2webintegration/core/FMLEventHandler.java → src/main/java/pl/kuba6000/ae2webintegration/ae2interface/FMLEventHandler.java

@@ -1,20 +1,18 @@
-package pl.kuba6000.ae2webintegration.core;
+package pl.kuba6000.ae2webintegration.ae2interface;
 
-import static pl.kuba6000.ae2webintegration.core.AE2WebIntegration.MODID;
-
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.tick.ServerTickEvent;
 
+import pl.kuba6000.ae2webintegration.core.AE2Controller;
+import pl.kuba6000.ae2webintegration.core.UpdateNotifier;
 import pl.kuba6000.ae2webintegration.core.ae2request.sync.ISyncedRequest;
-import pl.kuba6000.ae2webintegration.core.utils.VersionChecker;
+import pl.kuba6000.ae2webintegration.core.api.PlayerIdentity;
 
-@EventBusSubscriber(modid = MODID)
+@EventBusSubscriber(modid = AE2WebIntegration.MODID)
 public class FMLEventHandler {
 
     @SubscribeEvent
@@ -31,13 +29,11 @@ public static void tick(ServerTickEvent.Pre event) {
     @SubscribeEvent
     public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
         Player player = event.getEntity();
-        if (!(player instanceof ServerPlayer)) return;
-        if (Config.INSTANCE.CHECK_FOR_UPDATES.get() && VersionChecker.isOutdated() && player.hasPermissions(4)) {
-            player.sendSystemMessage(
-                Component.literal(
-                    ChatFormatting.GREEN.toString() + ChatFormatting.BOLD
-                        + "----> AE2WebIntegration -> New version detected! Consider updating at https://github.com/kuba6000/AE2-Web-Integration/releases/latest"));
-        }
-    }
+        if (!(player instanceof ServerPlayer serverPlayer)) return;
+        if (!serverPlayer.hasPermissions(4)) return;
 
+        PlayerIdentity identity = new PlayerIdentity(serverPlayer.getUUID(), serverPlayer.getScoreboardName());
+        PlayerMessenger messenger = new PlayerMessenger();
+        UpdateNotifier.notifyPlayerIfOutdated(messenger, identity);
+    }
 }

src/main/java/pl/kuba6000/ae2webintegration/ae2interface/PlayerMessenger.java

@@ -0,0 +1,25 @@
+package pl.kuba6000.ae2webintegration.ae2interface;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.server.ServerLifecycleHooks;
+
+import pl.kuba6000.ae2webintegration.core.api.IPlayerMessenger;
+import pl.kuba6000.ae2webintegration.core.api.PlayerIdentity;
+
+public class PlayerMessenger implements IPlayerMessenger {
+
+    @Override
+    public void sendMessage(PlayerIdentity player, String message) {
+        if (ServerLifecycleHooks.getCurrentServer() == null) return;
+        ServerPlayer serverPlayer = ServerLifecycleHooks.getCurrentServer()
+            .getPlayerList()
+            .getPlayer(player.uuid);
+        if (serverPlayer != null) {
+            serverPlayer.sendSystemMessage(
+                Component.literal(message)
+                    .withStyle(ChatFormatting.GREEN, ChatFormatting.BOLD));
+        }
+    }
+}