Sync with main repository

- Refactor the entire mod
- Reduce jar size
- Rewrite TabSupportManager, that will hopefully resolve the crash issue
- Add ItemStackBuilder into public mod
- Cleanup

Author: TimSchoenle

.github/workflows/codeql-analysis.yml

@@ -2,8 +2,8 @@ buildscript {
     repositories {
         jcenter()
         mavenCentral()
-        maven { url = 'http://files.minecraftforge.net/maven' }
-        maven { url = 'http://repo.spongepowered.org/maven' }
+        maven { url = 'https://files.minecraftforge.net/maven' }
+        maven { url = 'https://repo.spongepowered.org/maven' }
         maven { url = 'https://jitpack.io' }
     }
 
@@ -17,22 +17,18 @@ buildscript {
 repositories {
     jcenter()
     mavenCentral()
-    maven { url = 'http://repo.spongepowered.org/maven/' }
+    maven { url = 'https://repo.spongepowered.org/maven/' }
     maven { url = 'https://jitpack.io' }
 }
 
-plugins {
-    id "org.sonarqube" version "3.0"
-}
-
 apply plugin: 'java'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'org.spongepowered.mixin'
 
 version = '1.0.1'
-group = 'de.timmi6790.mcmod'
+group = 'de.timmi6790.basemod'
 archivesBaseName = 'RandomMineplexMod'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -42,24 +38,27 @@ compileJava.options.encoding = 'UTF-8'
 dependencies {
     // Enabled me only for build
     annotationProcessor 'org.spongepowered:mixin:0.7.11-SNAPSHOT'
-    compile 'org.spongepowered:mixin:0.7.11-SNAPSHOT'
+    compile('org.spongepowered:mixin:0.7.11-SNAPSHOT') {
+        // Mixin includes a lot of dependencies that are too up-to-date
+        exclude module: 'guava'
+        exclude module: 'gson'
+        exclude module: 'commons-io'
+        exclude module: 'log4j-core'
+    }
 
     compile 'com.github.ben-manes.caffeine:caffeine:2.8.5'
-    compile 'org.reflections:reflections:0.9.12'
 
-    compileOnly 'org.projectlombok:lombok:1.18.12'
+    compileOnly 'org.projectlombok:lombok:1.18.18'
     annotationProcessor 'org.projectlombok:lombok:1.18.12'
 
-    implementation 'com.github.Timmi6790:Commons:4e06ba7769'
-
     testImplementation 'org.junit.jupiter:junit-jupiter:5.7.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
-    testImplementation 'org.assertj:assertj-core:3.17.2'
-    testImplementation 'org.mockito:mockito-core:3.5.13'
-    testImplementation 'org.mockito:mockito-inline:3.5.13'
-    testImplementation 'org.mockito:mockito-junit-jupiter:3.5.13'
+    testImplementation 'org.assertj:assertj-core:3.19.0'
+    testImplementation 'org.mockito:mockito-core:3.7.7'
+    testImplementation 'org.mockito:mockito-inline:3.7.7'
+    testImplementation 'org.mockito:mockito-junit-jupiter:3.7.7'
 }
 
 minecraft {
@@ -74,7 +73,8 @@ processResources {
 
     from(sourceSets.main.resources.srcDirs) {
         include 'mcmod.info'
-        expand 'version': project.version, 'mcversion': project.minecraft.version
+        expand 'version': project.version,
+                'mcversion': project.minecraft.version
     }
 
     from(sourceSets.main.resources.srcDirs) {
@@ -91,7 +91,7 @@ mixin {
 
 reobf {
     shadowJar {
-        mappingType = 'SEARGE'
+        mappingType = 'searge'
     }
 }
 
@@ -116,24 +116,21 @@ jar {
             'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
             'FMLCorePluginContainsFMLMod': "true",
             'ForceLoadAsMod': 'true',
-            'FMLCorePlugin': 'de.timmi6790.mpmod.mixins.MixinLoader',
+            'FMLCorePlugin': 'de.timmi6790.rmmod.mixins.MixinLoader',
             'FMLAT': 'randomMineplexMod_at.cfg',
     )
 }
 
 shadowJar {
+    dependencies {
+        exclude(dependency('org.checkerframework:checker-qual:.*'))
+        exclude(dependency('com.google.errorprone:error_prone_annotations:.*'))
+    }
     classifier ''
     exclude 'LICENSE.txt', 'dummyThing'
 }
 
 artifacts {
     archives jar
     archives shadowJar
-}
-
-sonarqube {
-    properties {
-        property "sonar.projectKey", "RandomMineplexMod"
-        property "sonar.host.url", "https://sonarcube.timmi6790.de"
-    }
-}
+}

.github/workflows/sonarcloud.yml

@@ -1,8 +1,9 @@
-package de.timmi6790.mpmod.modules;
+package de.timmi6790.basemod;
 
 
-import de.timmi6790.mpmod.McMod;
-import de.timmi6790.mpmod.utilities.EventUtilities;
+import de.timmi6790.basemod.command.AbstractCommand;
+import de.timmi6790.basemod.tabsupport.AbstractTabSupport;
+import de.timmi6790.basemod.utilities.EventUtilities;
 import lombok.Data;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
@@ -16,6 +17,14 @@ public void registerEvents(final Object... events) {
         EventUtilities.registerEvents(events);
     }
 
+    public void registerCommands(final AbstractCommand... commands) {
+        this.mod.getCommandManager().addCommands(commands);
+    }
+
+    public void registerTabSupports(final AbstractTabSupport... tabSupports) {
+        this.mod.getTabSupportManager().registerTabSupports(tabSupports);
+    }
+
     public abstract void preInit(final FMLPreInitializationEvent event);
 
     public abstract void init(final FMLInitializationEvent event);

build.gradle

@@ -1,33 +1,31 @@
-package de.timmi6790.mpmod;
-
-import de.timmi6790.mpmod.command.CommandManager;
-import de.timmi6790.mpmod.listeners.UpdateChecker;
-import de.timmi6790.mpmod.listeners.events.EventListener;
-import de.timmi6790.mpmod.listeners.events.MineplexEventListener;
-import de.timmi6790.mpmod.modules.AbstractModule;
-import de.timmi6790.mpmod.tabsupport.TabSupportManager;
-import de.timmi6790.mpmod.utilities.EventUtilities;
+package de.timmi6790.basemod;
+
+import de.timmi6790.basemod.command.CommandManager;
+import de.timmi6790.basemod.listeners.events.EventListener;
+import de.timmi6790.basemod.listeners.events.MineplexEventListener;
+import de.timmi6790.basemod.tabsupport.TabSupportManager;
+import de.timmi6790.basemod.update_checker.UpdateChecker;
+import de.timmi6790.basemod.utilities.EventUtilities;
+import de.timmi6790.rmmod.modules.community.CommunityModule;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.log4j.Log4j2;
 import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import org.reflections.Reflections;
 
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 @Mod(
         modid = Reference.MODID,
         name = Reference.NAME,
         version = Reference.VERSION,
         acceptedMinecraftVersions = "1.8.9",
-        guiFactory = "de.timmi6790.mpmod.gui.GuiFactory",
+        guiFactory = "de.timmi6790.basemod.gui.GuiFactory",
         clientSideOnly = true
 )
 @Log4j2
@@ -52,18 +50,6 @@ public class McMod {
     private final String version = Reference.VERSION;
     private final String downloadUrl = Reference.DOWNLOAD_URL;
 
-    private void loadModules() {
-        final Reflections reflections = new Reflections("de.timmi6790");
-        final Set<Class<? extends AbstractModule>> modules = reflections.getSubTypesOf(AbstractModule.class);
-        for (final Class<? extends AbstractModule> module : modules) {
-            try {
-                this.addModules(module.getConstructor(McMod.class).newInstance(this));
-            } catch (final Exception e) {
-                log.error("Trying to initialize {}", module, e);
-            }
-        }
-    }
-
     public <T extends AbstractModule> Optional<T> getModule(final Class<T> clazz) {
         return (Optional<T>) Optional.ofNullable(this.modules.get(clazz));
     }
@@ -78,14 +64,15 @@ protected void addModules(final AbstractModule... modules) {
         }
     }
 
-
     @Mod.EventHandler
     public void preInit(final FMLPreInitializationEvent event) {
         this.configDirectory = event.getModConfigurationDirectory().toString();
         final File path = new File(this.configDirectory + File.separator + this.getModId() + ".cfg");
         this.configuration = new Configuration(path);
 
-        this.loadModules();
+        this.addModules(
+                new CommunityModule(this)
+        );
 
         for (final AbstractModule module : this.getModules().values()) {
             log.info("PreInnit module {}", module.getName());

…mi6790/mpmod/modules/AbstractModule.java …de/timmi6790/basemod/AbstractModule.javasrc/main/java/de/timmi6790/mpmod/modules/AbstractModule.java renamed to src/main/java/de/timmi6790/basemod/AbstractModule.java src/main/java/de/timmi6790/mpmod/modules/AbstractModule.java renamed to src/main/java/de/timmi6790/basemod/AbstractModule.java

@@ -1,6 +1,6 @@
-package de.timmi6790.mpmod;
+package de.timmi6790.basemod;
 
-import de.timmi6790.mpmod.values.MineplexGames;
+import de.timmi6790.basemod.values.mineplex.MineplexGames;
 import lombok.Data;
 
 

…/main/java/de/timmi6790/mpmod/McMod.java …ain/java/de/timmi6790/basemod/McMod.javasrc/main/java/de/timmi6790/mpmod/McMod.java renamed to src/main/java/de/timmi6790/basemod/McMod.java src/main/java/de/timmi6790/mpmod/McMod.java renamed to src/main/java/de/timmi6790/basemod/McMod.java

@@ -1,8 +1,5 @@
-package de.timmi6790.mpmod;
+package de.timmi6790.basemod;
 
-import lombok.experimental.UtilityClass;
-
-@UtilityClass
 public class Reference {
     public static final String MODID = "RMM";
     public static final String NAME = "RandomMineplexMod";