Module refactor

.gitattributes

@@ -0,0 +1,20 @@
+# Auto detect text files and normalize to LF
+* text=auto eol=lf
+
+# Ensure these are always LF
+*.java text eol=lf
+*.kt text eol=lf
+*.json text eol=lf
+*.gradle text eol=lf
+*.properties text eol=lf
+*.xml text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.md text eol=lf
+*.txt text eol=lf
+
+# Binary files
+*.png binary
+*.jpg binary
+*.jar binary
+*.ogg binary

.gitignore

@@ -1,119 +1,26 @@
-# User-specific stuff
-.idea/
-
-*.iml
+build/
 *.ipr
+run*/
 *.iws
-
-# IntelliJ
 out/
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Package Files #
-*.jar
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
-# General
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-# Windows thumbnail cache files
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-# Dump file
-*.stackdump
-
-# Folder config file
-[Dd]esktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msix
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-.gradle
-build/
-
-# Ignore Gradle GUI config
-gradle-app.setting
-
-# Cache of project
-.gradletasknamecache
-
-**/build/
-
-# Common working directory
-run/
-runs/
+*.iml
+.gradle/
+output/
+bin/
 
-# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
-!gradle-wrapper.jar
+.classpath
+*/.factorypath
+.project
+.idea/
+.vscode/
+.run/
+classes/
+.metadata
+.settings
+*.launch
+*/src/generated/resources/.cache/
+
+*.patch
+*.DS_Store
+
+qodana.yaml

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <img width="690" src="web/logo.png" alt="title">  
+    <img width="690" src="web/logo.png" alt="title">
 </p>
 <hr>
 <p align="center">
@@ -13,7 +13,7 @@
 </p>
 
 <p align="center">
-    <a href="https://github.com/Nova-Committee/avaritia-integration/blob/forge/1.20.1/README.md">English</a> | 
+    <a href="https://github.com/Nova-Committee/avaritia-integration/blob/forge/1.20.1/README.md">English</a> |
     <a href="https://github.com/Nova-Committee/avaritia-integration/blob/forge/1.20.1/README_CN.md">简体中文</a>
 </p>
 
@@ -55,4 +55,4 @@
 | Tetra                               |         |   🔲   |       |
 | Tinker's Construct 3                |         |   ✅   |       |
 | Industrial Foregoing                |         |   ✅   |       |
-| Industrial Foregoing Extra Upgrades |         |   ✅   |       |
+| Industrial Foregoing Extra Upgrades |         |   ✅   |       |

all/build.gradle

@@ -0,0 +1,124 @@
+ext.ai_mod_id = 'avaritia_integration_all'
+ext.ai_mod_name = 'Avaritia Integration All'
+ext.ai_mod_description = 'Aggregated Avaritia Integration distribution.'
+ext.ai_run_directory = 'all'
+ext.ai_archive_name = mod_id
+ext.ai_aggregate = true
+ext.ai_dependency_blocks = """[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_ae2"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_botania"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_create"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_enderio"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_industrialforegoing"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_ifeu"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_mekanism"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_mekanism_generators"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_pneumaticcraft"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_refinedstorage"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_thermal_expansion_data"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+
+[[dependencies."avaritia_integration_all"]]
+modId = "avaritia_integration_tconstruct_data"
+type = "required"
+versionRange = "[${mod_version},)"
+ordering = "AFTER"
+side = "BOTH"
+"""
+
+apply from: rootProject.file('gradle/scripts/mod-project.gradle')
+
+dependencies {
+    def embeddedProjects = [
+            ':core',
+            ':integrations:ae2',
+            ':integrations:botania',
+            ':integrations:create',
+            ':integrations:enderio',
+            ':integrations:industrialforegoing',
+            ':integrations:ifeu',
+            ':integrations:mekanism',
+            ':integrations:mekanism-generators',
+            ':integrations:pneumaticcraft',
+            ':integrations:refinedstorage',
+            ':integrations:thermal-expansion-data',
+            ':integrations:tconstruct-data'
+    ]
+
+    embeddedProjects.each { path ->
+        implementation project(path)
+        jarJar(project(path)) {
+            transitive = false
+        }
+    }
+}

all/src/main/java/committee/nova/mods/avaritia_integration/all/AvaritiaIntegrationAll.java

@@ -0,0 +1,11 @@
+package committee.nova.mods.avaritia_integration.all;
+
+import net.neoforged.fml.common.Mod;
+
+@Mod(AvaritiaIntegrationAll.MOD_ID)
+public final class AvaritiaIntegrationAll {
+
+    public static final String MOD_ID = "avaritia_integration_all";
+
+    public AvaritiaIntegrationAll() {}
+}

all/src/main/templates/META-INF/neoforge.mods.toml

@@ -0,0 +1,26 @@
+modLoader = "javafml"
+loaderVersion = "${loader_version_range}"
+license = "${mod_license}"
+
+[[mods]]
+modId = "${mod_id}"
+version = "${mod_version}"
+displayName = "${mod_name}"
+authors = "${mod_authors}"
+description = '''${mod_description}'''
+
+[[dependencies."${mod_id}"]]
+modId = "neoforge"
+type = "required"
+versionRange = "${neo_version_range}"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies."${mod_id}"]]
+modId = "minecraft"
+type = "required"
+versionRange = "${minecraft_version_range}"
+ordering = "NONE"
+side = "BOTH"
+
+${dependency_blocks}