improve forge project

.gitattributes

@@ -1,3 +1,5 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-*.sh text
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/**generated**/.cache/cache text eol=lf
+src/**generated**/*.json text eol=lf

forge/.gitignore

@@ -19,14 +19,6 @@ build
 
 # other
 eclipse
-run/client
-run/config/fml.toml
-run/crash-reports
-run/defaultconfigs
-run/gameTestServer
-run/logs
-run/mods
-run/server
 
 # Files from Forge MDK
 forge*changelog.txt

forge/run/.gitignore

@@ -0,0 +1,4 @@
+*.*
+
+!config/mcsd_forge-common.toml
+!eula.txt

gradle.properties

@@ -1,10 +1,70 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx6G
 org.gradle.parallel=true
+org.gradle.daemon=false
+
+# The Minecraft version must agree with the Forge + Fabric version to get a valid artifact
+minecraft_version=1.20.1
+
+# FORGE MODULE
+
+## Environment Properties
+
+# The Minecraft version range can use any release version of Minecraft as bounds.
+# Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
+# as they do not follow standard versioning conventions.
+minecraft_version_range=[1.20.1,1.21)
+# The Forge version must agree with the Minecraft version to get a valid artifact
+forge_version=47.1.21
+# The Forge version range can use any version of Forge as bounds or match the loader version range
+forge_version_range=[47,)
+# The loader version range can only use the major version of Forge/FML as bounds
+loader_version_range=[47,)
+# The mapping channel to use for mappings.
+# The default set of supported mapping channels are ["official", "snapshot", "snapshot_nodoc", "stable", "stable_nodoc"].
+# Additional mapping channels can be registered through the "channelProviders" extension in a Gradle plugin.
+#
+# | Channel   | Version              |                                                                                |
+# |-----------|----------------------|--------------------------------------------------------------------------------|
+# | official  | MCVersion            | Official field/method names from Mojang mapping files                          |
+# | parchment | YYYY.MM.DD-MCVersion | Open community-sourced parameter names and javadocs layered on top of official |
+#
+# You must be aware of the Mojang license when using the 'official' or 'parchment' mappings.
+# See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
+#
+# Parchment is an unofficial project maintained by ParchmentMC, separate from Minecraft Forge.
+# Additional setup is needed to use their mappings, see https://parchmentmc.org/docs/getting-started
+mapping_channel=official
+# The mapping version to query from the mapping channel.
+# This must match the format required by the mapping channel.
+mapping_version=1.20.1
+
+
+## Mod Properties
+
+# The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63}
+# Must match the String constant located in the main mod class annotated with @Mod.
+mod_id=mcsd_forge
+# The human-readable display name for the mod.
+mod_name=MCSD Forge Integration
+# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
+mod_license=GPL-3.0
+# The mod version. See https://semver.org/
+mod_version=0.1.0
+# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
+# This should match the base package used for the mod sources.
+# See https://maven.apache.org/guides/mini/guide-naming-conventions.html
+mod_group_id=org.comroid.mcsd
+# The authors of the mod. This is a simple text string that is used for display purposes in the mod list.
+mod_authors=Kaleidox
+# The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
+mod_description=MCSD Integration Mod
+
+
+# FABRIC MODULE
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.20.1
 yarn_mappings=1.20.1+build.10
 loader_version=0.15.9
 

settings.gradle

@@ -26,7 +26,7 @@ include('hub')
 include('agent')
 
 include('spigot')
-//include('forge')
+include('forge')
 include('fabric')
 
 var dirApi = file('../japi/')