diff --git a/.gitignore b/.gitignore index 05b99b77fc..17132052f1 100644 --- a/.gitignore +++ b/.gitignore @@ -34,9 +34,10 @@ /projects/**/run/ /projects/**/*.launch /repo/ -src/generated/resources/**/.cache/ -src/generated_test/resources/**/.cache/ -src/generated_mdk/resources/**/.cache/ +src/*/generated/**/.cache/ +# Generated by gradle every import +**/src/main/resources/META-INF/MANIFEST.MF +/fmlloader/src/main/resources/forge_version.json #Patch rejects #/patches-/ @@ -49,3 +50,5 @@ changelog.txt *.7z /logs/ +/ForgeRoot.ipr +/ForgeRoot.iws diff --git a/build.gradle b/build.gradle index e780af1c27..cdefe23fb8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,1288 +1,32 @@ -import de.undercouch.gradle.tasks.download.Download -import groovy.json.JsonBuilder -import net.minecraftforge.forge.tasks.checks.CheckATs -import net.minecraftforge.forge.tasks.checks.CheckExcs -import net.minecraftforge.forge.tasks.checks.CheckPatches -import net.minecraftforge.forge.tasks.checks.CheckSAS -import net.minecraftforge.forge.tasks.checks.CheckTask - -import java.nio.file.Files -import java.util.Date -import java.util.LinkedHashMap import net.minecraftforge.forge.tasks.* -import static net.minecraftforge.forge.tasks.Util.* -import net.minecraftforge.gradle.common.tasks.ApplyBinPatches -import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility -import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact -import net.minecraftforge.gradle.common.tasks.ExtractInheritance -import net.minecraftforge.gradle.common.tasks.SignJar -import net.minecraftforge.gradle.patcher.tasks.GeneratePatches -import net.minecraftforge.gradle.userdev.tasks.RenameJar import net.minecraftforge.gradleutils.PomUtils -import org.apache.tools.ant.filters.ReplaceTokens -import org.gradle.plugins.ide.eclipse.model.SourceFolder -import org.objectweb.asm.Opcodes plugins { id 'org.cadixdev.licenser' version '0.6.1' id 'com.github.ben-manes.versions' version '0.46.0' - id 'net.minecraftforge.gradleutils' version '[2.2,2.3)' + id 'net.minecraftforge.gradleutils' version '[2.3.0,2.4.0)' id 'eclipse' id 'de.undercouch.download' version '5.4.0' id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' apply false id 'net.minecraftforge.gradle.mcp' version '[6.0.16,6.2)' apply false + id 'net.minecraftforge.gradlejarsigner' version '1.0.4' + id 'org.barfuin.gradle.taskinfo' version '2.1.0' } Util.init() //Init all our extension methods! ext { - JAR_SIGNER = null - if (project.hasProperty('keystore')) { - JAR_SIGNER = [ - storepass: project.properties.keystoreStorePass, - keypass: project.properties.keystoreKeyPass, - keystore: project.properties.keystore - ] - } - MAPPING_CHANNEL = 'official' - MC_VERSION = '1.20.2' - MAPPING_VERSION = MC_VERSION - MC_NEXT_VERSION = '1.21' - MCP_VERSION = '20230921.100330' - SNAPSHOT = false - - INSTALLER_VERSION = '2.1.+' - GIT_INFO = gradleutils.gitInfo VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, '[0-9]', MC_VERSION) - // FML_VERSION = gradleutils.getFilteredMCTagOffsetBranchVersion(true, 'FML', MC_VERSION) FORGE_VERSION = VERSION.substring(MC_VERSION.length() + 1) - BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.1.1:fatjar' - INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.3.0' - JAR_SPLITTER = 'net.minecraftforge:jarsplitter:1.1.4' - FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.5:all' - MIN_TAG_FOR_CHANGELOG = '47.999' + BINPATCH_TOOL = 'net.minecraftforge:binarypatcher:1.2.0:fatjar' + INSTALLER_TOOLS = 'net.minecraftforge:installertools:1.4.0' + FART = 'net.minecraftforge:ForgeAutoRenamingTool:1.0.6' } -println('Version: ' + VERSION + - ' Java: ' + System.getProperty('java.version') + - ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ')' + - ' Arch: ' + System.getProperty('os.arch')) - changelog { - fromTag MIN_TAG_FOR_CHANGELOG -} - -def extraTxts = [ - rootProject.file('CREDITS.txt'), - rootProject.file('LICENSE.txt'), - rootProject.tasks.createChangelog.outputFile -] - -tasks.register('downloadVersionManifest', Download) { - src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json' - dest file('build/versions/version_manifest.json') - useETag 'all' - onlyIfModified true - quiet true -} -tasks.register('downloadJson', Download) { - dependsOn downloadVersionManifest - inputs.file downloadVersionManifest.dest - src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url } - dest file("build/versions/${MC_VERSION}/version.json") - useETag 'all' - onlyIfModified true - quiet true -} -tasks.register('downloadClientRaw', Download) { - dependsOn downloadJson - inputs.file downloadJson.dest - src { downloadJson.dest.json.downloads.client.url } - dest file("build/versions/${MC_VERSION}/client.jar") - useETag 'all' - onlyIfModified true - quiet true -} -tasks.register('downloadServerRaw', Download) { - dependsOn downloadJson - inputs.file downloadJson.dest - src { downloadJson.dest.json.downloads.server.url } - dest file("build/versions/${MC_VERSION}/server.jar") - useETag 'all' - onlyIfModified true - quiet true -} - -subprojects { - apply plugin: 'maven-publish' - apply plugin: 'eclipse' - apply plugin: 'java' - - group = 'net.minecraftforge' - version = VERSION - //println(name + ' Version: ' + version) - - repositories { - mavenCentral() - maven gradleutils.forgeMaven - maven gradleutils.minecraftLibsMaven - } - - java.toolchain.languageVersion = JavaLanguageVersion.of(17) - - tasks.withType(Javadoc).configureEach { - options.tags = [ - 'apiNote:a:API Note:', - 'implSpec:a:Implementation Requirements:', - 'implNote:a:Implementation Note:' - ] - options.addStringOption('Xdoclint:all,-missing', '-public') - } - - publishing { - publications { - mavenJava(MavenPublication) { - // Normal Maven/old gradle doesn't support '2.+' version wildcards - // For now we just suppress. We *should* force the resolution to pinned versions. - suppressPomMetadataWarningsFor('apiElements') - suppressPomMetadataWarningsFor('runtimeElements') - pom { - name = project.name - description = 'Modifactions to Minecraft to enable mod developers.' - url = 'https://github.com/MinecraftForge/MinecraftForge' - PomUtils.setGitHubDetails(pom, 'MinecraftForge') - license PomUtils.Licenses.LGPLv2_1 - } - } - } - repositories { - maven gradleutils.publishingForgeMaven - } - } - - tasks.withType(JavaCompile).configureEach { - options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation - options.warnings = false // Shutup deprecated for removal warnings - } -} - -project(':mcp') { - apply plugin: 'net.minecraftforge.gradle.mcp' - tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything - mcp { - config MC_VERSION + '-' + MCP_VERSION - pipeline = 'joined' - } -} - -def sharedFmlonlyForge = { Project prj -> - prj.afterEvaluate { - [prj.tasks.universalJar, prj.tasks.installerJar].each { t -> - def signTask = prj.task([type: SignJar, dependsOn: t], "sign${t.name.capitalize()}") { - onlyIf { - JAR_SIGNER != null && t.state.failure == null - } - def jarsigner = JAR_SIGNER == null ? [:] : JAR_SIGNER - alias = 'forge' - storePass = jarsigner.storepass - keyPass = jarsigner.keypass - keyStore = jarsigner.keystore - inputFile = t.archiveFile.get().asFile - outputFile = t.archiveFile.get().asFile - } - t.finalizedBy(signTask) - } - } - - prj.tasks.userdevConfig { - getArtifacts(prj, prj.configurations.installer, true).each { key, lib -> libraries.add(lib.name) } - getArtifacts(prj, prj.configurations.moduleonly, true).each { key, lib -> - libraries.add(lib.name) - modules.add(lib.name) - } - for (child in prj.ext.PACKED_DEPS) { - libraries.add(Util.getMavenDep(rootProject.tasks.findByPath(child))) - } - //libraries.add("${project.group}:${project.name}:${project.version}:launcher") - inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround... - runs { - client { - environment 'MCP_MAPPINGS', '{mcp_mappings}' - property 'forge.enableGameTest', 'true' - args '--launchTarget', "forge_userdev_client" - args '--version', 'MOD_DEV' - args '--assetIndex', '{asset_index}' - args '--assetsDir', '{assets_root}' - } - - server { - environment 'MCP_MAPPINGS', '{mcp_mappings}' - property 'forge.enableGameTest', 'true' - args '--launchTarget', "forge_userdev_server" - } - - gameTestServer { - environment 'MCP_MAPPINGS', '{mcp_mappings}' - args '--launchTarget', "forge_userdev_server_gametest" - } - - data { - environment 'MCP_MAPPINGS', '{mcp_mappings}' - args '--launchTarget', "forge_userdev_data" - args '--assetIndex', '{asset_index}' - args '--assetsDir', '{assets_root}' - } - } - } - - def userdevRuns = prj.tasks.userdevConfig.runs - def ignoreList = ( //bsl uses filename.startsWith, so we have to use the project name, i add '-' for saftey's sake and not wanting to ignore things that modders add. But the whole system is really dumb/fragile. - prj.configurations.moduleonly.allDependencies.collect{ it.name } - + ['client-extra', 'fmlcore', 'javafmllanguage', 'lowcodelanguage', 'mclanguage', prj.name] - ).collect{ it + '-' }.sort().join(',') - - for (def run : prj.patcher.runs + userdevRuns) { - if (run.parents) continue // We already added this to the parent run config - //run.property 'bsl.debug', 'true' - run.main 'net.minecraftforge.bootstrap.BootstrapLauncher' - - run.args '--gameDir', '.' - run.args '--fml.forgeVersion', FORGE_VERSION - run.args '--fml.mcVersion', MC_VERSION - run.args '--fml.forgeGroup', prj.group - run.args '--fml.mcpVersion', MCP_VERSION - - run.jvmArgs '-Djava.net.preferIPv6Addresses=system' - - run.client run.name.contains('client') - - // SecureJarHandler bootstrap values. - run.property 'ignoreList', ignoreList - // FIXME: Without this jna doesn't work at runtime. Someone figure out why please? - run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar' - if (userdevRuns.contains(run)) { - run.property 'legacyClassPath.file', '{minecraft_classpath_file}' - run.jvmArgs '-p', '{modules}' - } else { - run.property 'legacyClassPath.file', '{runtime_classpath_file}' - run.jvmArgs '-p', prj.configurations.moduleonly.files.collect { it.path }.join(File.pathSeparator) - } - run.jvmArgs '--add-modules', 'ALL-MODULE-PATH' - // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript - run.jvmArgs '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming' - } - for (def run : prj.patcher.runs) { - def isTest = run.name.endsWith('_test') - - run.taskName = run.name - run.environment 'FORGE_SPEC', prj.SPEC_VERSION - run.workingDirectory prj.file('run/' + run.name) - run.ideaModule rootProject.name + '.' + prj.name + '.' + (isTest ? 'test' : 'main') - - run.mods { - minecraft { source prj.sourceSets.main } - } - - if (isTest) { - run.property 'forge.enableGameTest', 'true' - - run.mods { - tests { sources prj.sourceSets.test } - } - } - } - - def MODULE_PATH = Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{"libraries/${it.downloads.artifact.path}"}.sort() - def tokens = [ - TASK: 'forge_server', - MAVEN_PATH: prj.ext.MAVEN_PATH.toString(), - FORGE_VERSION: FORGE_VERSION, - MC_VERSION: MC_VERSION, - MCP_VERSION: MCP_VERSION, - FORGE_GROUP: prj.group, - IGNORE_LIST: Util.getArtifacts(prj, prj.configurations.moduleonly, false).values().collect{it.downloads.artifact.path.rsplit('/', 1)[1]}.sort().join(','), - MODULES: 'ALL-MODULE-PATH' - ] - - prj.task([dependsOn: rootProject.downloadServerRaw], 'makeClasspathFiles') { - doLast { - def CLASS_PATH = Util.getArtifacts(prj, prj.configurations.installer, false).values().collect{"libraries/${it.downloads.artifact.path}"} + - [ - 'libraries/' + Util.getMavenPath(rootProject.tasks.findByPath(':fmlloader:jar')), - "libraries/net/minecraft/server/${MC_VERSION}-${MCP_VERSION}/server-${MC_VERSION}-${MCP_VERSION}-extra.jar" - ] - def claimed = CLASS_PATH.collect{ it.rsplit('/', 2)[0] }.toSet() // Allow us to override versions - try (def zip = new java.util.zip.ZipFile(rootProject.downloadServerRaw.dest)) { - CLASS_PATH += zip.getInputStream(zip.getEntry('META-INF/classpath-joined')).text.split(';') - .findAll{ it.startsWith('libraries/') && !claimed.contains(it.rsplit('/', 2)[0]) } - } - - configure(prj.installerJar) { - from(rootProject.file('server_files/args.txt')) { - filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(';'), CLASS_PATH: CLASS_PATH.join(';')]) - rename { 'data/win_args.txt' } - } - - from(rootProject.file('server_files/args.txt')) { - filter(ReplaceTokens, tokens: tokens + [MODULE_PATH: MODULE_PATH.join(':'), CLASS_PATH: CLASS_PATH.join(':')]) - rename { 'data/unix_args.txt' } - } - } - } - } - - prj.afterEvaluate { - prj.installerJar { - dependsOn('makeClasspathFiles') - from(rootProject.file('server_files/')) { - exclude 'args.txt' - filter(ReplaceTokens, tokens: tokens) - into('data/') - } - } - } -} - -project(':forge') { - evaluationDependsOn(':mcp') - apply plugin: 'java-library' - apply plugin: 'net.minecraftforge.gradle.patcher' - apply plugin: 'org.cadixdev.licenser' - - applyPatches { - level 'WARNING' - } - - sourceSets { - main { - java { - srcDirs = [ - "$rootDir/src/main/java", - "$rootDir/src/fmlcommon/java" - ] - } - resources { - srcDirs = [ - "$rootDir/src/main/resources", - "$rootDir/src/generated/resources", - "$rootDir/src/fmlcommon/resources" - ] - } - } - test { - java { - srcDirs = [ - "$rootDir/src/test/java" - ] - } - resources { - srcDirs = [ - "$rootDir/src/test/resources", - "$rootDir/src/generated_test/resources" - ] - } - } - } - - eclipse { - classpath.file.whenMerged { - // Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase - def src = entries.find { it.path == 'src/main/java' } - src.entryAttributes['ignore_optional_problems'] = 'true' - } - - project.resourceFilter { - appliesTo = 'FOLDERS' - type = 'EXCLUDE_ALL' - matcher { - id = 'org.eclipse.ui.ide.multiFilter' - arguments = '1.0-name-matches-false-false-run' - } - } - } - - ext { - SPEC_VERSION = gradleutils.gitInfo.tag - // The new versioning sceme is -.. - // ForgeMC is a unique identifier for every MC version we have supported. - // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique. - MCP_ARTIFACT = project(':mcp').mcp.config.get() - VERSION_JSON = project(':mcp').file('build/mcp/downloadJson/version.json') - PACKED_DEPS = [':fmlcore:jar', ':fmlloader:jar', ':fmlearlydisplay:jar', ':javafmllanguage:jar', ':lowcodelanguage:jar', ':mclanguage:jar'] - MAVEN_PATH = "${group.replace('.', '/')}/${project.name}/${VERSION}" - } - - configurations { - // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it. - installer { transitive = false } - moduleonly { transitive = false } - api.extendsFrom(installer) - } - - dependencies { - moduleonly(libs.bootstrap) - moduleonly(libs.securemodules) // Needed by bootstrap - moduleonly(libs.unsafe) // Needed by securemodules - moduleonly(libs.bundles.asm) // Needed by all the black magic - moduleonly(libs.jarjar.fs) // Filesystems need to be on the bootstrap? I think thats why this is here. - moduleonly(libs.bundles.jimfs) // In memory file system used for ForgeDev launches - - installer(libs.unsafe) - installer(libs.securemodules) - installer(libs.bundles.asm) // Needed by all the black magic - installer(libs.accesstransformers) - installer(libs.antlr.runtime) // Dep of AccessTransformer - installer(libs.eventbus) - installer(libs.typetools) // Dep of EventBus - installer(libs.forgespi) - installer(libs.coremods) - installer(libs.nashorn) // Dep of Coremods - installer(libs.modlauncher) - installer(libs.mergetool.api) - installer(libs.bundles.night.config) - installer(libs.maven.artifact) - installer(libs.bundles.terminalconsoleappender) - installer(libs.mixin) - installer(libs.bundles.jarjar) - - implementation project(':fmlcore') - implementation project(':fmlloader') - implementation project(':fmlearlydisplay') - implementation project(':javafmllanguage') - implementation project(':lowcodelanguage') - implementation project(':mclanguage') - - runtimeOnly(libs.bootstrap) - } - - patcher { - excs.from file("$rootDir/src/main/resources/forge.exc") - parent = project(':mcp') - mcVersion = MC_VERSION - mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION - patches = file("$rootDir/patches/minecraft") - patchedSrc = file('src/main/java') - srgPatches = false - accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg") - sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas") - - runs { - forge_client { - property 'eventbus.checkTypesOnDispatch', 'true' - property 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll' - - args '--launchTarget', 'forge_dev_client', - '--username', 'Dev', - '--version', project.name, - '--accessToken', '0', - '--userType', 'mojang', - '--versionType', 'release', - '--assetsDir', downloadAssets.output, - '--assetIndex', "{asset_index}" - } - - forge_client_test { - parent runs.forge_client - } - - forge_server { - args '--launchTarget', 'forge_dev_server' - } - - forge_server_test { - parent runs.forge_server - } - - forge_server_gametest { - args '--launchTarget', 'forge_dev_server_gametest' - } - - forge_server_gametest_test { - parent runs.forge_server_gametest - } - - forge_data { - args '--launchTarget', 'forge_dev_data', - '--mod', 'forge', - '--all', - '--validate', - '--output', rootProject.file('src/generated/resources/'), - '--validate', - '--existing', sourceSets.main.resources.srcDirs[0], - '--assetsDir', downloadAssets.output, - '--assetIndex', "{asset_index}" - } - - forge_data_test { - args '--launchTarget', 'forge_dev_data', - '--mod', '.+', - '--all', - '--validate', - '--output', rootProject.file('src/generated_test/resources/'), - '--existing', sourceSets.main.resources.srcDirs[0], - '--existing', sourceSets.test.resources.srcDirs[0], - '--assetsDir', downloadAssets.output, - '--assetIndex', "{asset_index}" - } - - } - } - - afterEvaluate { - if (!patcher.srgPatches) { - srg2mcpClean { - dependsOn = [] - input = project(':mcp').setupMCP.output - } - userdevJar { - onlyIf = { t -> true } - } - def patches = project.file('build/genPatchesForUserdev/output/') - patches.mkdirs() - def genPatchesForUserdev = tasks.register('genPatchesForUserdev', GeneratePatches){ - base = project(':mcp').setupMCP.output - modified = applyRangeMapBase.output - originalPrefix = genPatches.originalPrefix - modifiedPrefix = genPatches.modifiedPrefix - output = patches - autoHeader true - lineEnding = '\n' - } - bakePatches { - dependsOn = [] - input = genPatchesForUserdev.get().output - } - } - } - - ext { - MANIFESTS = [ - '/': [ - 'GitCommit': gradleutils.gitInfo.abbreviatedId, - 'Git-Branch': gradleutils.gitInfo.branch, - 'FML-System-Mods': 'forge' - ] as LinkedHashMap, - 'net/minecraftforge/versions/forge/': [ - 'Specification-Title': 'Forge', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': SPEC_VERSION, - 'Implementation-Title': project.group, - 'Implementation-Version': project.version.substring(MC_VERSION.length() + 1), - 'Implementation-Vendor': 'Forge Development LLC' - ] as LinkedHashMap, - 'net/minecraftforge/versions/mcp/': [ - 'Specification-Title': 'Minecraft', - 'Specification-Vendor': 'Mojang', - 'Specification-Version': MC_VERSION, - 'Implementation-Title': 'MCP', - 'Implementation-Version': MCP_VERSION, - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap, - 'net/minecraftforge/fml/javafmlmod/': [ - 'Specification-Title': 'Mod Language Provider', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'FML Java Mod', - 'Implementation-Version': SPEC_VERSION, - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap, - 'net/minecraftforge/fml/mclanguageprovider/': [ - 'Specification-Title': 'Mod Language Provider', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'Minecraft Language Mod Provider', - 'Implementation-Version': '1', - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap, - 'net/minecraftforge/fml/loading/': [ - 'Specification-Title': 'Launcher', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'FML Launcher', - 'Implementation-Version': SPEC_VERSION, - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap - ] - } - - tasks.register('downloadCrowdin', Download) { - src 'https://files.minecraftforge.net/crowdin.zip' - dest file('build/crowdin.zip') - useETag 'all' - onlyIfModified true - quiet true - } - - sharedFmlonlyForge.call(project) - - task downloadLibraries(type: DownloadLibraries, dependsOn: ':mcp:setupMCP') { - input = VERSION_JSON - output = rootProject.file('build/libraries/') - } - - task extractInheritance(type: ExtractInheritance, dependsOn: [downloadLibraries]) { - tool = INSTALLER_TOOLS + ':fatjar' - args.add '--annotations' - input = genJoinedBinPatches.cleanJar - libraries.addAll downloadLibraries.librariesOutput.map { rf -> Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) } - } - - tasks.register("findFieldInstanceChecks", FieldCompareFinder) { - jar = createJoinedSRG.output - output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json') - fields { - /* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list - bows { - cls = 'net/minecraft/world/item/Items' - name = 'f_42411_' - replacement = 'net/minecraft/world/item/BowItem' - } - crossbows { - cls = 'net/minecraft/world/item/Items' - name = 'f_42717_' - replacement = 'net/minecraft/world/item/CrossbowItem' - } - */ - } - } - - tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) { - jar = createJoinedSRG.output - output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json') - predicate = { - parent, node, insn -> - 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it. - && insn.getOpcode() == Opcodes.INVOKEVIRTUAL - && insn.name.equals('m_6518_') - && insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;') - } - } - - tasks.register('validateDeprecations', ValidateDeprecations) { - input = tasks.jar.archiveFile - mcVersion = MC_VERSION - } - - tasks.jar.finalizedBy 'validateDeprecations' - - tasks.register("downloadInstaller", DownloadMavenArtifact) { - artifact = "net.minecraftforge:installer:${INSTALLER_VERSION}:shrunk" - changing = true - } - tasks.register("downloadClientSlim", DownloadMavenArtifact) { - artifact = "net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim" - } - tasks.register("downloadClientExtra", DownloadMavenArtifact) { - artifact = "net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:extra" - } - tasks.register("downloadServerSlim", DownloadMavenArtifact) { - artifact = "net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim" - } - tasks.register("downloadServerExtra", DownloadMavenArtifact) { - artifact = "net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:extra" - } - tasks.register("downloadJoinedSlim", DownloadMavenArtifact) { - artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:slim" - } - tasks.register("downloadJoinedExtra", DownloadMavenArtifact) { - artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:extra" - } - tasks.register("createJoinedSRG", DownloadMavenArtifact) { - artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg" - } - tasks.register("createClientSRG", RenameJar) { - tool = FART - args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix'] - mappings = createMcp2Srg.srg - input = downloadClientSlim.output - output = file("build/createClientSRG/output.jar") - } - tasks.register("createServerSRG", RenameJar) { - tool = FART - args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix'] - mappings = createMcp2Srg.srg - input = downloadServerSlim.output - output = file("build/createServerSRG/output.jar") - } - genClientBinPatches { - tool = BINPATCH_TOOL - cleanJar = createClientSRG.output - } - genServerBinPatches { - tool = BINPATCH_TOOL - cleanJar = createServerSRG.output - } - genJoinedBinPatches { - tool = BINPATCH_TOOL - cleanJar = createJoinedSRG.output - } - tasks.register("applyClientBinPatches", ApplyBinPatches) { - tool = BINPATCH_TOOL - clean = genClientBinPatches.cleanJar - patch = genClientBinPatches.output - } - tasks.register("applyServerBinPatches", ApplyBinPatches) { - tool = BINPATCH_TOOL - clean = genServerBinPatches.cleanJar - patch = genServerBinPatches.output - } - tasks.register("applyJoinedBinPatches", ApplyBinPatches) { - tool = BINPATCH_TOOL - clean = genJoinedBinPatches.cleanJar - patch = genJoinedBinPatches.output - } - - - tasks.register('checkAll') { - dependsOn 'checkLicenses' - group = 'checks' - } - tasks.register('checkAllAndFix') { - dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses' - group = 'checks' - } - - CheckTask.registerTask(tasks, 'ATs', CheckATs) { - dependsOn extractInheritance, createSrg2Mcp - ats.from patcher.accessTransformers - inheritance = extractInheritance.output - mappings = createSrg2Mcp.output - } - - CheckTask.registerTask(tasks, 'SAS', CheckSAS) { - dependsOn extractInheritance - sass.from patcher.sideAnnotationStrippers - inheritance = extractInheritance.output - } - - CheckTask.registerTask(tasks, 'Excs', CheckExcs) { - dependsOn jar - binary = jar.archiveFile.get().asFile - excs.from patcher.excs - } - - CheckTask.registerTask(tasks, 'Patches', CheckPatches) { - dependsOn genPatches - patchDir = file("$rootDir/patches") - patchesWithS2SArtifact = [ - 'minecraft/net/minecraft/client/renderer/ViewArea.java.patch', - 'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch', - ] - } - - genPatches { - finalizedBy checkAndFixPatches - autoHeader true - lineEnding = '\n' - } - - def baseForgeVersionProperty = project.objects.property(String) - baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) }) - baseForgeVersionProperty.finalizeValueOnRead() - def jarCompatibilityTaskSetup = { task -> - task.group = 'jar compatibility' - task.onlyIf { - baseForgeVersionProperty.getOrNull() != null - } - } - - tasks.register('setupCheckJarCompatibility', SetupCheckJarCompatibility) { - inputVersion = baseForgeVersionProperty - } - - tasks.register('applyBaseCompatibilityJarBinPatches', ApplyBinPatches) { - jarCompatibilityTaskSetup(it) - - clean = project.tasks.createJoinedSRG.output - patch = project.tasks.named('setupCheckJarCompatibility').flatMap { it.baseBinPatchesOutput } - output = project.layout.buildDirectory.dir(name).map { it.file('output.jar') } - } - - tasks.register('mergeBaseForgeJar', MergeJars) { - jarCompatibilityTaskSetup(it) - - inputJars.from(project.tasks.named('applyBaseCompatibilityJarBinPatches').flatMap { it.output }) - inputJars.from(baseForgeVersionProperty.map { inputVersion -> - def output = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-universal.jar") }.get().asFile - project.rootProject.extensions.download.run { - src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-universal.jar" - dest output - } - return output - }) - } - - tasks.register('checkJarCompatibility', CheckJarCompatibility) { - jarCompatibilityTaskSetup(it) - dependsOn 'setupCheckJarCompatibility' - - baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output } - baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output }) - - inputJar = project.tasks.named('reobfJar').flatMap { it.output } - concreteLibraries.from(project.PACKED_DEPS.collect { project.rootProject.tasks.getByPath(it).archiveFile }) - - commonLibraries.from(project.configurations.minecraftImplementation) - commonLibraries.from(project.configurations.installer) - commonLibraries.from(project.configurations.moduleonly) - } - - task launcherJson(type: LauncherJson) { - packedDependencies = [':fmlloader:jar',':fmlearlydisplay:jar'] - doFirst { - def forge_client = project(':forge').patcher.runs.forge_client - json = [ - _comment_: comment, - id: id, - time: timestamp, - releaseTime: timestamp, - type: 'release', - mainClass: 'net.minecraftforge.bootstrap.BootstrapLauncher', - inheritsFrom: MC_VERSION, - logging: {}, - arguments: [ - game: ['--launchTarget', 'forge_client', - '--fml.forgeVersion', FORGE_VERSION, - '--fml.mcVersion', MC_VERSION, - '--fml.forgeGroup', project.group, - '--fml.mcpVersion', MCP_VERSION], - jvm: ['-Djava.net.preferIPv6Addresses=system', - "-DignoreList=${forge_client.properties.ignoreList},\${version_name}.jar", - "-DmergeModules=${forge_client.properties.mergeModules}", - '-DlibraryDirectory=${library_directory}', - '-p', Util.getArtifacts(project, configurations.moduleonly, false).values().collect{'${library_directory}/' + it.downloads.artifact.path}.join('${classpath_separator}'), - '--add-modules', 'ALL-MODULE-PATH', - // Additions to these JVM module args should be mirrored to server_files/args.txt and other similar blocks in the buildscript - '--add-exports', 'jdk.naming.dns/com.sun.jndi.dns=java.naming' - ] - ], - libraries: [] - ] - } - } - - task installerJson(type: InstallerJson, dependsOn: [launcherJson, genClientBinPatches, applyClientBinPatches, applyServerBinPatches, 'signUniversalJar']) { - ext { - // remove :fatjar - BIN_PATCHER = BINPATCH_TOOL.substring(0, BINPATCH_TOOL.length() - 1 - BINPATCH_TOOL.split(':')[3].length()) - } - input.from applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar, launcherJson.output - icon = rootProject.file('icon.ico') - packedDependencies = PACKED_DEPS - - doFirst { - def libs = libraries - def INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS) - def JAR_SPLITTER_CLASSPATH = getClasspath(project, libs, JAR_SPLITTER) - json = [ - _comment_: launcherJson.comment, - spec: 1, - profile: project.name, - version: launcherJson.id, - path: null, - minecraft: MC_VERSION, - serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}.jar', - data: [ - MAPPINGS: [ - client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@txt]", - server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@txt]" - ], - MOJMAPS: [ - client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@txt]", - server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@txt]" - ], - MERGED_MAPPINGS: [ - client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]", - server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@txt]" - ], - BINPATCH: [ - client: '/data/client.lzma', - server: '/data/server.lzma' - ], - MC_UNPACKED: [ - client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:unpacked]", - server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:unpacked]" - ], - MC_SLIM: [ - client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:slim]", - server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:slim]" - ], - MC_SLIM_SHA: [ - client: "'${downloadClientSlim.output.get().asFile.sha1()}'", - server: "'${downloadServerSlim.output.get().asFile.sha1()}'" - ], - MC_EXTRA: [ - client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:extra]", - server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:extra]" - ], - MC_EXTRA_SHA: [ - client: "'${downloadClientExtra.output.get().asFile.sha1()}'", - server: "'${downloadServerExtra.output.get().asFile.sha1()}'" - ], - MC_SRG: [ - client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]", - server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]" - ], - /*MC_SRG_SHA: [ - client: "'${createClientSRG.output.sha1()}'", - server: "'${createServerSRG.output.sha1()}'" - ],*/ - PATCHED: [ - client: "[${project.group}:${project.name}:${project.version}:client]", - server: "[${project.group}:${project.name}:${project.version}:server]" - ], - PATCHED_SHA: [ - client: "'${applyClientBinPatches.output.get().asFile.sha1()}'", - server: "'${applyServerBinPatches.output.get().asFile.sha1()}'" - ], - MCP_VERSION: [ - client: "'${MCP_VERSION}'", - server: "'${MCP_VERSION}'" - ] - ], - processors: [ - [ - sides: ['server'], - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'EXTRACT_FILES', - '--archive', '{INSTALLER}', - - '--from', 'data/run.sh', - '--to', '{ROOT}/run.sh', - '--exec', '{ROOT}/run.sh', - //'--from', "data/run_forge_${VERSION.replace('-', '_').sh", - //'--to', '{ROOT}/run_forge_${VERSION.replace('-', '_').sh', - //'--exec', '{ROOT}/run_forge_${VERSION.replace('-', '_').sh', - - '--from', 'data/run.bat', - '--to', '{ROOT}/run.bat', - //'--from', 'data/run_forge_${VERSION.replace('-', '_').bat', - //'--to', '{ROOT}/run_forge_${VERSION.replace('-', '_').bat', - - '--from', 'data/user_jvm_args.txt', - '--to', '{ROOT}/user_jvm_args.txt', - '--optional', '{ROOT}/user_jvm_args.txt', - - '--from', 'data/win_args.txt', - '--to', "{ROOT}/libraries/${MAVEN_PATH}/win_args.txt", - - '--from', 'data/unix_args.txt', - '--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt" - ] - ], [ - sides: ['server'], - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'BUNDLER_EXTRACT', - '--input', '{MINECRAFT_JAR}', - '--output', '{ROOT}/libraries/', - '--libraries' - ] - ], [ - sides: ['server'], - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'BUNDLER_EXTRACT', - '--input', '{MINECRAFT_JAR}', - '--output', '{MC_UNPACKED}', - '--jar-only' - ] - ], [ - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'MCP_DATA', - '--input', "[${MCP_ARTIFACT.descriptor}]", - '--output', '{MAPPINGS}', - '--key', 'mappings' - ] - ], [ - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'DOWNLOAD_MOJMAPS', - '--version', MC_VERSION, - '--side', '{SIDE}', - '--output', '{MOJMAPS}' - ] - ], [ - jar: INSTALLER_TOOLS, - classpath: INSTALLER_TOOLS_CLASSPATH, - args: [ - '--task', 'MERGE_MAPPING', - '--left', '{MAPPINGS}', - '--right', '{MOJMAPS}', - '--output', '{MERGED_MAPPINGS}', - '--classes', '--reverse-right' - ] - ], [ - sides: ['client'], - jar: JAR_SPLITTER, - classpath: JAR_SPLITTER_CLASSPATH, - args: [ - '--input', '{MINECRAFT_JAR}', - '--slim', '{MC_SLIM}', - '--extra', '{MC_EXTRA}', - '--srg', '{MERGED_MAPPINGS}' - ], - outputs: [ - '{MC_SLIM}': '{MC_SLIM_SHA}', - '{MC_EXTRA}': '{MC_EXTRA_SHA}' - ] - ], [ - sides: ['server'], - jar: JAR_SPLITTER, - classpath: JAR_SPLITTER_CLASSPATH, - args: [ - '--input', '{MC_UNPACKED}', - '--slim', '{MC_SLIM}', - '--extra', '{MC_EXTRA}', - '--srg', '{MERGED_MAPPINGS}' - ], - outputs: [ - '{MC_SLIM}': '{MC_SLIM_SHA}', - '{MC_EXTRA}': '{MC_EXTRA_SHA}' - ] - ], [ - jar: FART, - classpath: getClasspath(project, libs, FART), - args: [ - '--input', '{MC_SLIM}', - '--output', '{MC_SRG}', - '--names', '{MERGED_MAPPINGS}', - '--ann-fix', '--ids-fix', '--src-fix', '--record-fix' - ]/*, - outputs: [ - '{MC_SRG}': '{MC_SRG_SHA}' - ] - */ - ], [ - jar: BIN_PATCHER, - classpath: getClasspath(project, libs, BIN_PATCHER), - args: [ - '--clean', '{MC_SRG}', - '--output', '{PATCHED}', - '--apply', '{BINPATCH}' - ]/*, Because Vignette is unstable, it screws with the entry order of the binpatched jar, so we can't use the hash right now - // Re-enable this when https://github.com/CadixDev/Vignette/issues/1 is solved - outputs: [ - '{PATCHED}': '{PATCHED_SHA}' - ]*/ - ] - ] - ] - getClasspath(project, libs, MCP_ARTIFACT.descriptor) //Tell it to download mcp_config - } - } - - universalJar { - dependsOn downloadCrowdin - from zipTree(downloadCrowdin.dest).matching { - include 'assets/forge/lang/*.json' - } - - from extraTxts - duplicatesStrategy = 'exclude' - - doFirst { - MANIFESTS.each{ pkg, values -> - if (pkg == '/') { - manifest.attributes(values) - } else { - manifest.attributes(values, pkg) - } - } - } - } - - task installerJar(type: InstallerJar, dependsOn: [genClientBinPatches, genServerBinPatches, 'signUniversalJar', launcherJson]) { - packedDependencies = PACKED_DEPS - from(extraTxts) - from(rootProject.file('/forge_installer_logo.png')) { - rename { 'big_logo.png' } - } - from(genClientBinPatches.output) { - rename { 'data/client.lzma' } - } - from(genServerBinPatches.output) { - rename { 'data/server.lzma' } - } - } - - tasks.register('devInstallerJar', DevInstallerJar) { - input = installerJar.archiveFile - } - - task makeMdk(type: Zip) { - archiveBaseName = project.name - archiveClassifier = 'mdk' - archiveVersion = project.version - destinationDirectory = file('build/libs') - - from rootProject.file('gradlew') - from rootProject.file('gradlew.bat') - from extraTxts - from(rootProject.file('gradle/')){ - into('gradle/') - } - from(rootProject.file('mdk/')){ - rootProject.file('mdk/gitignore.txt').eachLine{ - if (!it.trim().isEmpty() && !it.trim().startsWith('#')) - exclude it - } - filter(ReplaceTokens, tokens: [ - FORGE_VERSION: FORGE_VERSION, - FORGE_GROUP: project.group, - FORGE_NAME: project.name, - MC_VERSION: MC_VERSION, - MAPPING_CHANNEL: MAPPING_CHANNEL, - MAPPING_VERSION: MAPPING_VERSION, - FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0], - MC_NEXT_VERSION: MC_NEXT_VERSION - ]) - rename 'gitignore\\.txt', '.gitignore' - rename 'gitattributes\\.txt', '.gitattributes' - } - from(rootProject.file('src/generated_test/resources/mdk_datagen/')) { - into('src/main/resources/') - exclude '**/.cache/' - } - } - - license { - header = file("$rootDir/LICENSE-header.txt") - - include 'net/minecraftforge/' - exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java' - - tasks { - main { - files.from files("$rootDir/src/main/java") - } - test { - files.from files("$rootDir/src/test/java") - } - } - } - - tasks.register('genAllData') { - dependsOn 'forge_data', 'forge_mdk_data', 'forge_test_data' - } - - tasks.eclipse.dependsOn('genEclipseRuns') - - if (project.hasProperty('UPDATE_MAPPINGS')) { - extractRangeMap { - sources.from sourceSets.test.java.srcDirs - addDependencies compileTestJava.classpath - } - applyRangeMap { - sources.from sourceSets.test.java.srcDirs - } - sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it } - } - - tasks.named('javadoc', Javadoc).configure { - description 'Generates the combined javadocs for the FML projects and the main Forge project' - var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage' ] - source includedProjects.collect { project(it).sourceSets.main.allJava } - classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath }) - - var docsDir = rootProject.file('src/docs/') - inputs.dir(docsDir) - .withPropertyName('docs resources directory') - .withPathSensitivity(PathSensitivity.RELATIVE) - .optional() - - failOnError = false - - // Exclude the Minecraft classes if not enabled - if (!project.hasProperty('generateAllDocumentation')) { - exclude 'net/minecraft/**' - exclude 'com/mojang/**' - } - exclude 'mcp/**' - - options.addStringOption('Xdoclint:all,-missing', '-public') - options { - stylesheetFile = new File(docsDir, 'stylesheet.css') - - tags = [ - 'apiNote:a:API Note:', - 'implSpec:a:Implementation Requirements:', - 'implNote:a:Implementation Note:' - ] - - groups = [ - 'Forge Mod Loader': [ - 'net.minecraftforge.fml.common.asm*', - 'net.minecraftforge.fml.loading*', - 'net.minecraftforge.fml.server*' - ], - 'FML Core': [ - 'net.minecraftforge.fml', - 'net.minecraftforge.fml.config*', - 'net.minecraftforge.fml.event*', - 'net.minecraftforge.fml.util*' - ], - 'FML Common': [ - 'net.minecraftforge.fml.core', - 'net.minecraftforge.fml.event.config', - 'net.minecraftforge.fml.event.lifecycle' - ], - 'FML Java/MC Language Providers': [ - 'net.minecraftforge.fml.common', - 'net.minecraftforge.fml.javafmlmod', - 'net.minecraftforge.fml.mclanguageprovider' - ], - 'Minecraft Forge API': [ - 'net.minecraftforge*' - ] - ] - - author = false - noSince = true - noHelp = true - - bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1." - windowTitle = "Minecraft Forge API ${VERSION}" - docTitle = "Minecraft Forge API - ${FORGE_VERSION} for Minecraft ${MC_VERSION}" - header = "
${FORGE_VERSION} for Minecraft ${MC_VERSION}
" - } - - doLast { - project.copy { - from docsDir - exclude '/stylesheet.css' - into destinationDir - } - } - } - - publishing { - publications { - mavenJava(MavenPublication) { - artifact universalJar - artifact installerJar - artifact makeMdk - artifact userdevJar - artifact sourcesJar - } - } - } - - // Since we need the modules in the bootstrap, we need to make sure they are compiled before we do each run - afterEvaluate { prepareRuns.dependsOn(PACKED_DEPS) } - - // Make sure we run bin compat checking during local testing. - if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) - publish.dependsOn(':forge:checkJarCompatibility') + from '47.999' } tasks.register('setup') { @@ -1296,6 +40,14 @@ tasks.register('doChecks') { dependsOn ':forge:publish' } +project(':mcp') { + apply plugin: 'net.minecraftforge.gradle.mcp' + mcp { + config MC_VERSION + '-' + MCP_VERSION + pipeline = 'joined' + } +} + if (System.env.TEAMCITY_VERSION) { //Only setup the CI environment if and only if the environment variables are set. tasks.configureTeamCity { @@ -1304,17 +56,4 @@ if (System.env.TEAMCITY_VERSION) { println "##teamcity[setParameter name='env.PUBLISHED_JAVA_ARTIFACT_VERSION' value='${project(':forge').version}']" } } -} - -allprojects { prj -> - prj.tasks.eclipse.doFirst { - rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file -> - def target = project.file('.settings/' + file.name) - def temp = new CleanProperties().load(file) - def exst = new CleanProperties().load(target) - exst.put('eclipse.preferences.version', '1') - temp.forEach(exst::put) - exst.store(target) - } - } -} +} \ No newline at end of file diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 7faf142df1..297636c20a 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -1,6 +1,6 @@ repositories { maven { url = 'https://maven.minecraftforge.net/' } - mavenCentral() + mavenCentral() } dependencies { diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BundleList.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BundleList.groovy new file mode 100644 index 0000000000..9e24a9ff21 --- /dev/null +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/BundleList.groovy @@ -0,0 +1,55 @@ +package net.minecraftforge.forge.tasks + +import org.gradle.api.tasks.* +import org.gradle.api.DefaultTask +import org.gradle.api.file.ConfigurableFileCollection +import org.gradle.api.file.RegularFileProperty + +abstract class BundleList extends DefaultTask { + @InputFiles abstract ConfigurableFileCollection getConfig() + @InputFile abstract RegularFileProperty getServerBundle() + @OutputFile abstract RegularFileProperty getOutput() + + BundleList() { + config.setFrom(project.configurations.installer) + output.convention(project.layout.buildDirectory.file("$name/output.list")) + configure { + dependsOn(project.tasks.universalJar) + inputs.file(project.tasks.universalJar.archiveFile) + } + } + + @TaskAction + void run() { + def entries = [:] as TreeMap + def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts + for (var dep : resolved) { + def info = Util.getMavenInfoFromDep(dep) + //println("$dep.file.sha1\t$info.name\t$info.path") + entries.put("$info.art.group:$info.art.name", "$dep.file.sha256\t$info.name\t$info.path") + } + + [ + project.tasks.universalJar + ].forEach{ packed -> + def info = Util.getMavenInfoFromTask(packed) + def file = packed.archiveFile.get().asFile + entries.put("$info.art.group:$info.art.name:$info.art.classifier", "$file.sha256\t$info.name\t$info.path") + } + + try (def zip = new java.util.zip.ZipFile(serverBundle.get().asFile)) { + def entry = zip.getEntry('META-INF/libraries.list') + def data = zip.getInputStream(entry).text.split('\n') + for (def line : data) { + def (sha, artifact, path) = line.split('\t') + def (group, name, other) = artifact.split(':', 3) + //println("Group: $group Name: $name") + def key = "$group:$name" + if (!entries.containsKey(key)) + entries.put(key, line) + } + } + + output.get().asFile.text = entries.values().join('\n') + } +} diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DevInstallerJar.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DevInstallerJar.groovy deleted file mode 100644 index cb7b922091..0000000000 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/DevInstallerJar.groovy +++ /dev/null @@ -1,67 +0,0 @@ -package net.minecraftforge.forge.tasks - -import org.gradle.api.tasks.* -import org.gradle.api.DefaultTask -import org.gradle.api.file.RegularFileProperty -import groovy.json.JsonSlurper -import java.util.zip.ZipEntry -import java.util.zip.ZipFile -import java.util.zip.ZipOutputStream - -abstract class DevInstallerJar extends DefaultTask { - @OutputFile abstract RegularFileProperty getOutput() - @InputFile abstract RegularFileProperty getInput() - - DevInstallerJar() { - output.convention(project.layout.buildDirectory.file('libs/' + project.name + '-' + project.version + '-installer-dev.jar')) - } - - @TaskAction - protected void exec() { - try (def zos = new ZipOutputStream(output.get().asFile.newDataOutputStream())) { - def seen = [] as Set - def deps = [:] as java.util.TreeMap - try (def base = new ZipFile(input.get().asFile)) { - base.entries().each { entry -> - zos.putNextEntry(entry) - def data = base.getInputStream(entry).bytes - zos.write(data) - - if (entry.name == 'install_profile.json' || entry.name == 'version.json') { - def json = new JsonSlurper().parse(data) - json.libraries.each { lib -> - deps.put(lib.name, lib.downloads.artifact) - } - } - - if (entry.name.startsWith('maven/')) - seen.add(entry.name.substring(6)) - } - } - - def resolved = project.configurations.installer.resolvedConfiguration.resolvedArtifacts - - deps.each { name, info -> - if (seen.contains(info.path)) - return - - def art = resolved.find { "${it.moduleVersion.id.group}:${it.moduleVersion.id.name}:${it.moduleVersion.id.version}" == name } - - def file = null - if (art != null) { - if (!Util.checkExists(info.url)) - file = art.file - } else { - // TODO download missing things - } - - if (file != null) { - //println('maven/' + info.path) - zos.putNextEntry(new ZipEntry('maven/' + info.path)) - zos.write(file.bytes) - seen.add(info.path) - } - } - } - } -} diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ExtractFile.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ExtractFile.groovy new file mode 100644 index 0000000000..315e3114d9 --- /dev/null +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/ExtractFile.groovy @@ -0,0 +1,24 @@ +package net.minecraftforge.forge.tasks + +import org.gradle.api.DefaultTask +import org.gradle.api.file.RegularFileProperty +import org.gradle.api.provider.Property +import org.gradle.api.tasks.* + +abstract class ExtractFile extends DefaultTask { + @InputFile abstract RegularFileProperty getInput() + @Input abstract Property getTarget() + @OutputFile abstract RegularFileProperty getOutput() + + @TaskAction + protected void exec() { + def zip = new java.util.zip.ZipFile(input.get().asFile); + def entry = zip.getEntry(target.get()) + if (entry == null) + throw new IllegalStateException(input.get().asFile.absolutePath + " does not contain " + target.get()) + def stream = zip.getInputStream(entry) + output.get().asFile.withOutputStream { out -> + stream.transferTo(out) + } + } +} diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy index d40fbee418..4f25eea1c4 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJar.groovy @@ -2,21 +2,26 @@ package net.minecraftforge.forge.tasks import org.gradle.api.tasks.bundling.Zip import org.gradle.api.tasks.* -import org.gradle.api.provider.SetProperty +import org.gradle.api.DefaultTask +import org.gradle.api.provider.Property +import groovy.json.JsonSlurper abstract class InstallerJar extends Zip { - @Input @Optional abstract SetProperty getPackedDependencies() + @Input @Optional abstract Property getFat() + @Input @Optional abstract Property getOffline() InstallerJar() { archiveClassifier.set('installer') archiveExtension.set('jar') // Needs to be Zip task to not override Manifest, so set extension destinationDirectory.set(project.layout.buildDirectory.dir('libs')) + fat.convention(false) + offline.convention(false) def installerJson = project.tasks.installerJson def launcherJson = project.tasks.launcherJson def downloadInstaller = project.tasks.downloadInstaller - dependsOn(installerJson, launcherJson, downloadInstaller) + dependsOn(installerJson, launcherJson, downloadInstaller, project.configurations.installer) from(installerJson, launcherJson) from(project.rootProject.file('/src/main/resources/url.png')) @@ -24,21 +29,128 @@ abstract class InstallerJar extends Zip { from(project.zipTree(downloadInstaller.output)) { duplicatesStrategy = 'exclude' } - - if (!System.env.TEAMCITY_VERSION) { - dependsOn(project.universalJar) - from(project.universalJar) { - into '/maven/' + project.group.replace('.', '/') + '/' + project.universalJar.archiveBaseName.get() + '/' + project.version + '/' + + if (fat.get() || offline.get()) { + def cfg = project.tasks.register(name + "Config", Configure) + cfg.get().configure { + parent = this + dependsOn(project.tasks.installerJson, project.tasks.launcherJson) } - - packedDependencies.get().forEach { - def jarTask = project.rootProject.getTasks().findByPath(it) - dependsOn(jarTask) - from(jarTask) { - into '/maven/' + jarTask.project.group.replace('.', '/') + '/' + jarTask.archiveBaseName.get() + '/' + jarTask.project.version + '/' + dependsOn(cfg) + } else { + // Things we ALWAYS bundle, this just the server shim jar, because the installer spec only says to extract the file. + // I should make it allow downloads but thats a spec break, and this is just a ~14KB jar + [ + project.tasks.serverShimJar // Server bootstrap executable jar + ].forEach { packed -> + def path = Util.getMavenInfoFromTask(packed).path + from(packed) { + rename { "maven/$path" } } } } } } + + static abstract class Configure extends DefaultTask { + public Zip parent + private int count = 0; + + @TaskAction + protected void exec() { + def deps = [:] as java.util.TreeMap + + // Gather all things that need downloading + [ + project.tasks.installerJson, + project.tasks.launcherJson + ].each { task -> + def json = task.output.get().asFile.json + json.libraries.each { lib -> + deps.put(lib.name, lib.downloads.artifact) + //println(lib.name) + } + } + + // First find things we build in this project. + [ + project.tasks.universalJar, // Forge runtime code + project.tasks.serverShimJar // Shim jar for dedicated server + ].forEach { packed -> + def name = Util.getMavenInfoFromTask(packed).name + def info = deps.remove(name) + if (info != null) { + println("Adding: $packed.path $name") + parent.from(packed) { + rename { "maven/$info.path" } + } + } + } + + // Find any artifacts from the 'installer' config + // This config specifies the runtime files we intend for the interaller to have. + // And are typically what we would be developing and testing alongside Forge. + // So we may have local modified versions + def cfg = project.configurations.installer + while (cfg != null) { + //println('') + def resolved = cfg.resolvedConfiguration.resolvedArtifacts + int found = 0 + for (var dep : resolved) { + def name = Util.getMavenInfoFromDep(dep).name + def info = deps.remove(name) + if (info == null) { + //println("Skipping: $name") + continue + } + //println("-$name") + found++ + addFile(dep.file, info) + } + + if (deps.isEmpty()) { + cfg = null + continue + } + + // Prevent infinite loops if something fucky happens + if (found == 0) + throw new IllegalStateException("Failed to find any installer dependencies") + + def seen = [] as Set + cfg = project.configurations.detachedConfiguration() + cfg.transitive = false + for (def key : deps.keySet()) { + def (group, artifact, other) = key.split(':', 3) + // Only resolve unique group:artifact so we don't get version overrides + if (seen.add(group + ':' + artifact)) { + //println("+$key") + cfg.dependencies.add(project.dependencies.create(key)) + } + } + } + } + + void addFile(file, info) { + def pack = parent.offline.get() || info.url.isEmpty() + + // If it's a offline jar just always pack + if (!pack) { + try { + def remote = new URL("${info.url}.sha1").getText('UTF-8') + pack = !info.sha1.equals(remote) + } catch (FileNotFoundException e) { + pack = !info.url.startsWith('https://libraries.minecraft.net/') + // Oh noes its not there! + } + } + + if (pack) { + println("Adding: $file.absolutePath") + parent.from(file) { + rename { "maven/$info.path" } + } + } + } + } } diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy index 4842c9f607..8ad1460dc1 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/InstallerJson.groovy @@ -13,7 +13,6 @@ import java.nio.file.Files abstract class InstallerJson extends DefaultTask { @OutputFile abstract RegularFileProperty getOutput() @InputFiles abstract ConfigurableFileCollection getInput() - @Input @Optional abstract SetProperty getPackedDependencies() @Input @Optional final Map libraries = new LinkedHashMap<>() @Input Map json = new LinkedHashMap<>() @InputFile abstract RegularFileProperty getIcon() @@ -23,29 +22,19 @@ abstract class InstallerJson extends DefaultTask { @Input abstract Property getWelcome() InstallerJson() { - getLauncherJsonName().convention('/version.json') - getLogo().convention('/big_logo.png') - getMirrors().convention('https://files.minecraftforge.net/mirrors-2.0.json') - getWelcome().convention("Welcome to the simple ${project.name.capitalize()} installer.") - - getOutput().convention(project.layout.buildDirectory.file('install_profile.json')) - - ['client', 'server'].each { side -> - ['slim', 'extra'].each { type -> - def tsk = project.tasks.getByName("download${side.capitalize()}${type.capitalize()}") - dependsOn(tsk) - input.from(tsk.output) - } - def tsk = project.tasks.getByName("create${side.capitalize()}SRG") - dependsOn(tsk) - input.from(tsk.output) - } - + launcherJsonName.convention('/version.json') + logo.convention('/big_logo.png') + mirrors.convention('https://files.minecraftforge.net/mirrors-2.0.json') + welcome.convention("Welcome to the ${project.name.capitalize()} installer.") + output.convention(project.layout.buildDirectory.file('libs/install_profile.json')) project.afterEvaluate { - (packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]).forEach { - dependsOn(it) - input.from it.archiveFile + [ + project.tasks.universalJar, + project.tasks.serverShimJar + ].forEach { packed -> + dependsOn(packed) + input.from packed.archiveFile } } } @@ -53,17 +42,19 @@ abstract class InstallerJson extends DefaultTask { @TaskAction protected void exec() { def libs = libraries - for (def child : packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) } + [project.universalJar]) { - def dep = Util.getMavenDep(child) - def path = Util.getMavenPath(child) - libs.put(dep.toString(), [ - name: dep, + [ + project.tasks.universalJar, + project.tasks.serverShimJar + ].forEach { packed -> + def info = Util.getMavenInfoFromTask(packed) + libs.put(info.name, [ + name: info.name, downloads: [ artifact: [ - path: path, - url: "https://maven.minecraftforge.net/${path}", - sha1: child.archiveFile.get().asFile.sha1(), - size: child.archiveFile.get().asFile.length() + path: info.path, + url: "https://maven.minecraftforge.net/$info.path", + sha1: packed.archiveFile.get().asFile.sha1(), + size: packed.archiveFile.get().asFile.length() ] ] ]) diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy index 4f730daf23..38a1c20669 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/LauncherJson.groovy @@ -16,59 +16,63 @@ abstract class LauncherJson extends DefaultTask { @OutputFile abstract RegularFileProperty getOutput() @InputFiles abstract ConfigurableFileCollection getInput() @Input Map json = new LinkedHashMap<>() - @Input @Optional abstract SetProperty getPackedDependencies() - - @Internal final vanilla = project.project(':mcp').file('build/mcp/downloadJson/version.json') - @Internal final timestamp = iso8601Now() - @Internal final comment = [ - "Please do not automate the download and installation of Forge.", - "Our efforts are supported by ads from the download page.", - "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/" - ] - @Internal final id = "${project.rootProject.ext.MC_VERSION}-${project.name}${project.version.substring(project.rootProject.ext.MC_VERSION.length())}" LauncherJson() { - getOutput().convention(project.layout.buildDirectory.file('version.json')) + output.convention(project.layout.buildDirectory.file('libs/version.json')) - dependsOn(':fmlloader:jar', 'universalJar') - getInput().from(project.tasks.universalJar.archiveFile, - project.project(':fmlloader').jar.archiveFile, - vanilla) - - project.afterEvaluate { - packedDependencies.get().forEach { - def jarTask = project.rootProject.tasks.findByPath(it) - dependsOn(jarTask) - input.from jarTask.archiveFile + dependsOn(project.tasks.universalJar) + input.from(project.tasks.universalJar.archiveFile) + input.from(project.configurations.installer) + configure { + def mc = project.rootProject.ext.MC_VERSION + def forge = project.rootProject.ext.FORGE_VERSION + def timestamp = iso8601Now() + json.putAll([ + _comment: [ + "Please do not automate the download and installation of Forge.", + "Our efforts are supported by ads from the download page.", + "If you MUST automate this, please consider supporting the project through https://www.patreon.com/LexManos/" + ], + id: "$mc-$project.name$forge", + time: timestamp, + releaseTime: timestamp, + inheritsFrom: mc, + type: 'release', + logging: [:], + mainClass: '', + libraries: [] + ] as LinkedHashMap) + + [ + project.tasks.universalJar + ].forEach { packed -> + dependsOn(packed) + input.from packed.archiveFile } } } @TaskAction protected void exec() { - if (!json.libraries) - json.libraries = [] - def libs = [:] - getArtifacts(project, project.configurations.installer, false).each { key, lib -> libs[key] = lib } - getArtifacts(project, project.configurations.moduleonly, false).each { key, lib -> libs[key] = lib } - - packedDependencies.get().collect{ project.rootProject.tasks.findByPath(it) }.forEach { - def path = Util.getMavenPath(it) - def key = Util.getMavenDep(it) - - libs[key] = [ - name: key, + [ + project.tasks.universalJar + ].forEach { packed -> + def info = Util.getMavenInfoFromTask(packed) + json.libraries.add([ + name: info.name, downloads: [ artifact: [ - path: path, - url: "https://maven.minecraftforge.net/${path}", - sha1: it.archiveFile.get().asFile.sha1(), - size: it.archiveFile.get().asFile.length() + path: info.path, + url: "https://maven.minecraftforge.net/$info.path", + sha1: packed.archiveFile.get().asFile.sha1(), + size: packed.archiveFile.get().asFile.length() ] ] - ] + ]) + } + getArtifacts(project, project.configurations.installer).each { key, lib -> + json.libraries.add(lib) } - libs.each { key, lib -> json.libraries.add(lib) } Files.writeString(output.get().asFile.toPath(), new JsonBuilder(json).toPrettyString()) } } diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy index d7f76b672e..09aa226a53 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/SetupCheckJarCompatibility.groovy @@ -26,16 +26,6 @@ abstract class SetupCheckJarCompatibility extends DefaultTask { @TaskAction void run() { def inputVersion = inputVersion.get() - def fmlLibs = project.configurations.detachedConfiguration(project.PACKED_DEPS.collect { - def artifactId = it.split(':')[1] - return project.dependencies.create("net.minecraftforge:${artifactId}:${inputVersion}") - }.toArray(Dependency[]::new)) - - project.tasks.named('checkJarCompatibility') { - baseLibraries.from(project.provider { - fmlLibs.resolvedConfiguration.lenientConfiguration.files - }) - } def baseForgeUserdev = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-userdev.jar") }.get().asFile project.rootProject.extensions.download.run { diff --git a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy index 6c810e7131..37bf48ffca 100644 --- a/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy +++ b/buildSrc/src/main/groovy/net/minecraftforge/forge/tasks/Util.groovy @@ -16,25 +16,33 @@ import java.util.zip.ZipInputStream public class Util { static final ASM_LEVEL = Opcodes.ASM9 - static void init() { - File.metaClass.sha1 = { -> - MessageDigest md = MessageDigest.getInstance('SHA-1') - delegate.eachByte 4096, {bytes, size -> - md.update(bytes, 0, size) - } - return md.digest().collect {String.format "%02x", it}.join() - } + static void init() { + File.metaClass.sha1 = { -> + MessageDigest md = MessageDigest.getInstance('SHA-1') + delegate.eachByte 4096, {bytes, size -> + md.update(bytes, 0, size) + } + return md.digest().collect {String.format "%02x", it}.join() + } File.metaClass.getSha1 = { !delegate.exists() ? null : delegate.sha1() } + File.metaClass.sha256 = { -> + MessageDigest md = MessageDigest.getInstance('SHA-256') + delegate.eachByte 4096, {bytes, size -> + md.update(bytes, 0, size) + } + return md.digest().collect {String.format "%02x", it}.join() + } + File.metaClass.getSha256 = { !delegate.exists() ? null : delegate.sha256() } - File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) } + File.metaClass.json = { -> new JsonSlurper().parseText(delegate.text) } File.metaClass.getJson = { return delegate.exists() ? new JsonSlurper().parse(delegate) : [:] } File.metaClass.setJson = { json -> delegate.text = new JsonBuilder(json).toPrettyString() } - Date.metaClass.iso8601 = { -> - def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") - def result = format.format(delegate) - return result[0..21] + ':' + result[22..-1] - } + Date.metaClass.iso8601 = { -> + def format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ") + def result = format.format(delegate) + return result[0..21] + ':' + result[22..-1] + } String.metaClass.rsplit = { String del, int limit = -1 -> def lst = new ArrayList() @@ -47,100 +55,117 @@ public class Util { lst.add(0, tmp) return lst } - } - - public static String[] getClasspath(project, libs, artifact) { - def ret = [] - artifactTree(project, artifact).each { key, lib -> - libs[lib.name] = lib - if (lib.name != artifact) - ret.add(lib.name) - } - return ret - } - - public static def getArtifacts(project, config, classifiers) { - def ret = [:] - config.resolvedConfiguration.resolvedArtifacts.each { - def art = [ - group: it.moduleVersion.id.group, - name: it.moduleVersion.id.name, - version: it.moduleVersion.id.version, - classifier: it.classifier, - extension: it.extension, - file: it.file - ] - def key = art.group + ':' + art.name - def folder = "${art.group.replace('.', '/')}/${art.name}/${art.version}/" - def filename = "${art.name}-${art.version}" - if (art.classifier != null) - filename += "-${art.classifier}" - filename += ".${art.extension}" - def path = "${folder}${filename}" - def url = "https://libraries.minecraft.net/${path}" - if (!checkExists(url)) { - url = "https://maven.minecraftforge.net/${path}" - } - ret[key] = [ - name: "${art.group}:${art.name}:${art.version}" + (art.classifier == null ? '' : ":${art.classifier}") + (art.extension == 'jar' ? '' : "@${art.extension}"), - downloads: [ - artifact: [ - path: path, - url: url, - sha1: sha1(art.file), - size: art.file.length() - ] - ] - ] - } - return ret - } - - public static def getMavenPath(task) { - def classifier = task.archiveClassifier.get() - def dep = "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier) - return "${task.project.group.replace('.', '/')}/${task.project.name}/${task.project.version}/${task.project.name}-${task.project.version}".toString() + (classifier == '' ? '' : '-' + classifier) + '.jar' } - public static def getMavenDep(task) { - def classifier = task.archiveClassifier.get() - return "${task.project.group}:${task.project.name}:${task.project.version}" + (classifier == '' ? '' : ':' + classifier) + public static String[] getClasspath(project, libs, artifact) { + def ret = [] + artifactTree(project, artifact).each { key, lib -> + libs[lib.name] = lib + if (lib.name != artifact) + ret.add(lib.name) + } + return ret } - public static def iso8601Now() { new Date().iso8601() } + public static def getArtifacts(project, config) { + def ret = [:] + config.resolvedConfiguration.resolvedArtifacts.each { dep -> + def info = getMavenInfoFromDep(dep) + def url = "https://libraries.minecraft.net/$info.path" + if (!checkExists(url)) + url = "https://maven.minecraftforge.net/$info.path" + + ret[info.key] = [ + name: info.name, + downloads: [ + artifact: [ + path: info.path, + url: url, + sha1: dep.file.sha1(), + size: dep.file.length() + ] + ] + ] + } + return ret + } + + public static Map getMavenInfoFromDep(dep) { + return getMavenInfoFromMap([ + group: dep.moduleVersion.id.group, + name: dep.moduleVersion.id.name, + version: dep.moduleVersion.id.version, + classifier: dep.classifier, + extension: dep.extension + ]) + } + public static Map getMavenInfoFromTask(task) { + return getMavenInfoFromMap([ + group: task.project.group, + name: task.project.name, + version: task.project.version, + classifier: task.archiveClassifier.get(), + extension: task.archiveExtension.get() + ]) + } + + private static Map getMavenInfoFromMap(art) { + def key = "$art.group:$art.name" + def name = "$art.group:$art.name:$art.version" + def path = "${art.group.replace('.', '/')}/$art.name/$art.version/$art.name-$art.version" + if (art.classifier != null) { + name += ":$art.classifier" + path += "-$art.classifier" + } + if (!'jar'.equals(art.extension)) { + name += "@$art.extension" + path += ".$art.extension" + } else { + path += ".jar" + } + return [ + key: key, + name: name, + path: path, + art: art + ] + } - public static def sha1(file) { - MessageDigest md = MessageDigest.getInstance('SHA-1') - file.eachByte 4096, {bytes, size -> - md.update(bytes, 0, size) - } - return md.digest().collect {String.format "%02x", it}.join() - } + public static def iso8601Now() { new Date().iso8601() } - private static def artifactTree(project, artifact) { - if (!project.ext.has('tree_resolver')) - project.ext.tree_resolver = 1 - def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++) - def dep = project.dependencies.create(artifact) - cfg.dependencies.add(dep) - def files = cfg.resolve() - return getArtifacts(project, cfg, true) - } + public static def sha1(file) { + MessageDigest md = MessageDigest.getInstance('SHA-1') + file.eachByte 4096, {bytes, size -> + md.update(bytes, 0, size) + } + return md.digest().collect {String.format "%02x", it}.join() + } - static boolean checkExists(url) { - try { - def code = new URL(url).openConnection().with { - requestMethod = 'HEAD' - connect() - responseCode - } - return code == 200 - } catch (Exception e) { - if (e.toString().contains('unable to find valid certification path to requested target')) - throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java') - throw e - } - } + private static def artifactTree(project, artifact, transitive = true) { + if (!project.ext.has('tree_resolver')) + project.ext.tree_resolver = 1 + def cfg = project.configurations.create('tree_resolver_' + project.ext.tree_resolver++) + cfg.transitive = transitive + def dep = project.dependencies.create(artifact) + cfg.dependencies.add(dep) + def files = cfg.resolve() + return getArtifacts(project, cfg) + } + + static boolean checkExists(url) { + try { + def code = new URL(url).openConnection().with { + requestMethod = 'HEAD' + connect() + responseCode + } + return code == 200 + } catch (Exception e) { + if (e.toString().contains('unable to find valid certification path to requested target')) + throw new RuntimeException('Failed to connect to ' + url + ': Missing certificate root authority, try updating java') + throw e + } + } static String getLatestForgeVersion(mcVersion) { final json = new JsonSlurper().parseText(new URL('https://files.minecraftforge.net/net/minecraftforge/forge/promotions_slim.json').getText('UTF-8')) diff --git a/build_clean.gradle b/build_clean.gradle index aceb952700..29c4ab776c 100644 --- a/build_clean.gradle +++ b/build_clean.gradle @@ -1,11 +1,19 @@ plugins { id 'java-library' - id 'eclipse' - id 'net.minecraftforge.gradle.patcher' version '[6.0.16,6.2)' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradle.patcher' } evaluationDependsOn(':mcp') +repositories { + mavenCentral() + maven gradleutils.forgeMaven + maven gradleutils.minecraftLibsMaven +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + dependencies { implementation(libs.forgespi) } @@ -44,8 +52,14 @@ patcher { } } +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation + options.warnings = false // Shutup deprecated for removal warnings +} + eclipse.classpath.file.whenMerged { // Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase def src = entries.find { it.path == 'src/main/java' } - src.entryAttributes['ignore_optional_problems'] = 'true' -} + if (src == null) throw new IllegalStateException("You must run `setup` task before importing") + src.entryAttributes['ignore_optional_problems'] = 'true' +} \ No newline at end of file diff --git a/build_forge.gradle b/build_forge.gradle new file mode 100644 index 0000000000..f9a47c03c9 --- /dev/null +++ b/build_forge.gradle @@ -0,0 +1,1034 @@ +import net.minecraftforge.forge.tasks.checks.CheckATs +import net.minecraftforge.forge.tasks.checks.CheckExcs +import net.minecraftforge.forge.tasks.checks.CheckPatches +import net.minecraftforge.forge.tasks.checks.CheckSAS +import net.minecraftforge.forge.tasks.checks.CheckTask + +import java.util.Date +import java.util.LinkedHashMap +import net.minecraftforge.forge.tasks.* +import static net.minecraftforge.forge.tasks.Util.* +import net.minecraftforge.gradle.common.tasks.ApplyBinPatches +import net.minecraftforge.gradle.common.tasks.CheckJarCompatibility +import net.minecraftforge.gradle.common.tasks.DownloadMavenArtifact +import net.minecraftforge.gradle.common.tasks.ExtractInheritance +import net.minecraftforge.gradle.patcher.tasks.GeneratePatches +import net.minecraftforge.gradle.userdev.tasks.RenameJar +import net.minecraftforge.gradleutils.PomUtils +import org.apache.tools.ant.filters.ReplaceTokens +import org.objectweb.asm.Opcodes + +plugins { + id 'idea' + id 'eclipse' + id 'java-library' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'de.undercouch.download' + id 'net.minecraftforge.gradleutils' + id 'net.minecraftforge.gradle.patcher' + id 'net.minecraftforge.gradlejarsigner' +} + +Util.init() //Init all our extension methods! + +// We depend on all other projects so that we can know their versions for userdev config +rootProject.subprojects.each { sib -> if (sib != project) evaluationDependsOn(sib.path) } + +apply from: rootProject.file('build_shared.gradle') + +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() +} + +jarSigner.autoDetect('forge') + +applyPatches { + level 'WARNING' +} + +sourceSets { + main { + java { + srcDir "$rootDir/src/main/java" + } + resources { + srcDir "$rootDir/src/main/resources" + srcDir "$rootDir/src/main/generated" + } + } + test { + java { + srcDir "$rootDir/src/test/java" + } + resources { + srcDir "$rootDir/src/test/resources" + srcDir "$rootDir/src/test/generated" + } + } +} + +ext { + SPEC_VERSION = gradleutils.gitInfo.tag + // The new versioning sceme is -.. + // ForgeMC is a unique identifier for every MC version we have supported. + // Essentially, the same as the old, except dropping the first number, and the builds are no longer unique. + MCP_ARTIFACT = project(':mcp').mcp.config.get() + + EXTRA_TXTS = [ + rootProject.file('CREDITS.txt'), + rootProject.file('LICENSE.txt'), + rootProject.tasks.createChangelog.outputFile + ] +} + +configurations { + // Don't pull all libraries, if we're missing something, add it to the installer list so the installer knows to download it. + bootstrap { transitive = false } + installer { + extendsFrom(bootstrap) + transitive = false + } + api.extendsFrom(installer) +} + +dependencies { + // These need to actually be on the classpath at the start. This is only used for the server shim jar. + // And this is only needed because custom file systems are REQUIRED to be on the boot classloader. + // This has ASM/BootStrap/Unsafe all because I haven't gotten around to moving UnionFileSystem out to its own project. + bootstrap(libs.jarjar.fs) // JarInJar file system + bootstrap(libs.bundles.jimfs) // In memory file system used for ForgeDev launches + bootstrap(libs.securemodules) // Has Union file system in it + bootstrap(libs.unsafe) // Needed by securemodules + bootstrap(libs.bundles.asm) // Needed by securemodules + + installer(libs.bootstrap) + installer(libs.bootstrap.api) // Needed by securemodules + installer(libs.accesstransformers) + installer(libs.antlr.runtime) // Dep of AccessTransformer + installer(libs.eventbus) + installer(libs.typetools) // Dep of EventBus + installer(libs.forgespi) + installer(libs.coremods) + installer(libs.nashorn) // Dep of Coremods + installer(libs.modlauncher) + installer(libs.mergetool.api) + installer(libs.bundles.night.config) + installer(libs.maven.artifact) + installer(libs.bundles.terminalconsoleappender) + installer(libs.mixin) + installer(libs.bundles.jarjar) + + installer(project(':fmlcore')) + installer(project(':fmlloader')) + installer(project(':fmlearlydisplay')) + installer(project(':javafmllanguage')) + installer(project(':lowcodelanguage')) + installer(project(':mclanguage')) + + runtimeOnly(libs.bootstrap) +} + +patcher { + excs.from file("$rootDir/src/main/resources/forge.exc") + parent = project(':mcp') + mcVersion = MC_VERSION + mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION + patches = file("$rootDir/patches/minecraft") + patchedSrc = file('src/main/java') + srgPatches = false + accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg") + sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas") + + runs { + forge_client { + property 'eventbus.checkTypesOnDispatch', 'true' + property 'org.lwjgl.system.SharedLibraryExtractDirectory', 'lwjgl_dll' + + args '--launchTarget', 'forge_dev_client', + '--username', 'Dev', + '--version', project.name, + '--accessToken', '0', + '--userType', 'mojang', + '--versionType', 'release', + '--assetsDir', downloadAssets.output, + '--assetIndex', "{asset_index}" + } + + forge_client_test { + parent runs.forge_client + } + + forge_server { + args '--launchTarget', 'forge_dev_server' + } + + forge_server_test { + parent runs.forge_server + } + + forge_server_gametest { + args '--launchTarget', 'forge_dev_server_gametest' + } + + forge_server_gametest_test { + parent runs.forge_server_gametest + } + + forge_data { + args '--launchTarget', 'forge_dev_data', + '--mod', 'forge', + '--all', + '--validate', + '--output', rootProject.file('src/main/generated/'), + '--validate', + '--existing', sourceSets.main.resources.srcDirs[0], + '--assetsDir', downloadAssets.output, + '--assetIndex', "{asset_index}" + } + + forge_data_test { + args '--launchTarget', 'forge_dev_data', + '--mod', '.+', + '--all', + '--validate', + '--output', rootProject.file('src/test/generated/'), + '--existing', sourceSets.main.resources.srcDirs[0], + '--existing', sourceSets.test.resources.srcDirs[0], + '--assetsDir', downloadAssets.output, + '--assetIndex', "{asset_index}" + } + + } +} + +afterEvaluate { + if (!patcher.srgPatches) { + srg2mcpClean { + dependsOn = [] + input = project(':mcp').setupMCP.output + } + userdevJar { + onlyIf = { t -> true } + } + def patches = project.file('build/genPatchesForUserdev/output/') + patches.mkdirs() + def genPatchesForUserdev = tasks.register('genPatchesForUserdev', GeneratePatches){ + base = project(':mcp').setupMCP.output + modified = applyRangeMapBase.output + originalPrefix = genPatches.originalPrefix + modifiedPrefix = genPatches.modifiedPrefix + output = patches + autoHeader true + lineEnding = '\n' + } + bakePatches { + dependsOn = [] + input = genPatchesForUserdev.get().output + } + } +} + +tasks.register('downloadCrowdin', Download) { + src 'https://files.minecraftforge.net/crowdin.zip' + dest file('build/crowdin.zip') + useETag 'all' + onlyIfModified true + quiet true +} + +tasks.userdevConfig.configure { + configurations.installer.allDependencies.forEach { + def dep = it.toString() + if (it instanceof ProjectDependency) + dep = "net.minecraftforge:$it.dependencyProject.name:$it.dependencyProject.version" + libraries.add(dep) + } + + inject = '' // We don't have a userdev sourceset anymore. Empty as a gradle workaround... + runs { + client { + environment 'MCP_MAPPINGS', '{mcp_mappings}' + property 'forge.enableGameTest', 'true' + args '--launchTarget', "forge_userdev_client" + args '--version', 'MOD_DEV' + args '--assetIndex', '{asset_index}' + args '--assetsDir', '{assets_root}' + } + + server { + environment 'MCP_MAPPINGS', '{mcp_mappings}' + property 'forge.enableGameTest', 'true' + args '--launchTarget', "forge_userdev_server" + } + + gameTestServer { + environment 'MCP_MAPPINGS', '{mcp_mappings}' + args '--launchTarget', "forge_userdev_server_gametest" + } + + data { + environment 'MCP_MAPPINGS', '{mcp_mappings}' + args '--launchTarget', "forge_userdev_data" + args '--assetIndex', '{asset_index}' + args '--assetsDir', '{assets_root}' + } + } +} + +for (def run : patcher.runs + tasks.userdevConfig.runs) { + if (run.parents) continue // We already added this to the parent run config + //run.property 'bsl.debug', 'true' + run.args '--gameDir', '.' + run.jvmArgs '-Djava.net.preferIPv6Addresses=system' + run.client run.name.contains('client') + run.main 'net.minecraftforge.bootstrap.ForgeBootstrap' +} + +for (def run : patcher.runs) { + def isTest = run.name.endsWith('_test') + run.taskName = run.name + run.workingDirectory file('run/' + run.name) + run.ideaModule rootProject.name + '.' + project.name + '.' + (isTest ? 'test' : 'main') + run.property 'bsl.debug', 'true' + run.property 'terminal.jline', 'true' + if (isTest) { + run.property 'forge.enableGameTest', 'true' + run.property 'forgedev.enableTestMods', 'true' + } +} + +tasks.register('downloadVersionManifest', Download) { + src 'https://piston-meta.mojang.com/mc/game/version_manifest_v2.json' + dest file('build/versions/version_manifest.json') + useETag 'all' + onlyIfModified true + quiet true +} +tasks.register('downloadJson', Download) { + dependsOn downloadVersionManifest + inputs.file downloadVersionManifest.dest + src { downloadVersionManifest.dest.json.versions.find{ it.id == MC_VERSION }.url } + dest file("build/versions/$MC_VERSION/version.json") + useETag 'all' + onlyIfModified true + quiet true +} +tasks.register('downloadClientRaw', Download) { + dependsOn downloadJson + inputs.file downloadJson.dest + src { downloadJson.dest.json.downloads.client.url } + dest file("build/versions/$MC_VERSION/client.jar") + useETag 'all' + onlyIfModified true + quiet true +} +tasks.register('downloadServerRaw', Download) { + dependsOn downloadJson + inputs.file downloadJson.dest + src { downloadJson.dest.json.downloads.server.url } + dest file("build/versions/$MC_VERSION/server-bundled.jar") + useETag 'all' + onlyIfModified true + quiet true +} +tasks.register('extractServer', ExtractFile) { + dependsOn downloadServerRaw + input = downloadServerRaw.dest + target = "META-INF/versions/$MC_VERSION/server-${MC_VERSION}.jar" + output = file("build/versions/$MC_VERSION/server.jar") +} +tasks.register('downloadLibraries', DownloadLibraries) { + dependsOn downloadJson + input = downloadJson.dest + output = rootProject.file('build/libraries/') +} +tasks.register('extractInheritance', ExtractInheritance) { + dependsOn downloadLibraries + tool = INSTALLER_TOOLS + ':fatjar' + args.add '--annotations' + input = genJoinedBinPatches.cleanJar + libraries.addAll downloadLibraries.librariesOutput.map { rf -> + java.nio.file.Files.readAllLines(rf.asFile.toPath()).stream().map(File::new).collect(java.util.stream.Collectors.toList()) + } +} +tasks.register("findFieldInstanceChecks", FieldCompareFinder) { + jar = createJoinedSRG.output + output = rootProject.file('src/main/resources/coremods/field_to_instanceof.json') + fields { + /* 1.17 changed most things to use Tags. So this isn't nessasary anymore so just make an empty list + bows { + cls = 'net/minecraft/world/item/Items' + name = 'f_42411_' + replacement = 'net/minecraft/world/item/BowItem' + } + crossbows { + cls = 'net/minecraft/world/item/Items' + name = 'f_42717_' + replacement = 'net/minecraft/world/item/CrossbowItem' + } + */ + } +} +tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) { + jar = createJoinedSRG.output + output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json') + predicate = { + parent, node, insn -> + 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it. + && insn.getOpcode() == Opcodes.INVOKEVIRTUAL + && insn.name.equals('m_6518_') + && insn.desc.equals('(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/entity/SpawnGroupData;') + } +} +tasks.register('validateDeprecations', ValidateDeprecations) { + input = tasks.jar.archiveFile + mcVersion = MC_VERSION +} +tasks.jar.finalizedBy 'validateDeprecations' +tasks.register("downloadInstaller", DownloadMavenArtifact) { + artifact = "net.minecraftforge:installer:2.2.+:fatjar" + changing = true +} +tasks.register("downloadServerShim", DownloadMavenArtifact) { + artifact = libs.bootstrap.shim.get().toString() + changing = true +} +tasks.register("downloadMCPConfig", DownloadMavenArtifact) { + artifact = MCP_ARTIFACT +} +tasks.register('extractMCPConfigMappings', net.minecraftforge.gradle.common.tasks.JarExec) { + ext.output = file('build/mcp_mappings.tsrg') + tool = INSTALLER_TOOLS + ':fatjar' + args = ['--task', 'MCP_DATA', '--key', 'mappings', '--input', downloadMCPConfig.output.get().asFile.absolutePath, '--output', output.absolutePath] + outputs.file(output) + inputs.file(downloadMCPConfig.output) +} +tasks.register('downloadClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) { + ext.output = file('build/client_mappings.tsrg') + tool = INSTALLER_TOOLS + ':fatjar' + args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'client', '--output', output.absolutePath] + outputs.file(output) +} +tasks.register('downloadServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) { + ext.output = file('build/server_mappings.tsrg') + tool = INSTALLER_TOOLS + ':fatjar' + args = ['--task', 'DOWNLOAD_MOJMAPS', '--sanitize', '--version', MC_VERSION, '--side', 'server', '--output', output.absolutePath] + outputs.file(output) +} +tasks.register('mergeClientMappings', net.minecraftforge.gradle.common.tasks.JarExec) { + ext.output = file('build/client_mappings_merged.tsrg') + tool = INSTALLER_TOOLS + ':fatjar' + args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadClientMappings.output.absolutePath, '--output', output.absolutePath] + outputs.file(output) +} +tasks.register('mergeServerMappings', net.minecraftforge.gradle.common.tasks.JarExec) { + ext.output = file('build/server_mappings_merged.tsrg') + tool = INSTALLER_TOOLS + ':fatjar' + args = ['--task', 'MERGE_MAPPING', '--classes', '--reverse-right', '--left', extractMCPConfigMappings.output.absolutePath, '--right', downloadServerMappings.output.absolutePath, '--output', output.absolutePath] + outputs.file(output) +} +tasks.register("createJoinedSRG", DownloadMavenArtifact) { + artifact = "net.minecraft:joined:${MC_VERSION}-${MCP_VERSION}:srg" +} +tasks.register("createClientSRG", RenameJar) { + tool = FART + ':all' + args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'] + mappings = createMcp2Srg.srg + dependsOn(downloadClientRaw) + input = downloadClientRaw.dest + output = file("build/createClientSRG/output.jar") +} +tasks.register("createServerSRG", RenameJar) { + tool = FART + ':all' + args = ['--input', '{input}', '--output', '{output}', '--names', '{mappings}', '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs'] + mappings = createMcp2Srg.srg + input = extractServer.output + output = file("build/createServerSRG/output.jar") +} +tasks.named('genClientBinPatches').configure { + tool = BINPATCH_TOOL + cleanJar = createClientSRG.output +} +tasks.named('genServerBinPatches').configure { + tool = BINPATCH_TOOL + cleanJar = createServerSRG.output +} +tasks.named('genJoinedBinPatches').configure { + tool = BINPATCH_TOOL + cleanJar = createJoinedSRG.output +} +tasks.register('applyClientBinPatches', ApplyBinPatches) { + tool = BINPATCH_TOOL + clean = createClientSRG.output + patch = genClientBinPatches.output + args.addAll(['--data', '--unpatched']) +} +tasks.register('applyServerBinPatches', ApplyBinPatches) { + tool = BINPATCH_TOOL + clean = createServerSRG.output + patch = genServerBinPatches.output + args.addAll(['--data', '--unpatched']) +} +tasks.register('applyJoinedBinPatches', ApplyBinPatches) { + tool = BINPATCH_TOOL + clean = genJoinedBinPatches.cleanJar + patch = genJoinedBinPatches.output +} +tasks.register('createServerShimClasspath', BundleList) { + dependsOn(downloadServerRaw) + serverBundle = downloadServerRaw.dest +} +tasks.register('createServerShimConfig') { + ext.output = file('build/libs/bootstrap-shim.properties') + doLast { + def cfg = new CleanProperties() + cfg."Main-Class" = 'net.minecraftforge.bootstrap.ForgeBootstrap' + cfg."Java-Version" = '17' + cfg."Arguments" = "--launchTarget forge_server" + cfg.store(output) + } +} +tasks.register('serverShimJar', Jar) { + dependsOn(createServerShimConfig) + from (createServerShimConfig.output) + from (createServerShimClasspath.output) { + rename { 'bootstrap-shim.list' } + } + from (zipTree(downloadServerShim.output)) + manifest { + from { + zipTree(downloadServerShim.output).find { it.name == 'MANIFEST.MF' } + } + + attributes('Class-Path': configurations.bootstrap.resolvedConfiguration.resolvedArtifacts.collect { "libraries/${Util.getMavenInfoFromDep(it).path}" }.join(' ')) + } + archiveClassifier = 'shim' + jarSigner.sign(it) +} +tasks.register('checkAll') { + dependsOn 'checkLicenses' + group = 'checks' +} +tasks.register('checkAllAndFix') { + dependsOn 'findFinalizeSpawnTargets', 'findFieldInstanceChecks', 'checkLicenses' + group = 'checks' +} + +CheckTask.registerTask(tasks, 'ATs', CheckATs) { + dependsOn extractInheritance, createSrg2Mcp + ats.from patcher.accessTransformers + inheritance = extractInheritance.output + mappings = createSrg2Mcp.output +} + +CheckTask.registerTask(tasks, 'SAS', CheckSAS) { + dependsOn extractInheritance + sass.from patcher.sideAnnotationStrippers + inheritance = extractInheritance.output +} + +CheckTask.registerTask(tasks, 'Excs', CheckExcs) { + dependsOn jar + binary = jar.archiveFile.get().asFile + excs.from patcher.excs +} + +CheckTask.registerTask(tasks, 'Patches', CheckPatches) { + dependsOn genPatches + patchDir = file("$rootDir/patches") + patchesWithS2SArtifact = [ + 'minecraft/net/minecraft/client/renderer/ViewArea.java.patch', + 'minecraft/net/minecraft/data/models/blockstates/Variant.java.patch', + ] +} + +genPatches { + finalizedBy checkAndFixPatches + autoHeader true + lineEnding = '\n' +} + +def baseForgeVersionProperty = project.objects.property(String) +baseForgeVersionProperty.set(project.provider { TeamcityRequests.attemptFindBase(rootDir) ?: getLatestForgeVersion(MC_VERSION) }) +baseForgeVersionProperty.finalizeValueOnRead() +def jarCompatibilityTaskSetup = { task -> + task.group = 'jar compatibility' + task.onlyIf { + baseForgeVersionProperty.getOrNull() != null + } +} + +tasks.register('setupCheckJarCompatibility', SetupCheckJarCompatibility) { + inputVersion = baseForgeVersionProperty +} + +tasks.register('applyBaseCompatibilityJarBinPatches', ApplyBinPatches) { + jarCompatibilityTaskSetup(it) + + clean = project.tasks.createJoinedSRG.output + patch = project.tasks.named('setupCheckJarCompatibility').flatMap { it.baseBinPatchesOutput } + output = project.layout.buildDirectory.dir(name).map { it.file('output.jar') } +} + +tasks.register('mergeBaseForgeJar', MergeJars) { + jarCompatibilityTaskSetup(it) + + inputJars.from(project.tasks.named('applyBaseCompatibilityJarBinPatches').flatMap { it.output }) + inputJars.from(baseForgeVersionProperty.map { inputVersion -> + def output = project.layout.buildDirectory.dir(name).map { it.file("forge-${inputVersion}-universal.jar") }.get().asFile + project.rootProject.extensions.download.run { + src "https://maven.minecraftforge.net/net/minecraftforge/forge/${inputVersion}/forge-${inputVersion}-universal.jar" + dest output + } + return output + }) +} + +tasks.register('checkJarCompatibility', CheckJarCompatibility) { + jarCompatibilityTaskSetup(it) + dependsOn 'setupCheckJarCompatibility' + + baseJar = project.tasks.named('mergeBaseForgeJar').flatMap { it.output } + baseLibraries.from(project.tasks.named('createJoinedSRG').flatMap { it.output }) + + inputJar = project.tasks.named('reobfJar').flatMap { it.output } + + commonLibraries.from(project.configurations.minecraftImplementation) + commonLibraries.from(project.configurations.installer) +} + +tasks.register('launcherJson', LauncherJson).configure { + json.putAll([ + mainClass: 'net.minecraftforge.bootstrap.ForgeBootstrap', + arguments: [ + game: [ + '--launchTarget', 'forge_client' + ], + jvm: [ + '-Djava.net.preferIPv6Addresses=system' + ] + ] + ] as LinkedHashMap) +} + +tasks.register('installerJson', InstallerJson) { + icon = rootProject.file('icon.ico') + + // Json to install into the client's launcher + dependsOn(launcherJson) + input.from(launcherJson.output) + + // Extract MCP Mappings + dependsOn(extractMCPConfigMappings) + input.from(extractMCPConfigMappings.output) + // Download Official Mappings + dependsOn(downloadClientMappings, downloadServerMappings) + input.from(downloadClientMappings.output, downloadServerMappings.output) + // Merge MCP and Official Mappings + dependsOn(mergeClientMappings, mergeServerMappings) + input.from(mergeClientMappings.output, mergeServerMappings.output) + // Get 'base' MC jar, Client is straight download, server is extracted from the bundle + dependsOn(downloadClientRaw, extractServer) + input.from(downloadClientRaw.dest, extractServer.output) + // Rename MC Jar + dependsOn(createClientSRG, createServerSRG) + input.from(createClientSRG.output, createServerSRG.output) + // Apply Binary patches to vanilla jar + dependsOn(applyClientBinPatches, applyServerBinPatches) + input.from(applyClientBinPatches.output, applyServerBinPatches.output, genClientBinPatches.toolJar) + + doFirst { + def libs = libraries + def INSTALLER_TOOLS_CLASSPATH = getClasspath(project, libs, INSTALLER_TOOLS) + json.putAll([ + _comment: launcherJson.json._comment, + hideExtract: true, + spec: 1, + profile: project.name, + version: launcherJson.json.id, + path: Util.getMavenInfoFromTask(tasks.serverShimJar).name, + minecraft: MC_VERSION, + serverJarPath: '{LIBRARY_DIR}/net/minecraft/server/{MINECRAFT_VERSION}/server-{MINECRAFT_VERSION}-bundled.jar', + data: [ + MAPPINGS: [ + client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]", + server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings@tsrg]" + ], + MAPPINGS_SHA: [ + client: "'${extractMCPConfigMappings.output.sha1}'", + server: "'${extractMCPConfigMappings.output.sha1}'" + ], + MOJMAPS: [ + client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]", + server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:mappings@tsrg]" + ], + MOJMAPS_SHA: [ + client: "'${downloadClientMappings.output.sha1}'", + server: "'${downloadServerMappings.output.sha1}'" + ], + MERGED_MAPPINGS: [ + client: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]", + server: "[${MCP_ARTIFACT.group}:${MCP_ARTIFACT.name}:${MCP_ARTIFACT.version}:mappings-merged@tsrg]" + ], + MERGED_MAPPINGS_SHA: [ + client: "'${mergeClientMappings.output.sha1}'", + server: "'${mergeServerMappings.output.sha1}'" + ], + MC_UNPACKED: [ + client: "[net.minecraft:client:${MC_VERSION}]", + server: "[net.minecraft:server:${MC_VERSION}:unpacked]" + ], + MC_UNPACKED_SHA: [ + client: "'${downloadClientRaw.dest.sha1}'", + server: "'${extractServer.output.get().asFile.sha1}'" + ], + MC_SRG: [ + client: "[net.minecraft:client:${MC_VERSION}-${MCP_VERSION}:srg]", + server: "[net.minecraft:server:${MC_VERSION}-${MCP_VERSION}:srg]" + ], + MC_SRG_SHA: [ + client: "'${createClientSRG.output.get().asFile.sha1}'", + server: "'${createServerSRG.output.get().asFile.sha1}'" + ], + BINPATCH: [ + client: '/data/client.lzma', + server: '/data/server.lzma' + ], + PATCHED: [ + client: "[${project.group}:${project.name}:${project.version}:client]", + server: "[${project.group}:${project.name}:${project.version}:server]" + ], + PATCHED_SHA: [ + client: "'${applyClientBinPatches.output.get().asFile.sha1}'", + server: "'${applyServerBinPatches.output.get().asFile.sha1}'" + ] + ], + processors: [ + [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: INSTALLER_TOOLS_CLASSPATH, + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{ROOT}/libraries/', + '--libraries' + ] + ], [ + sides: ['server'], + jar: INSTALLER_TOOLS, + classpath: INSTALLER_TOOLS_CLASSPATH, + args: [ + '--task', 'BUNDLER_EXTRACT', + '--input', '{MINECRAFT_JAR}', + '--output', '{MC_UNPACKED}', + '--jar-only' + ], + outputs: [ + '{MC_UNPACKED}': '{MC_UNPACKED_SHA}' + ] + ], [ + jar: INSTALLER_TOOLS, + classpath: INSTALLER_TOOLS_CLASSPATH, + args: [ + '--task', 'MCP_DATA', + '--input', "[${MCP_ARTIFACT.descriptor}]", + '--output', '{MAPPINGS}', + '--key', 'mappings' + ], + outputs: [ + '{MAPPINGS}': '{MAPPINGS_SHA}' + ] + ], [ + jar: INSTALLER_TOOLS, + classpath: INSTALLER_TOOLS_CLASSPATH, + args: [ + '--task', 'DOWNLOAD_MOJMAPS', + '--sanitize', + '--version', MC_VERSION, + '--side', '{SIDE}', + '--output', '{MOJMAPS}' + ], + outputs: [ + '{MOJMAPS}': '{MOJMAPS_SHA}' + ] + ], [ + jar: INSTALLER_TOOLS, + classpath: INSTALLER_TOOLS_CLASSPATH, + args: [ + '--task', 'MERGE_MAPPING', + '--left', '{MAPPINGS}', + '--right', '{MOJMAPS}', + '--output', '{MERGED_MAPPINGS}', + '--classes', '--reverse-right' + ], + outputs: [ + '{MERGED_MAPPINGS}': '{MERGED_MAPPINGS_SHA}' + ] + ], [ + sides: ['server'], + jar: FART, + classpath: getClasspath(project, libs, FART), + args: [ + '--input', '{MC_UNPACKED}', + '--output', '{MC_SRG}', + '--names', '{MERGED_MAPPINGS}', + '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs' + ], + outputs: [ + '{MC_SRG}': '{MC_SRG_SHA}' + ] + ], [ + sides: ['client'], + jar: FART, + classpath: getClasspath(project, libs, FART), + args: [ + '--input', '{MINECRAFT_JAR}', + '--output', '{MC_SRG}', + '--names', '{MERGED_MAPPINGS}', + '--ann-fix', '--ids-fix', '--src-fix', '--record-fix', '--strip-sigs' + ], + outputs: [ + '{MC_SRG}': '{MC_SRG_SHA}' + ] + ], [ + jar: BINPATCH_TOOL.rsplit(':', 1)[0], // remove :fatjar + classpath: getClasspath(project, libs, BINPATCH_TOOL.rsplit(':', 1)[0]), + args: [ + '--clean', '{MC_SRG}', + '--output', '{PATCHED}', + '--apply', '{BINPATCH}', + '--data', '--unpatched' + ], + outputs: [ + '{PATCHED}': '{PATCHED_SHA}' + ] + ] + ] + ] as LinkedHashMap) + getClasspath(project, libs, MCP_ARTIFACT.descriptor) //Tell it to download mcp_config + } +} + +tasks.named('universalJar').configure { + dependsOn downloadCrowdin + from zipTree(downloadCrowdin.dest).matching { + include 'assets/forge/lang/*.json' + } + + from(EXTRA_TXTS) + duplicatesStrategy = 'exclude' + exclude '.cache' + + manifest { + attributes([ + 'Specification-Title': 'Forge', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': SPEC_VERSION, + 'Implementation-Title': project.group, + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': FORGE_VERSION + ] as LinkedHashMap, 'net/minecraftforge/versions/forge/') + attributes([ + 'Specification-Title': 'Minecraft', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': MC_VERSION, + 'Implementation-Title': 'MCP', + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': MCP_VERSION + ] as LinkedHashMap, 'net/minecraftforge/versions/mcp/') + } + jarSigner.sign(it) +} + +tasks.register('installerJar', InstallerJar) { + fat = !System.env.TEAMCITY_VERSION + //offline = true + from(EXTRA_TXTS) + from(rootProject.file('/forge_installer_logo.png')) { + rename { 'big_logo.png' } + } + from(genClientBinPatches.output) { + rename { 'data/client.lzma' } + } + from(genServerBinPatches.output) { + rename { 'data/server.lzma' } + } + jarSigner.sign(it) +} + +tasks.register('mdkZip', Zip) { + archiveBaseName = project.name + archiveClassifier = 'mdk' + archiveVersion = project.version + destinationDirectory = file('build/libs') + + from rootProject.file('gradlew') + from rootProject.file('gradlew.bat') + from(EXTRA_TXTS) + from(rootProject.file('gradle/')){ + into('gradle/') + } + from(rootProject.file('mdk/')){ + rootProject.file('mdk/gitignore.txt').eachLine{ + if (!it.trim().isEmpty() && !it.trim().startsWith('#')) + exclude it + } + filter(ReplaceTokens, tokens: [ + FORGE_VERSION: FORGE_VERSION, + FORGE_GROUP: project.group, + FORGE_NAME: project.name, + MC_VERSION: MC_VERSION, + MAPPING_CHANNEL: MAPPING_CHANNEL, + MAPPING_VERSION: MAPPING_VERSION, + FORGE_SPEC_VERSION: SPEC_VERSION.split("\\.")[0], + MC_NEXT_VERSION: MC_NEXT_VERSION + ]) + rename 'gitignore\\.txt', '.gitignore' + rename 'gitattributes\\.txt', '.gitattributes' + } + from(rootProject.file('src/test/generated/mdk_datagen/')) { + into('src/main/resources/') + exclude '**/.cache/' + } +} + +license { + header = file("$rootDir/LICENSE-header.txt") + + include 'net/minecraftforge/' + exclude 'net/minecraftforge/common/LenientUnboundedMapCodec.java' + + tasks { + main { + files.from files("$rootDir/src/main/java") + } + test { + files.from files("$rootDir/src/test/java") + } + } +} + +tasks.register('genAllData') { + dependsOn 'forge_data', 'forge_test_data' +} + +if (project.hasProperty('UPDATE_MAPPINGS')) { + extractRangeMap { + sources.from sourceSets.test.java.srcDirs + addDependencies compileTestJava.classpath + } + applyRangeMap { + sources.from sourceSets.test.java.srcDirs + } + sourceSets.test.java.srcDirs.each { extractMappedNew.addTarget it } +} + +tasks.named('javadoc', Javadoc).configure { + description 'Generates the combined javadocs for the FML projects and the main Forge project' + var includedProjects = [ ':fmlcore', ':fmlloader', ':javafmllanguage', ':mclanguage' ] + source includedProjects.collect { project(it).sourceSets.main.allJava } + classpath = classpath + files(includedProjects.collect { project(it).sourceSets.main.compileClasspath }) + + var docsDir = rootProject.file('src/docs/') + inputs.dir(docsDir) + .withPropertyName('docs resources directory') + .withPathSensitivity(PathSensitivity.RELATIVE) + .optional() + + failOnError = false + + // Exclude the Minecraft classes if not enabled + if (!project.hasProperty('generateAllDocumentation')) { + exclude 'net/minecraft/**' + exclude 'com/mojang/**' + } + exclude 'mcp/**' + + options.addStringOption('Xdoclint:all,-missing', '-public') + options { + stylesheetFile = new File(docsDir, 'stylesheet.css') + + tags = [ + 'apiNote:a:API Note:', + 'implSpec:a:Implementation Requirements:', + 'implNote:a:Implementation Note:' + ] + + groups = [ + 'Forge Mod Loader': [ + 'net.minecraftforge.fml.common.asm*', + 'net.minecraftforge.fml.loading*', + 'net.minecraftforge.fml.server*' + ], + 'FML Core': [ + 'net.minecraftforge.fml', + 'net.minecraftforge.fml.config*', + 'net.minecraftforge.fml.event*', + 'net.minecraftforge.fml.util*' + ], + 'FML Common': [ + 'net.minecraftforge.fml.core', + 'net.minecraftforge.fml.event.config', + 'net.minecraftforge.fml.event.lifecycle' + ], + 'FML Java/MC Language Providers': [ + 'net.minecraftforge.fml.common', + 'net.minecraftforge.fml.javafmlmod', + 'net.minecraftforge.fml.mclanguageprovider' + ], + 'Minecraft Forge API': [ + 'net.minecraftforge*' + ] + ] + + author = false + noSince = true + noHelp = true + + bottom = "Minecraft Forge is an open source modding API for Minecraft: Java Edition, licensed under the Lesser GNU General Public License, version 2.1." + windowTitle = "Minecraft Forge API ${VERSION}" + docTitle = "Minecraft Forge API - ${FORGE_VERSION} for Minecraft ${MC_VERSION}" + header = "
${FORGE_VERSION} for Minecraft ${MC_VERSION}
" + } + + doLast { + project.copy { + from docsDir + exclude '/stylesheet.css' + into destinationDir + } + } +} + +publishing { + publications.register('mavenJava', MavenPublication).configure { + artifact universalJar + artifact installerJar + artifact mdkZip + artifact userdevJar + artifact sourcesJar + artifact serverShimJar + + artifactId = project.name + pom { + name = project.name + description = 'Modifactions to Minecraft to enable mod developers.' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } +} + +// Make sure we run bin compat checking during local testing. +if (!System.env.MAVEN_USER || !System.env.MAVEN_PASSWORD) + publish.dependsOn(':forge:checkJarCompatibility') + +apply from: rootProject.file('build_forge_eclipse.gradle') \ No newline at end of file diff --git a/build_forge_eclipse.gradle b/build_forge_eclipse.gradle new file mode 100644 index 0000000000..bf9fcd5d3a --- /dev/null +++ b/build_forge_eclipse.gradle @@ -0,0 +1,44 @@ +apply plugin: 'eclipse' + +eclipse { + classpath.file.whenMerged { + def minecraft = entries.find { it.path == 'src/main/java' } + if (minecraft == null) throw new IllegalStateException("You must run `setup` task before importing") + // Disable optional warnings on the minecraft decompiled source code. It just muddies the warning window and hides warnings in our own codebase + minecraft.entryAttributes['ignore_optional_problems'] = 'true' + + def mods = [ + 'src/main/java': 'minecraft', + 'src/main/resources': 'minecraft', + 'src/test/java': 'minecraft-test', + 'src/test/resources': 'minecraft-test', + + 'main-java': 'forge', + 'main-resources': 'forge', + 'generated': 'forge', + + 'test-java': 'forge-test', + 'test-resources': 'forge-test', + 'test-generated': 'forge-test', + ] + + entries.forEach { e -> + if ('src'.equals(e.kind) && e.hasProperty('output')) { + if (mods.containsKey(e.path)) + e.output = 'bin/' + mods[e.path] + //else + // throw new IllegalStateException('Unknown path: ' + e.toString()) + } + } + } + + // Filter out the run directory + project.resourceFilter { + appliesTo = 'FOLDERS' + type = 'EXCLUDE_ALL' + matcher { + id = 'org.eclipse.ui.ide.multiFilter' + arguments = '1.0-name-matches-false-true-run' + } + } +} \ No newline at end of file diff --git a/build_shared.gradle b/build_shared.gradle new file mode 100644 index 0000000000..4e57e743e2 --- /dev/null +++ b/build_shared.gradle @@ -0,0 +1,76 @@ +import net.minecraftforge.forge.tasks.CleanProperties + +apply plugin: 'eclipse' +apply plugin: 'idea' +apply plugin: 'net.minecraftforge.gradleutils' + +group = 'net.minecraftforge' +version = VERSION +println("Version: $version") + +repositories { + mavenCentral() + maven gradleutils.forgeMaven + maven gradleutils.minecraftLibsMaven + //mavenLocal() +} + +tasks.withType(Javadoc).configureEach { + options.tags = [ + 'apiNote:a:API Note:', + 'implSpec:a:Implementation Requirements:', + 'implNote:a:Implementation Note:' + ] + options.addStringOption('Xdoclint:all,-missing', '-public') +} + +// We need to write the manifest to the binary file so we have properly versioned packaged at dev time. +tasks.register('writeManifest') { + doLast { + if (plugins.findPlugin('net.minecraftforge.gradle.patcher')) // Forge project + universalJar.manifest.writeTo(rootProject.file('src/main/resources/META-INF/MANIFEST.MF')) + else + jar.manifest.writeTo(project.file('src/main/resources/META-INF/MANIFEST.MF')) + } +} + +tasks.register('generateResources') { + dependsOn('writeManifest') +} + +// Make sure out manifests get written before compiling the code, IDEA calls this task if you tell it to use the gradle build. +tasks.withType(JavaCompile).configureEach { + dependsOn(generateResources) + dependsOn(processResources) // Needed because we merge the output of this with the output of the compile task. And gradle detects downstream tasks using the output without a hard dep + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation + options.warnings = false // Shutup deprecated for removal warnings +} + +// Merge the resources and classes into the same directory. We'll need to split them at runtime because +// Minecraft and Forge are in the same sourceSet as they are inter dependent.. for now.. +sourceSets.each { + def dir = layout.buildDirectory.dir("classes/java/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir +} + +tasks.register('copyEclipseSettings') { + doLast { + rootProject.fileTree('ide/eclipse/template/.settings/').matching { include '**/*.prefs' }.each { file -> + def target = project.file('.settings/' + file.name) + def temp = new CleanProperties().load(file) + def exst = new CleanProperties().load(target) + exst.put('eclipse.preferences.version', '1') + temp.forEach(exst::put) + exst.store(target) + } + } +} + +// TODO: [Gradle][IntelliJ] Auto trigger these tasks on import. +eclipse { + // Run everytime eclipse builds the code + //autoBuildTasks writeManifest + // Run when importing the project + synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject +} \ No newline at end of file diff --git a/fmlcore/build.gradle b/fmlcore/build.gradle index 700beedf50..213149784e 100644 --- a/fmlcore/build.gradle +++ b/fmlcore/build.gradle @@ -1,12 +1,13 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'com.github.ben-manes.versions' - id 'org.javamodularity.moduleplugin' version '1.8.3' apply false - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } -dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) } +apply from: rootProject.file('build_shared.gradle') dependencies { compileOnly(libs.nulls) @@ -17,57 +18,50 @@ dependencies { implementation(libs.commons.io) } -task sourcesJar(type: Jar) { - archiveClassifier = 'sources' - from sourceSets.main.allSource +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() } -ext { - MANIFESTS = [ - '': [ - 'FMLModType': 'LIBRARY', - 'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'Git-Commit': GIT_INFO.abbreviatedId, - 'Git-Branch': GIT_INFO.branch, - 'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}" - ] as LinkedHashMap, - 'net/minecraftforge/fml/loading/': [ - 'Specification-Title': 'FMLLoader', +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Automatic-Module-Name': 'net.minecraftforge.fmlcore', + 'FMLModType': 'LIBRARY' + ] as LinkedHashMap) + attributes([ + 'Specification-Title': 'FML', 'Specification-Vendor': 'Forge Development LLC', 'Specification-Version': '1', - 'Implementation-Title': 'FML Loader', + 'Implementation-Title': 'FML', 'Implementation-Version': '1.0', - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap - ] -} - -jar.doFirst { - manifest.attributes['Automatic-Module-Name'] = project.name - MANIFESTS.each { pkg, values -> - if (pkg == '') - manifest.attributes(values) - else - manifest.attributes(values, pkg) + 'Implementation-Vendor': 'Forge Development LLC' + ] as LinkedHashMap, 'net/minecraftforge/fml/') } } tasks.withType(JavaCompile) { - options.compilerArgs << '-Xlint:unchecked' + options.compilerArgs << '-Xlint:-unchecked' } license { header = rootProject.file('LICENSE-header.txt') - - include 'net/minecraftforge/' } -artifacts { - archives jar - archives sourcesJar -} - -publishing.publications.mavenJava(MavenPublication) { - from components.java - artifact sourcesJar +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'fmlcore' + pom { + name = project.name + description = 'Modifactions to Minecraft to enable mod developers.' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } \ No newline at end of file diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java b/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java index 6a34cea208..d7e9d073d5 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/Bindings.java @@ -5,11 +5,12 @@ package net.minecraftforge.fml; -import cpw.mods.modlauncher.util.ServiceLoaderUtils; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.config.IConfigEvent; import net.minecraftforge.fml.loading.FMLLoader; +import java.util.ArrayList; +import java.util.ServiceConfigurationError; import java.util.ServiceLoader; import java.util.function.Supplier; @@ -19,10 +20,18 @@ public class Bindings { private final IBindingsProvider provider; private Bindings() { - final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList(); - if (providers.size() != 1) { - throw new IllegalStateException("Could not find bindings provider"); + var providers = new ArrayList(1); + for (var itr = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class).iterator(); itr.hasNext(); ) { + try { + providers.add(itr.next()); + } catch (ServiceConfigurationError sce) { + sce.printStackTrace(); + } } + + if (providers.size() != 1) + throw new IllegalStateException("Could not find bindings provider: " + providers); + this.provider = providers.get(0); } diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java b/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java index 0458d7ff52..3db178ceab 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/VersionChecker.java @@ -7,7 +7,6 @@ package net.minecraftforge.fml; import com.google.gson.Gson; import net.minecraftforge.fml.loading.FMLConfig; -import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.forgespi.language.IModInfo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -35,81 +34,68 @@ import java.util.zip.GZIPInputStream; import static net.minecraftforge.fml.VersionChecker.Status.*; -public class VersionChecker -{ +public class VersionChecker { private static final Logger LOGGER = LogManager.getLogger(); private static final int MAX_HTTP_REDIRECTS = Integer.getInteger("http.maxRedirects", 20); private static final int HTTP_TIMEOUT_SECS = Integer.getInteger("http.timeoutSecs", 15); - public enum Status - { + public enum Status { PENDING(), FAILED(), UP_TO_DATE(), - OUTDATED(3, true), + OUTDATED(3, true, true), AHEAD(), BETA(), - BETA_OUTDATED(6, true); + BETA_OUTDATED(6, true, true); final int sheetOffset; final boolean draw, animated; - Status() - { + Status() { this(0, false, false); } - Status(int sheetOffset) - { - this(sheetOffset, true, false); - } - - Status(int sheetOffset, boolean animated) - { - this(sheetOffset, true, animated); - } - - Status(int sheetOffset, boolean draw, boolean animated) - { + Status(int sheetOffset, boolean draw, boolean animated) { this.sheetOffset = sheetOffset; this.draw = draw; this.animated = animated; } - public int getSheetOffset() - { + public int getSheetOffset() { return sheetOffset; } - public boolean shouldDraw() - { + public boolean shouldDraw() { return draw; } - public boolean isAnimated() - { + public boolean isAnimated() { return animated; } - } public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map changes, String url) {} - public static void startVersionCheck() - { - new Thread("Forge Version Check") - { + public static void startVersionCheck() { + new Thread("Forge Version Check") { private HttpClient client; + private String mcVersion; + private String agent; @Override - public void run() - { - if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK)) - { + public void run() { + if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.VERSION_CHECK)) { LOGGER.info("Global Forge version check system disabled, no further processing."); return; } + var mc = ModList.get().getModContainerById("minecraft"); + var forge = ModList.get().getModContainerById("forge"); + this.mcVersion = mc.get().getModInfo().getVersion().toString(); + + this.agent = "Java-http-client/" + System.getProperty("java.version") + + " MinecraftForge/" + mcVersion + '-' + forge.get().getModInfo().getVersion(); + client = HttpClient.newBuilder().connectTimeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)).build(); gatherMods().forEach(this::process); } @@ -119,15 +105,9 @@ public class VersionChecker */ private String openUrlString(URL url, IModInfo mod) throws IOException, URISyntaxException, InterruptedException { URL currentUrl = url; + var userAgent = this.agent + ' ' + mod.getModId() + '/' + mod.getVersion(); - final StringBuilder sb = new StringBuilder(); - sb.append("Java-http-client/").append(System.getProperty("java.version")).append(' '); - sb.append("MinecraftForge/").append(FMLLoader.versionInfo().mcAndForgeVersion()).append(' '); - sb.append(mod.getModId()).append('/').append(mod.getVersion()); - final String userAgent = sb.toString(); - - for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++) - { + for (int redirects = 0; redirects < MAX_HTTP_REDIRECTS; redirects++) { var request = HttpRequest.newBuilder() .uri(currentUrl.toURI()) .timeout(Duration.ofSeconds(HTTP_TIMEOUT_SECS)) @@ -139,8 +119,7 @@ public class VersionChecker final HttpResponse response = client.send(request, HttpResponse.BodyHandlers.ofInputStream()); int responseCode = response.statusCode(); - if (responseCode >= 300 && responseCode <= 399) - { + if (responseCode >= 300 && responseCode <= 399) { String newLocation = response.headers().firstValue("Location") .orElseThrow(() -> new IOException("Got a 3xx response code but Location header was null while trying to fetch " + url)); currentUrl = new URL(currentUrl, newLocation); @@ -150,26 +129,22 @@ public class VersionChecker final boolean isGzipEncoded = response.headers().firstValue("Content-Encoding").orElse("").equals("gzip"); final String bodyStr; - try (InputStream inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body()) - { - try (var bufferedReader = new BufferedReader(new InputStreamReader(inStream))) - { - bodyStr = bufferedReader.lines().collect(Collectors.joining("\n")); - } + try (var inStream = isGzipEncoded ? new GZIPInputStream(response.body()) : response.body(); + var bufferedReader = new BufferedReader(new InputStreamReader(inStream)) + ) { + bodyStr = bufferedReader.lines().collect(Collectors.joining("\n")); } return bodyStr; } throw new IOException("Too many redirects while trying to fetch " + url); } - private void process(IModInfo mod) - { + private void process(IModInfo mod) { Status status = PENDING; ComparableVersion target = null; Map changes = null; String display_url = null; - try - { + try { if (mod.getUpdateURL().isEmpty()) return; URL url = mod.getUpdateURL().get(); LOGGER.info("[{}] Starting version check at {}", mod.getModId(), url.toString()); @@ -178,54 +153,40 @@ public class VersionChecker LOGGER.debug("[{}] Received version check data:\n{}", mod.getModId(), data); - @SuppressWarnings("unchecked") Map json = new Gson().fromJson(data, Map.class); @SuppressWarnings("unchecked") Map promos = (Map)json.get("promos"); display_url = (String)json.get("homepage"); - var mcVersion = FMLLoader.versionInfo().mcVersion(); String rec = promos.get(mcVersion + "-recommended"); String lat = promos.get(mcVersion + "-latest"); ComparableVersion current = new ComparableVersion(mod.getVersion().toString()); - if (rec != null) - { + if (rec != null) { ComparableVersion recommended = new ComparableVersion(rec); int diff = recommended.compareTo(current); if (diff == 0) status = UP_TO_DATE; - else if (diff < 0) - { + else if (diff < 0) { status = AHEAD; - if (lat != null) - { + if (lat != null) { ComparableVersion latest = new ComparableVersion(lat); - if (current.compareTo(latest) < 0) - { + if (current.compareTo(latest) < 0) { status = OUTDATED; target = latest; } } - } - else - { + } else { status = OUTDATED; target = recommended; } - } - else if (lat != null) - { + } else if (lat != null) { ComparableVersion latest = new ComparableVersion(lat); - if (current.compareTo(latest) < 0) - status = BETA_OUTDATED; - else - status = BETA; + status = current.compareTo(latest) < 0 ? BETA_OUTDATED : BETA; target = latest; - } - else + } else status = BETA; LOGGER.info("[{}] Found status: {} Current: {} Target: {}", mod.getModId(), status, current, target); @@ -233,27 +194,20 @@ public class VersionChecker changes = new LinkedHashMap<>(); @SuppressWarnings("unchecked") Map tmp = (Map)json.get(mcVersion); - if (tmp != null) - { + if (tmp != null) { List ordered = new ArrayList<>(); - for (String key : tmp.keySet()) - { + for (String key : tmp.keySet()) { ComparableVersion ver = new ComparableVersion(key); if (ver.compareTo(current) > 0 && (target == null || ver.compareTo(target) < 1)) - { ordered.add(ver); - } } Collections.sort(ordered); - for (ComparableVersion ver : ordered) - { + for (ComparableVersion ver : ordered) { changes.put(ver, tmp.get(ver.toString())); } } - } - catch (Exception e) - { + } catch (Exception e) { LOGGER.warn("Failed to process update information", e); status = FAILED; } @@ -263,8 +217,7 @@ public class VersionChecker } // Gather a list of mods that have opted in to this update system by providing a URL. - private static List gatherMods() - { + private static List gatherMods() { List ret = new LinkedList<>(); for (IModInfo info : ModList.get().getMods()) { if (info.getUpdateURL().isPresent()) @@ -276,9 +229,7 @@ public class VersionChecker private static Map results = new ConcurrentHashMap<>(); private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null); - public static CheckResult getResult(IModInfo mod) - { + public static CheckResult getResult(IModInfo mod) { return results.getOrDefault(mod, PENDING_CHECK); } - } diff --git a/fmlearlydisplay/build.gradle b/fmlearlydisplay/build.gradle index 4cd94dc2d4..b0c3f3ec40 100644 --- a/fmlearlydisplay/build.gradle +++ b/fmlearlydisplay/build.gradle @@ -1,10 +1,14 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'org.javamodularity.moduleplugin' version '1.8.7' apply false - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } +apply from: rootProject.file('build_shared.gradle') + import org.gradle.internal.os.OperatingSystem switch (OperatingSystem.current()) { case OperatingSystem.LINUX: @@ -18,7 +22,10 @@ switch (OperatingSystem.current()) { break } -java.withSourcesJar() +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() +} dependencies { compileOnly(libs.nulls) @@ -44,12 +51,16 @@ test { jar { manifest { attributes([ - 'Specification-Title': 'FMLEarlyDisplay', + 'Automatic-Module-Name': 'net.minecraftforge.earlydisplay', + 'Forge-Module-Layer': 'boot' + ] as LinkedHashMap) + attributes([ + 'Specification-Title': 'FML Early Display', 'Specification-Vendor': 'Forge Development LLC', 'Specification-Version': '1', 'Implementation-Title': 'FML Early Display', - 'Implementation-Version': '1.0', - 'Implementation-Vendor': 'Forge' + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': '1.0' ] as LinkedHashMap, 'net/minecraftforge/fml/earlydisplay/') } } @@ -60,9 +71,22 @@ tasks.withType(JavaCompile) { license { header = rootProject.file('LICENSE-header.txt') - include 'net/minecraftforge/' } -publishing.publications.mavenJava(MavenPublication) { - from components.java +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'fmlearlydisplay' + pom { + name = project.name + description = 'A pretty looking, but prone to erroring screen displayed during Forge loading.' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } \ No newline at end of file diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java index 0db07ad722..c1c72c45f0 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -114,11 +114,13 @@ public class DisplayWindow implements ImmediateWindowProvider { public String name() { return "fmlearlywindow"; } + @Override public Runnable initialize(String[] arguments) { + String mcVersion = FMLLoader.versionInfo().mcVersion(); + String forgeVersion = FMLLoader.versionInfo().forgeVersion(); + final OptionParser parser = new OptionParser(); - var mcversionopt = parser.accepts("fml.mcVersion").withRequiredArg().ofType(String.class); - var forgeversionopt = parser.accepts("fml.forgeVersion").withRequiredArg().ofType(String.class); var widthopt = parser.accepts("width") .withRequiredArg().ofType(Integer.class) .defaultsTo(FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH)); @@ -133,7 +135,7 @@ public class DisplayWindow implements ImmediateWindowProvider { FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_WIDTH, winWidth); FMLConfig.updateConfig(FMLConfig.ConfigValue.EARLY_WINDOW_HEIGHT, winHeight); fbScale = FMLConfig.getIntConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_FBSCALE); - if (System.getenv("FML_EARLY_WINDOW_DARK")!= null) { + if (System.getenv("FML_EARLY_WINDOW_DARK") != null) { this.colourScheme = ColourScheme.BLACK; } else { try { @@ -148,10 +150,9 @@ public class DisplayWindow implements ImmediateWindowProvider { } this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED); - var forgeVersion = parsed.valueOf(forgeversionopt); - StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading "+ forgeVersion)); + StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion)); performanceInfo = new PerformanceInfo(); - return start(parsed.valueOf(mcversionopt), forgeVersion); + return start(mcVersion, forgeVersion); } private static final long MINFRAMETIME = TimeUnit.MILLISECONDS.toNanos(10); // This is the FPS cap on the window - note animation is capped at 20FPS via the tickTimer @@ -229,11 +230,11 @@ public class DisplayWindow implements ImmediateWindowProvider { crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage()); } this.elements = new ArrayList<>(Arrays.asList( - RenderElement.anvil(font), - RenderElement.logMessageOverlay(font), - RenderElement.forgeVersionOverlay(font, mcVersion+"-"+forgeVersion.split("-")[0]), - RenderElement.performanceBar(font), - RenderElement.progressBars(font) + RenderElement.anvil(font), + RenderElement.logMessageOverlay(font), + RenderElement.forgeVersionOverlay(font, mcVersion + "-" + forgeVersion), + RenderElement.performanceBar(font), + RenderElement.progressBars(font) )); var date = Calendar.getInstance(); @@ -285,6 +286,7 @@ public class DisplayWindow implements ImmediateWindowProvider { public Runnable start(@Nullable String mcVersion, final String forgeVersion) { renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> { final var thread = Executors.defaultThreadFactory().newThread(r); + thread.setName("EarlyDisplay"); thread.setDaemon(true); return thread; }); diff --git a/fmlloader/build.gradle b/fmlloader/build.gradle index 7f9ae834a7..0720146f6b 100644 --- a/fmlloader/build.gradle +++ b/fmlloader/build.gradle @@ -1,12 +1,14 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'com.github.ben-manes.versions' - id 'org.javamodularity.moduleplugin' version '1.8.3' apply false - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } -dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) } +apply from: rootProject.file('build_shared.gradle') + configurations.forEach{ it.transitive = false } dependencies { @@ -41,28 +43,25 @@ dependencies { testRuntimeOnly(libs.bootstrap) } -task sourcesJar(type: Jar) { - archiveClassifier = 'sources' - from sourceSets.main.allSource +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() } -ext { - MANIFESTS = [ - 'net/minecraftforge/fml/loading/': [ - 'Specification-Title': 'FMLLoader', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'FML Loader', - 'Implementation-Version': '1.0', - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap - ] -} - -jar.doFirst { - manifest.attributes['Automatic-Module-Name'] = project.name - MANIFESTS.each { pkg, values -> - manifest.attributes(values, pkg) +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Automatic-Module-Name': 'net.minecraftforge.fmlloader', + 'Forge-Module-Layer': 'boot' + ] as LinkedHashMap) + attributes([ + 'Specification-Title': 'FMLLoader', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': '1', + 'Implementation-Title': 'FMLLoader', + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': FORGE_VERSION + ] as LinkedHashMap, 'net/minecraftforge/fml/loading/') } } @@ -72,16 +71,36 @@ tasks.withType(JavaCompile) { license { header = rootProject.file('LICENSE-header.txt') - - include 'net/minecraftforge/' } -artifacts { - archives jar - archives sourcesJar +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'fmlloader' + pom { + name = project.name + description = 'Modifactions to Minecraft to enable mod developers.' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } -publishing.publications.mavenJava(MavenPublication) { - from components.java - artifact sourcesJar -} \ No newline at end of file +tasks.register('writeForgeVersionJson') { + doLast { + file('src/main/resources/forge_version.json').json = [ + 'forge': FORGE_VERSION, + 'mc': MC_VERSION, + 'mcp': MCP_VERSION + ] as LinkedHashMap + } +} + +tasks.named('generateResources').configure { + dependsOn('writeForgeVersionJson') +} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ClasspathTransformerDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ClasspathTransformerDiscoverer.java deleted file mode 100644 index 6b8bbf1dfd..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ClasspathTransformerDiscoverer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading; - -import cpw.mods.modlauncher.api.NamedPath; -import cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService; -import org.apache.logging.log4j.LogManager; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; - -public class ClasspathTransformerDiscoverer implements ITransformerDiscoveryService { - - private final List legacyClasspath = Arrays.stream(System.getProperty("legacyClassPath", "").split(File.pathSeparator)).map(Path::of).toList(); - - @Override - public List candidates(Path gameDirectory) { - return Collections.emptyList(); - } - - @Override - public List candidates(final Path gameDirectory, final String launchTarget) { - if (launchTarget != null && launchTarget.contains("dev")) { - this.scan(gameDirectory); - } - return List.copyOf(found); - } - - private final static List found = new ArrayList<>(); - - public static List allExcluded() { - return found.stream().map(np->np.paths()[0]).toList(); - } - - private void scan(final Path gameDirectory) { - try { - locateTransformers("META-INF/services/cpw.mods.modlauncher.api.ITransformationService"); - locateTransformers("META-INF/services/net.minecraftforge.forgespi.locating.IModLocator"); - } catch (IOException e) { - LogManager.getLogger().error("Error during discovery of transform services from the classpath", e); - } - } - - private void locateTransformers(String resource) throws IOException { - final Enumeration resources = ClassLoader.getSystemClassLoader().getResources(resource); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - Path path = ClasspathLocatorUtils.findJarPathFor(resource, url.toString(), url); - if (legacyClasspath.stream().anyMatch(path::equals) || !Files.exists(path) || Files.isDirectory(path)) - continue; - found.add(new NamedPath(path.toUri().toString(), path)); - } - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java index d5f7c79430..1d45c19f75 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLLoader.java @@ -8,8 +8,6 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import cpw.mods.modlauncher.Launcher; import cpw.mods.modlauncher.api.*; -import cpw.mods.modlauncher.serviceapi.ILaunchPluginService; -import cpw.mods.modlauncher.util.ServiceLoaderUtils; import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler; import net.minecraftforge.fml.loading.moddiscovery.ModDiscoverer; import net.minecraftforge.fml.loading.moddiscovery.ModFile; @@ -24,27 +22,29 @@ import org.slf4j.Logger; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.ServiceConfigurationError; +import java.util.ServiceLoader; +import java.util.Set; import java.util.function.BiFunction; -import java.util.stream.Collectors; - import static net.minecraftforge.fml.loading.LogMarkers.CORE; import static net.minecraftforge.fml.loading.LogMarkers.SCAN; -public class FMLLoader -{ +public class FMLLoader { private static final Logger LOGGER = LogUtils.getLogger(); private static AccessTransformerService accessTransformer; private static ModDiscoverer modDiscoverer; private static ICoreModProvider coreModProvider; - private static ILaunchPluginService eventBus; private static LanguageLoadingProvider languageLoadingProvider; private static Dist dist; private static String naming; private static LoadingModList loadingModList; private static RuntimeDistCleaner runtimeDistCleaner; private static Path gamePath; - private static VersionInfo versionInfo; + private static VersionInfo versionInfo = VersionInfo.detect(); private static String launchHandlerName; private static CommonLaunchHandler commonLaunchHandler; public static Runnable progressWindowTick; @@ -53,80 +53,74 @@ public class FMLLoader private static boolean production; private static IModuleLayerManager moduleLayerManager; - static void onInitialLoad(IEnvironment environment, Set otherServices) throws IncompatibleEnvironmentException - { - final String version = LauncherVersion.getVersion(); - LOGGER.debug(CORE,"FML {} loading", version); - final Package modLauncherPackage = ITransformationService.class.getPackage(); - LOGGER.debug(CORE,"FML found ModLauncher version : {}", modLauncherPackage.getImplementationVersion()); - if (!modLauncherPackage.isCompatibleWith("4.0")) { - LOGGER.error(CORE, "Found incompatible ModLauncher specification : {}, version {} from {}", modLauncherPackage.getSpecificationVersion(), modLauncherPackage.getImplementationVersion(), modLauncherPackage.getImplementationVendor()); - throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion()); - } + static void onInitialLoad(IEnvironment env, Set otherServices) throws IncompatibleEnvironmentException { + LOGGER.debug(CORE, "Detected version data : {}", versionInfo); + LOGGER.debug(CORE, "FML {} loading", LauncherVersion.getVersion()); - accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> { - LOGGER.error(CORE, "Access Transformer library is missing, we need this to run"); - return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run"); - }); - - final Package atPackage = accessTransformer.getClass().getPackage(); - LOGGER.debug(CORE,"FML found AccessTransformer version : {}", atPackage.getImplementationVersion()); - if (!atPackage.isCompatibleWith("1.0")) { - LOGGER.error(CORE, "Found incompatible AccessTransformer specification : {}, version {} from {}", atPackage.getSpecificationVersion(), atPackage.getImplementationVersion(), atPackage.getImplementationVendor()); - throw new IncompatibleEnvironmentException("Incompatible accesstransformer found "+atPackage.getSpecificationVersion()); - } - - eventBus = environment.findLaunchPlugin("eventbus").orElseThrow(()-> { - LOGGER.error(CORE, "Event Bus library is missing, we need this to run"); - return new IncompatibleEnvironmentException("Missing EventBus, cannot run"); - }); - - final Package eventBusPackage = eventBus.getClass().getPackage(); - LOGGER.debug(CORE,"FML found EventBus version : {}", eventBusPackage.getImplementationVersion()); - if (!eventBusPackage.isCompatibleWith("1.0")) { - LOGGER.error(CORE, "Found incompatible EventBus specification : {}, version {} from {}", eventBusPackage.getSpecificationVersion(), eventBusPackage.getImplementationVersion(), eventBusPackage.getImplementationVendor()); - throw new IncompatibleEnvironmentException("Incompatible eventbus found "+eventBusPackage.getSpecificationVersion()); - } - - runtimeDistCleaner = (RuntimeDistCleaner)environment.findLaunchPlugin("runtimedistcleaner").orElseThrow(()-> { - LOGGER.error(CORE, "Dist Cleaner is missing, we need this to run"); - return new IncompatibleEnvironmentException("Missing DistCleaner, cannot run!"); - }); - LOGGER.debug(CORE, "Found Runtime Dist Cleaner"); - - var coreModProviders = ServiceLoaderUtils.streamWithErrorHandling(ServiceLoader.load(FMLLoader.class.getModule().getLayer(), ICoreModProvider.class), sce -> LOGGER.error(CORE, "Failed to load a coremod library, expect problems", sce)).toList(); - - if (coreModProviders.isEmpty()) { - LOGGER.error(CORE, "Found no coremod provider. Cannot run"); - throw new IncompatibleEnvironmentException("No coremod library found"); - } else if (coreModProviders.size() > 1) { - LOGGER.error(CORE, "Found multiple coremod providers : {}. Cannot run", coreModProviders.stream().map(p -> p.getClass().getName()).collect(Collectors.toList())); - throw new IncompatibleEnvironmentException("Multiple coremod libraries found"); - } - - coreModProvider = coreModProviders.get(0); - final Package coremodPackage = coreModProvider.getClass().getPackage(); - LOGGER.debug(CORE,"FML found CoreMod version : {}", coremodPackage.getImplementationVersion()); - - - LOGGER.debug(CORE, "Found ForgeSPI package implementation version {}", Environment.class.getPackage().getImplementationVersion()); - LOGGER.debug(CORE, "Found ForgeSPI package specification {}", Environment.class.getPackage().getSpecificationVersion()); - if (Integer.parseInt(Environment.class.getPackage().getSpecificationVersion()) < 2) { - LOGGER.error(CORE, "Found an out of date ForgeSPI implementation: {}, loading cannot continue", Environment.class.getPackage().getSpecificationVersion()); - throw new IncompatibleEnvironmentException("ForgeSPI is out of date, we cannot continue"); - } + checkPackage(ITransformationService.class, "4.0", "ModLauncher"); + accessTransformer = getPlugin(env, "accesstransformer", "1.0", "AccessTransformer"); + /*eventBus =*/ getPlugin(env, "eventbus", "1.0", "EventBus"); + runtimeDistCleaner = getPlugin(env, "runtimedistcleaner", "1.0", "RuntimeDistCleaner"); + coreModProvider = getSingleService(ICoreModProvider.class, "CoreMod"); + LOGGER.debug(CORE,"FML found CoreMod version : {}", JarVersionLookupHandler.getInfo(coreModProvider.getClass()).impl().version().orElse("MISSING")); + checkPackage(Environment.class, "2.0", "ForgeSPI"); try { - Class.forName("com.electronwill.nightconfig.core.Config", false, environment.getClass().getClassLoader()); - Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, environment.getClass().getClassLoader()); + Class.forName("com.electronwill.nightconfig.core.Config", false, env.getClass().getClassLoader()); + Class.forName("com.electronwill.nightconfig.toml.TomlFormat", false, env.getClass().getClassLoader()); } catch (ClassNotFoundException e) { LOGGER.error(CORE, "Failed to load NightConfig"); throw new IncompatibleEnvironmentException("Missing NightConfig"); } } - static void setupLaunchHandler(final IEnvironment environment, final Map arguments) - { + private static T getPlugin(IEnvironment env, String id, String version, String name) throws IncompatibleEnvironmentException { + @SuppressWarnings("unchecked") + var plugin = (T)env.findLaunchPlugin(id).orElseThrow(() -> { + LOGGER.error(CORE, "{} library is missing, we need this to run", name); + return new IncompatibleEnvironmentException("Missing " + name + ", cannot run"); + }); + checkPackage(plugin.getClass(), version, name); + return plugin; + } + + private static void checkPackage(Class cls, String version, String name) throws IncompatibleEnvironmentException { + var pkg = cls.getPackage(); + var info = JarVersionLookupHandler.getInfo(pkg); + LOGGER.debug(CORE, "Found {} version: {}", name, info.impl().version().orElse("MISSING")); + + if (!pkg.isCompatibleWith(version)) { + LOGGER.error(CORE, "Found incompatible {} specification: {}, version {} from {}", name, + info.spec().version().orElse("MISSING"), + info.impl().version().orElse("MISSING"), + info.impl().vendor().orElse("MISSING") + ); + throw new IncompatibleEnvironmentException("Incompatible " + name + " found " + info.spec().version().orElse("MISSING")); + } + } + + private static T getSingleService(Class clazz, String name) throws IncompatibleEnvironmentException { + var providers = new ArrayList(); + for (var itr = ServiceLoader.load(FMLLoader.class.getModule().getLayer(), clazz).iterator(); itr.hasNext(); ) { + try { + providers.add(itr.next()); + } catch (ServiceConfigurationError e) { + LOGGER.error(CORE, "Failed to load a " + name + " library, expect problems", e); + } + } + + if (providers.isEmpty()) { + LOGGER.error(CORE, "Found no {} provider. Cannot run", name); + throw new IncompatibleEnvironmentException("No " + name + " library found"); + } else if (providers.size() > 1) { + LOGGER.error(CORE, "Found multiple {} providers: {}. Cannot run", name, providers.stream().map(p -> p.getClass().getName()).toList()); + throw new IncompatibleEnvironmentException("Multiple " + name + " libraries found"); + } + + return providers.get(0); + } + + static void setupLaunchHandler(final IEnvironment environment, final Map arguments) { final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING"); arguments.put("launchTarget", launchTarget); final Optional launchHandler = environment.findLaunchHandler(launchTarget); @@ -136,7 +130,7 @@ public class FMLLoader throw new RuntimeException("Missing launch handler: " + launchTarget); } - // TODO: What the fuck is the point of using a service if you require a specific concrete class + // TODO: [FML][Loader] What the fuck is the point of using a service if you require a specific concrete class if (!(launchHandler.get() instanceof CommonLaunchHandler)) { LOGGER.error(CORE, "Incompatible Launch handler found - type {}, cannot continue", launchHandler.get().getClass().getName()); throw new RuntimeException("Incompatible launch handler found"); @@ -149,16 +143,12 @@ public class FMLLoader dist = commonLaunchHandler.getDist(); production = commonLaunchHandler.isProduction(); - versionInfo = new VersionInfo(arguments); - accessTransformer.getExtension().accept(Pair.of(naming, "srg")); - LOGGER.debug(CORE,"Received command line version data : {}", versionInfo); - runtimeDistCleaner.getExtension().accept(dist); } - public static List beginModScan(final Map arguments) - { + + public static List beginModScan(final Map arguments) { LOGGER.debug(SCAN,"Scanning for Mod Locators"); modDiscoverer = new ModDiscoverer(arguments); modValidator = modDiscoverer.discoverMods(); @@ -178,8 +168,7 @@ public class FMLLoader return coreModProvider; } - public static LanguageLoadingProvider getLanguageLoadingProvider() - { + public static LanguageLoadingProvider getLanguageLoadingProvider() { return languageLoadingProvider; } @@ -191,31 +180,26 @@ public class FMLLoader return commonLaunchHandler; } - public static void addAccessTransformer(Path atPath, ModFile modName) - { + public static void addAccessTransformer(Path atPath, ModFile modName) { LOGGER.debug(SCAN, "Adding Access Transformer in {}", modName.getFilePath()); accessTransformer.offerResource(atPath, modName.getFileName()); } - public static Dist getDist() - { + public static Dist getDist() { return dist; } - public static void beforeStart(ModuleLayer gameLayer) - { + public static void beforeStart(ModuleLayer gameLayer) { ImmediateWindowHandler.acceptGameLayer(gameLayer); ImmediateWindowHandler.updateProgress("Launching minecraft"); progressWindowTick.run(); } - public static LoadingModList getLoadingModList() - { + public static LoadingModList getLoadingModList() { return loadingModList; } - public static Path getGamePath() - { + public static Path getGamePath() { return gamePath; } @@ -232,7 +216,7 @@ public class FMLLoader } public static List> modLauncherModList() { - return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElseGet(Collections::emptyList); + return Launcher.INSTANCE.environment().getProperty(IEnvironment.Keys.MODLIST.get()).orElse(List.of()); } public static String launcherHandlerName() { diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java index d297620d8e..f3601c77e5 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java @@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import cpw.mods.modlauncher.api.*; -import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.OptionSpecBuilder; import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.forgespi.Environment; @@ -15,7 +14,6 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Locale; @@ -24,36 +22,18 @@ import java.util.Set; import java.util.function.BiFunction; import static net.minecraftforge.fml.loading.LogMarkers.CORE; -public class FMLServiceProvider implements ITransformationService -{ +public class FMLServiceProvider implements ITransformationService { private static final Logger LOGGER = LogUtils.getLogger(); - private ArgumentAcceptingOptionSpec modsOption; - private ArgumentAcceptingOptionSpec modListsOption; - private ArgumentAcceptingOptionSpec mavenRootsOption; - private ArgumentAcceptingOptionSpec forgeOption; - private ArgumentAcceptingOptionSpec mcOption; - private ArgumentAcceptingOptionSpec forgeGroupOption; - private ArgumentAcceptingOptionSpec mcpOption; - private ArgumentAcceptingOptionSpec mappingsOption; - private List modsArgumentList; - private List modListsArgumentList; - private List mavenRootsArgumentList; - private String targetForgeVersion; - private String targetMcVersion; - private String targetMcpVersion; - private String targetMcpMappings; - private String targetForgeGroup; private Map arguments; - public FMLServiceProvider() - { - final String markerselection = System.getProperty("forge.logging.markers", ""); - Arrays.stream(markerselection.split(",")).forEach(marker -> System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT")); + public FMLServiceProvider() { + var markers = System.getProperty("forge.logging.markers", "").split(","); + for (var marker : markers) + System.setProperty("forge.logging.marker." + marker.toLowerCase(Locale.ROOT), "ACCEPT"); } @Override - public String name() - { + public String name() { return "fml"; } @@ -66,14 +46,6 @@ public class FMLServiceProvider implements ITransformationService LOGGER.debug(CORE, "Preparing ModFile"); environment.computePropertyIfAbsent(Environment.Keys.MODFILEFACTORY.get(), k->ModFile::new); arguments = new HashMap<>(); - arguments.put("modLists", modListsArgumentList); - arguments.put("mods", modsArgumentList); - arguments.put("mavenRoots", mavenRootsArgumentList); - arguments.put("forgeVersion", targetForgeVersion); - arguments.put("forgeGroup", targetForgeGroup); - arguments.put("mcVersion", targetMcVersion); - arguments.put("mcpVersion", targetMcpVersion); - arguments.put("mcpMappings", targetMcpMappings); LOGGER.debug(CORE, "Preparing launch handler"); FMLLoader.setupLaunchHandler(environment, arguments); FMLEnvironment.setupInteropEnvironment(environment); @@ -92,46 +64,22 @@ public class FMLServiceProvider implements ITransformationService } @Override - public void onLoad(IEnvironment environment, Set otherServices) throws IncompatibleEnvironmentException - { -// LOGGER.debug("Injecting tracing printstreams for STDOUT/STDERR."); -// System.setOut(new TracingPrintStream(LogManager.getLogger("STDOUT"), System.out)); -// System.setErr(new TracingPrintStream(LogManager.getLogger("STDERR"), System.err)); + public void onLoad(IEnvironment environment, Set otherServices) throws IncompatibleEnvironmentException { FMLLoader.onInitialLoad(environment, otherServices); } @Override - public void arguments(BiFunction argumentBuilder) - { - forgeOption = argumentBuilder.apply("forgeVersion", "Forge Version number").withRequiredArg().ofType(String.class).required(); - forgeGroupOption = argumentBuilder.apply("forgeGroup", "Forge Group (for testing)").withRequiredArg().ofType(String.class).defaultsTo("net.minecraftforge"); - mcOption = argumentBuilder.apply("mcVersion", "Minecraft Version number").withRequiredArg().ofType(String.class).required(); - mcpOption = argumentBuilder.apply("mcpVersion", "MCP Version number").withRequiredArg().ofType(String.class).required(); - mappingsOption = argumentBuilder.apply("mcpMappings", "MCP Mappings Channel and Version").withRequiredArg().ofType(String.class); - modsOption = argumentBuilder.apply("mods", "List of mods to add").withRequiredArg().ofType(String.class).withValuesSeparatedBy(","); - modListsOption = argumentBuilder.apply("modLists", "JSON modlists").withRequiredArg().ofType(String.class).withValuesSeparatedBy(","); - mavenRootsOption = argumentBuilder.apply("mavenRoots", "Maven root directories").withRequiredArg().ofType(String.class).withValuesSeparatedBy(","); + public void arguments(BiFunction argumentBuilder) { } @Override - public void argumentValues(OptionResult option) - { - modsArgumentList = option.values(modsOption); - modListsArgumentList = option.values(modListsOption); - mavenRootsArgumentList = option.values(mavenRootsOption); - targetForgeVersion = option.value(forgeOption); - targetForgeGroup = option.value(forgeGroupOption); - targetMcVersion = option.value(mcOption); - targetMcpVersion = option.value(mcpOption); - targetMcpMappings = option.value(mappingsOption); + public void argumentValues(OptionResult option) { } @SuppressWarnings("rawtypes") @Override - public @NotNull List transformers() - { + public @NotNull List transformers() { LOGGER.debug(CORE, "Loading coremod transformers"); return new ArrayList<>(FMLLoader.getCoreModProvider().getCoreModTransformers()); } - } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java index 8ab78d5c49..267b27d004 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java @@ -32,15 +32,16 @@ public class ImmediateWindowHandler { } else { final var providername = FMLConfig.getConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_PROVIDER); LOGGER.info("Loading ImmediateWindowProvider {}", providername); - final var maybeProvider = ServiceLoader.load(ImmediateWindowProvider.class) - .stream() - .map(ServiceLoader.Provider::get) - .filter(p -> Objects.equals(p.name(), providername)) - .findFirst(); - provider = maybeProvider.or(() -> { + for (var service : ServiceLoader.load(ImmediateWindowProvider.class)) { + if (providername.equals(service.name())) { + provider = service; + break; + } + } + if (provider == null) { LOGGER.info("Failed to find ImmediateWindowProvider {}, disabling", providername); - return Optional.of(new DummyProvider()); - }).orElseThrow(); + provider = new DummyProvider(); + } } // Only update config if the provider isn't the dummy provider if (!Objects.equals(provider.name(), "dummyprovider")) diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/JarVersionLookupHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/JarVersionLookupHandler.java index b3f0c8e5eb..c0963c9f02 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/JarVersionLookupHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/JarVersionLookupHandler.java @@ -11,32 +11,72 @@ import java.util.Optional; * Finds Version data from a package, with possible default values */ public class JarVersionLookupHandler { + public record Version(Optional title, Optional vendor, Optional version) { + @Override + public String toString() { + return "[" + + "title=" + title.orElse(null) + + ", vendor=" + vendor.orElse(null) + + ", version=" + version.orElse(null) + + "]"; + } + } + public record Info(Version spec, Version impl) {} + @SuppressWarnings("deprecation") + public static Info getInfo(String pkgName) { + return getInfo(Package.getPackage(pkgName)); + } + + public static Info getInfo(Class clazz) { + return getInfo(clazz.getPackage()); + } + + public static Info getInfo(Package pkg) { + return new Info( + new Version( + Optional.ofNullable(pkg.getSpecificationTitle()), + Optional.ofNullable(pkg.getSpecificationVendor()), + Optional.ofNullable(pkg.getSpecificationVersion()) + ), + new Version( + Optional.ofNullable(pkg.getImplementationTitle()), + Optional.ofNullable(pkg.getImplementationVendor()), + Optional.ofNullable(pkg.getImplementationVersion()) + ) + ); + } + + + @Deprecated(forRemoval = true, since = "1.20.2") public static Optional getImplementationVersion(final String pkgName) { // Note that with Java 9, you'll probably want the module's version data, hence pulling this out final String pkgVersion = Package.getPackage(pkgName).getImplementationVersion(); return Optional.ofNullable(pkgVersion); } + @Deprecated(forRemoval = true, since = "1.20.2") public static Optional getSpecificationVersion(final String pkgName) { // Note that with Java 9, you'll probably want the module's version data, hence pulling this out final String pkgVersion = Package.getPackage(pkgName).getSpecificationVersion(); return Optional.ofNullable(pkgVersion); } + @Deprecated(forRemoval = true, since = "1.20.2") public static Optional getImplementationVersion(final Class clazz) { // With java 9 we'll use the module's version if it exists in preference. final String pkgVersion = clazz.getPackage().getImplementationVersion(); return Optional.ofNullable(pkgVersion); } + @Deprecated(forRemoval = true, since = "1.20.2") public static Optional getImplementationTitle(final Class clazz) { // With java 9 we'll use the module's version if it exists in preference. final String pkgVersion = clazz.getPackage().getImplementationTitle(); return Optional.ofNullable(pkgVersion); } - + @Deprecated(forRemoval = true, since = "1.20.2") public static Optional getSpecificationVersion(final Class clazz) { // With java 9 we'll use the module's version if it exists in preference. final String pkgVersion = clazz.getPackage().getSpecificationVersion(); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java index edaf98a2bd..6ec18db624 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LanguageLoadingProvider.java @@ -7,26 +7,19 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import cpw.mods.modlauncher.Launcher; -import cpw.mods.modlauncher.api.IModuleLayerManager; -import cpw.mods.modlauncher.util.ServiceLoaderUtils; +import cpw.mods.modlauncher.api.IModuleLayerManager.Layer; import net.minecraftforge.forgespi.language.IModLanguageProvider; -import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator; import net.minecraftforge.fml.loading.moddiscovery.ModFile; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; import org.slf4j.Logger; -import java.net.URISyntaxException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.util.ServiceConfigurationError; import java.util.ServiceLoader; import java.util.function.Consumer; import java.util.function.Function; @@ -35,115 +28,97 @@ import java.util.stream.Stream; import static net.minecraftforge.fml.loading.LogMarkers.CORE; import static net.minecraftforge.fml.loading.LogMarkers.LOADING; -public class LanguageLoadingProvider -{ +public class LanguageLoadingProvider { + public void forEach(Consumer consumer) { + providers.forEach(consumer); + } + + public Stream applyForEach(Function function) { + return providers.stream().map(function); + } + + public void reload() { + loadLanguageProviders(); + } + + /** This doesn't actually do anything with the argument, so just call reload(). Not sure when cpw broke that. */ + @Deprecated(forRemoval = true, since = "1.20.2") + public void addAdditionalLanguages(List modFiles) { + reload(); + } + + /*==========================================================================* + * INTERNAL SHIT * + *==========================================================================*/ private static final Logger LOGGER = LogUtils.getLogger(); - private final List languageProviders = new ArrayList<>(); private final ServiceLoader serviceLoader; - private final Map languageProviderMap = new HashMap<>(); - private List languagePaths = new ArrayList<>(); + private final List providers = new ArrayList<>(); + private final Map providersByName = new HashMap<>(); + private static final DefaultArtifactVersion IN_DEV = new DefaultArtifactVersion("0.0-dev"); - public void forEach(final Consumer consumer) - { - languageProviders.forEach(consumer); - } - - public Stream applyForEach(final Function function) { - return languageProviders.stream().map(function); - } - - private static class ModLanguageWrapper { - private final IModLanguageProvider modLanguageProvider; - - private final ArtifactVersion version; - public ModLanguageWrapper(IModLanguageProvider modLanguageProvider, ArtifactVersion version) - { - this.modLanguageProvider = modLanguageProvider; - this.version = version; - } - public ArtifactVersion getVersion() - { - return version; - } - - public IModLanguageProvider getModLanguageProvider() - { - return modLanguageProvider; - } - - - } + private record Wrapper(ArtifactVersion version, IModLanguageProvider service) {} LanguageLoadingProvider() { - var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm->lm.getLayer(IModuleLayerManager.Layer.PLUGIN)).orElseThrow(); + var sl = Launcher.INSTANCE.environment().findModuleLayerManager().flatMap(lm -> lm.getLayer(Layer.PLUGIN)).orElseThrow(); serviceLoader = ServiceLoader.load(sl, IModLanguageProvider.class); loadLanguageProviders(); } + private void loadLanguageProviders() { - LOGGER.debug(CORE, "Found {} language providers", ServiceLoaderUtils.streamServiceLoader(()->serviceLoader, sce->LOGGER.error("Problem with language loaders")).count()); - serviceLoader.forEach(languageProviders::add); - ImmediateWindowHandler.updateProgress("Loading language providers"); - languageProviders.forEach(lp -> { - final Path lpPath; - try { - lpPath = Paths.get(lp.getClass().getProtectionDomain().getCodeSource().getLocation().toURI()); - } catch (URISyntaxException e) { - throw new RuntimeException("Huh?", e); - } - Optional implementationVersion = JarVersionLookupHandler.getImplementationVersion(lp.getClass()); - String impl = implementationVersion.orElse(Files.isDirectory(lpPath) ? FMLLoader.versionInfo().forgeVersion().split("\\.")[0] : null); - if (impl == null) { - LOGGER.error(CORE, "Found unversioned language provider {}", lp.name()); - throw new RuntimeException("Failed to find implementation version for language provider "+ lp.name()); - } - LOGGER.debug(CORE, "Found language provider {}, version {}", lp.name(), impl); - ImmediateWindowHandler.updateProgress("Loaded language provider "+lp.name()+ " " + impl); - languageProviderMap.put(lp.name(), new ModLanguageWrapper(lp, new DefaultArtifactVersion(impl))); - }); - } + providers.clear(); + providersByName.clear(); - void addForgeLanguage(final Path forgePath) { - if (!languageProviderMap.containsKey("javafml")) { - LOGGER.debug(CORE,"Adding forge as a language from {}", forgePath.toString()); - addLanguagePaths(Stream.of(forgePath)); - serviceLoader.reload(); - loadLanguageProviders(); - } else { - LOGGER.debug(CORE, "Skipping adding forge jar - javafml is already present"); - } - } - - private void addLanguagePaths(final Stream langPaths) { - languageProviders.clear(); - languageProviderMap.clear(); -// langPaths.peek(languagePaths::add).map(Path::toFile).map(File::toURI).map(rethrowFunction(URI::toURL)).forEach(languageClassLoader::addURL); - } - - public void addAdditionalLanguages(List modFiles) - { - if (modFiles==null) return; - Stream langPaths = modFiles.stream().map(ModFile::getFilePath); - addLanguagePaths(langPaths); serviceLoader.reload(); - loadLanguageProviders(); - } - - Stream getLibraries() { - return languagePaths.stream(); - } - - public IModLanguageProvider findLanguage(ModFile mf, String modLoader, VersionRange modLoaderVersion) { - final String languageFileName = mf.getProvider() instanceof ExplodedDirectoryLocator ? "in-development" : mf.getFileName(); - final ModLanguageWrapper mlw = languageProviderMap.get(modLoader); - if (mlw == null) { - LOGGER.error(LOADING,"Missing language {} version {} wanted by {}", modLoader, modLoaderVersion, languageFileName); - throw new EarlyLoadingException("Missing language "+modLoader, null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, "null"))); - } - if (!VersionSupportMatrix.testVersionSupportMatrix(modLoaderVersion, modLoader, "languageloader", (llid, range) -> range.containsVersion(mlw.getVersion()))) { - LOGGER.error(LOADING,"Missing language {} version {} wanted by {}, found {}", modLoader, modLoaderVersion, languageFileName, mlw.getVersion()); - throw new EarlyLoadingException("Missing language "+ modLoader + " matching range "+modLoaderVersion + " found "+mlw.getVersion(), null, Collections.singletonList(new EarlyLoadingException.ExceptionData("fml.language.missingversion", modLoader, modLoaderVersion, languageFileName, mlw.getVersion()))); + for (var itr = serviceLoader.iterator(); itr.hasNext(); ) { + try { + var srvc = itr.next(); + providers.add(srvc); + } catch (ServiceConfigurationError sce) { + LOGGER.error(CORE, "Failed to load IModLauguageProvider Service: " + sce.getMessage()); + } } - return mlw.getModLanguageProvider(); + LOGGER.debug(CORE, "Found {} language providers", providers.size()); + + ImmediateWindowHandler.updateProgress("Loading language providers"); + for (var provider : providers) { + var info = JarVersionLookupHandler.getInfo(provider.getClass()); + + if (info.impl().version().isEmpty() && FMLEnvironment.production) { + LOGGER.error(CORE, "Found unversioned language provider {}: {}", provider.name(), provider.getClass().getName()); + throw new RuntimeException("Failed to find implementation version for language provider " + provider.name() + " of type " + provider.getClass().getName()); + } + + var version = info.impl().version().map(DefaultArtifactVersion::new).orElse(IN_DEV); + + LOGGER.debug(CORE, "Found language provider {}, version {}", provider.name(), version); + ImmediateWindowHandler.updateProgress("Loaded language provider " + provider.name() + " " + version); + providersByName.put(provider.name(), new Wrapper(version, provider)); + } + } + + public IModLanguageProvider findLanguage(ModFile mod, String language, VersionRange versionRange) { + var consumer = mod.getFileName(); + var wrapper = providersByName.get(language); + + if (wrapper == null) { + LOGGER.error(LOADING, "Missing language {} version {} wanted by {}", language, versionRange, consumer); + var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, "null"); + throw new EarlyLoadingException("Missing language " + language, null, List.of(data)); + } + + var version = wrapper.version(); + if (version == IN_DEV) { + LOGGER.debug(LOADING, "Language Provider {} version is unknown, but {} was requested by {}. Proceeding as this is development environement", language, versionRange, consumer); + return wrapper.service(); + } + + if (!versionRange.containsVersion(version)) { + LOGGER.error(LOADING, "Missing language {} version {} wanted by {}, found {}", language, versionRange, consumer, version); + var data = new EarlyLoadingException.ExceptionData("fml.language.missingversion", language, versionRange, consumer, version); + throw new EarlyLoadingException("Missing language " + language + " matching range " + versionRange + " found " + version, null, List.of(data)); + } + + return wrapper.service(); } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LauncherVersion.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LauncherVersion.java index 02355687e1..aefaa6ce81 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LauncherVersion.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LauncherVersion.java @@ -8,21 +8,19 @@ package net.minecraftforge.fml.loading; import com.mojang.logging.LogUtils; import org.slf4j.Logger; -import static net.minecraftforge.fml.loading.LogMarkers.CORE; - public class LauncherVersion { private static final Logger LOGGER = LogUtils.getLogger(); private static final String launcherVersion; static { - String vers = JarVersionLookupHandler.getImplementationVersion(LauncherVersion.class).orElse(System.getenv("LAUNCHER_VERSION")); - if (vers == null) throw new RuntimeException("Missing FMLLauncher version, cannot continue"); - launcherVersion = vers; - LOGGER.debug(CORE, "Found FMLLauncher version {}", launcherVersion); + var info = JarVersionLookupHandler.getInfo(LauncherVersion.class); + if (info.impl().version().isEmpty()) + throw new IllegalStateException("Failed to find version for package " + LauncherVersion.class.getPackageName() + " This is an invalid environment"); + launcherVersion = info.impl().version().get(); + LOGGER.debug(LogMarkers.CORE, "Found FMLLauncher version {}", launcherVersion); } - public static String getVersion() - { + public static String getVersion() { return launcherVersion; } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java index c8cdcea41a..e17082b206 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/LibraryFinder.java @@ -5,45 +5,20 @@ package net.minecraftforge.fml.loading; -import com.mojang.logging.LogUtils; -import org.slf4j.Logger; - import java.nio.file.Files; import java.nio.file.Path; public class LibraryFinder { - private static final Logger LOGGER = LogUtils.getLogger(); private static Path libsPath; static Path findLibsPath() { if (libsPath == null) { - libsPath = Path.of(System.getProperty("libraryDirectory","crazysnowmannonsense/cheezwhizz")); - if (!Files.isDirectory(libsPath)) { - throw new IllegalStateException("Missing libraryDirectory system property, cannot continue"); - } + libsPath = Path.of(System.getProperty("libraryDirectory", "libraries")); + if (!Files.isDirectory(libsPath)) + throw new IllegalStateException("Library directory: `" + libsPath + "` does not exist. Set it via the `libraryDirectory` system property."); } return libsPath; } - static Path getForgeLibraryPath(final String mcVersion, final String forgeVersion, final String forgeGroup) { - Path forgePath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", "universal", mcVersion+"-"+forgeVersion)); - LOGGER.debug(LogMarkers.CORE, "Found forge path {} is {}", forgePath, pathStatus(forgePath)); - return forgePath; - } - - static String pathStatus(final Path path) { - return Files.exists(path) ? "present" : "missing"; - } - - static Path[] getMCPaths(final String mcVersion, final String mcpVersion, final String forgeVersion, final String forgeGroup, final String type) { - Path srgMcPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "srg", mcVersion+"-"+mcpVersion)); - Path mcExtrasPath = findLibsPath().resolve(MavenCoordinateResolver.get("net.minecraft", type, "", "extra", mcVersion+"-"+mcpVersion)); - Path patchedBinariesPath = findLibsPath().resolve(MavenCoordinateResolver.get(forgeGroup, "forge", "", type, mcVersion+"-"+forgeVersion)); - LOGGER.debug(LogMarkers.CORE,"SRG MC at {} is {}", srgMcPath.toString(), pathStatus(srgMcPath)); - LOGGER.debug(LogMarkers.CORE,"MC Extras at {} is {}", mcExtrasPath.toString(), pathStatus(mcExtrasPath)); - LOGGER.debug(LogMarkers.CORE,"Forge patches at {} is {}", patchedBinariesPath.toString(), pathStatus(patchedBinariesPath)); - return new Path[] { patchedBinariesPath, mcExtrasPath, srgMcPath }; - } - public static Path findPathForMaven(final String group, final String artifact, final String extension, final String classifier, final String version) { return findLibsPath().resolve(MavenCoordinateResolver.get(group, artifact, extension, classifier, version)); } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java index bd40d36555..cc41dd01b1 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ModSorter.java @@ -8,8 +8,6 @@ package net.minecraftforge.fml.loading; import com.google.common.graph.GraphBuilder; import com.google.common.graph.MutableGraph; import com.mojang.logging.LogUtils; -import cpw.mods.jarhandling.SecureJar; -import net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator; import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData; import net.minecraftforge.fml.loading.moddiscovery.ModFile; @@ -21,10 +19,14 @@ import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.slf4j.Logger; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import java.util.jar.Manifest; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -150,27 +152,13 @@ public class ModSorter )); } - private void detectSystemMods(final Map> modFilesByFirstId) - { + private void detectSystemMods(final Map> modFilesByFirstId) { // Capture system mods (ex. MC, Forge) here, so we can keep them for later - final Set systemMods = new HashSet<>(); - // The minecraft mod is always a system mod - systemMods.add("minecraft"); - // Find mod file from MinecraftLocator to define the system mods - modFiles.stream() - .filter(modFile -> modFile.getProvider().getClass() == MinecraftLocator.class) - .map(ModFile::getSecureJar) - .map(SecureJar::moduleDataProvider) - .map(SecureJar.ModuleDataProvider::getManifest) - .map(Manifest::getMainAttributes) - .map(mf -> mf.getValue("FML-System-Mods")) - .filter(Objects::nonNull) - .findFirst() - .ifPresent(value -> systemMods.addAll(Arrays.asList(value.split(",")))); + var systemMods = List.of("minecraft", "forge"); LOGGER.debug("Configured system mods: {}", systemMods); this.systemMods = new ArrayList<>(); - for (String systemMod : systemMods) { + for (var systemMod : systemMods) { var container = modFilesByFirstId.get(systemMod); if (container != null && !container.isEmpty()) { LOGGER.debug("Found system mod: {}", systemMod); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/StringSubstitutor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/StringSubstitutor.java index a71d4e8b4c..484d5392b2 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/StringSubstitutor.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/StringSubstitutor.java @@ -5,42 +5,37 @@ package net.minecraftforge.fml.loading; -import com.google.common.collect.ImmutableMap; import net.minecraftforge.fml.loading.moddiscovery.ModFile; -import org.apache.commons.lang3.text.StrLookup; -import org.apache.commons.lang3.text.StrSubstitutor; import java.util.Map; -@SuppressWarnings("deprecation") -public class StringSubstitutor -{ - private static final Map globals = ImmutableMap.of( - "mcVersion", FMLLoader.versionInfo().mcVersion(), - "forgeVersion", FMLLoader.versionInfo().forgeVersion() - ); +import org.apache.commons.lang3.text.StrLookup; +import org.apache.commons.lang3.text.StrSubstitutor; +@SuppressWarnings("deprecation") +public class StringSubstitutor { public static String replace(final String in, final ModFile file) { return new StrSubstitutor(getStringLookup(file)).replace(in); } private static StrLookup getStringLookup(final ModFile file) { - return new StrLookup() - { + var globals = Map.of( + "mcVersion", FMLLoader.versionInfo().mcVersion(), + "forgeVersion", FMLLoader.versionInfo().forgeVersion() + ); + return new StrLookup() { @Override - public String lookup(String key) - { - final String[] parts = key.split("\\."); - if (parts.length == 1) return key; - final String pfx = parts[0]; + public String lookup(String key) { + var parts = key.split("\\."); + if (parts.length == 1) + return key; + var pfx = parts[0]; + if ("global".equals(pfx)) - { return globals.get(parts[1]); - } else if ("file".equals(pfx) && file != null) - { return String.valueOf(file.getSubstitutionMap().get().get(parts[1])); - } + return key; } }; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java index bc11e2ff38..bbd311bbb1 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionInfo.java @@ -5,18 +5,45 @@ package net.minecraftforge.fml.loading; -import java.util.Map; +import java.io.IOException; +import java.io.InputStreamReader; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonSyntaxException; + +/** TODO: [FML][Loader] Remove VersionInfo - we shouldn't need to base any decisions on forge or mc version info at the loader level. So once I get a proper replacement i'm gunna kill this. */ public record VersionInfo(String forgeVersion, String mcVersion, String mcpVersion, String forgeGroup) { - VersionInfo(Map arguments) { - this((String) arguments.get("forgeVersion"), (String) arguments.get("mcVersion"), (String) arguments.get("mcpVersion"), (String) arguments.get("forgeGroup")); - } - public String mcAndForgeVersion() { - return mcVersion+"-"+forgeVersion; + return mcVersion + "-" + forgeVersion; } public String mcAndMCPVersion() { return mcVersion + "-" + mcpVersion; } + + /*==========================================================================* + * INTERNAL SHIT * + *==========================================================================*/ + private static Gson GSON = new GsonBuilder().create(); + private static T readJson(String path, Class type) { + try (var is = VersionInfo.class.getResourceAsStream(path)) { + if (is == null) + return null; + + try (var reader = new InputStreamReader(is)) { + return GSON.fromJson(reader, type); + } + } catch (IOException | JsonSyntaxException e) { + throw new IllegalStateException("Failed to parse version info from " + path , e); + } + } + + static VersionInfo detect() { + var forge = readJson("/forge_version.json", JSON.class); + if (forge == null) + throw new IllegalStateException("Failed to find /forge_version.json This is a critical issue"); + return new VersionInfo(forge.forge(), forge.mc(), forge.mcp(), "net.minecraftforge"); + } + private record JSON(String forge, String mcp, String mc) {} } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java index ad38a9b9c8..ca833822d7 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/VersionSupportMatrix.java @@ -18,7 +18,7 @@ import java.util.function.BiPredicate; public class VersionSupportMatrix { private static final HashMap> overrideVersions = new HashMap<>(); static { - final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion()); + final ArtifactVersion version = new DefaultArtifactVersion(FMLLoader.versionInfo().mcVersion()); if (MavenVersionAdapter.createFromVersionSpec("[1.19.2]").containsVersion(version)) { // 1.19.2 is Compatible with 1.19.1 add("languageloader.javafml", "42"); @@ -31,7 +31,7 @@ public class VersionSupportMatrix { } public static boolean testVersionSupportMatrix(VersionRange declaredRange, String lookupId, String type, BiPredicate standardLookup) { if (standardLookup.test(lookupId, declaredRange)) return true; - List custom = overrideVersions.get(type +"." +lookupId); + List custom = overrideVersions.get(type + "." + lookupId); return custom == null ? false : custom.stream().anyMatch(declaredRange::containsVersion); } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileDependencyLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileDependencyLocator.java deleted file mode 100644 index d715e833e6..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileDependencyLocator.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import com.mojang.logging.LogUtils; -import net.minecraftforge.forgespi.locating.IDependencyLocator; -import net.minecraftforge.forgespi.locating.IModFile; -import net.minecraftforge.forgespi.locating.ModFileLoadingException; -import org.slf4j.Logger; - -import java.io.FileNotFoundException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Optional; - -public abstract class AbstractJarFileDependencyLocator extends AbstractJarFileModProvider implements IDependencyLocator -{ - private static final Logger LOGGER = LogUtils.getLogger(); - - protected Optional loadResourceFromModFile(final IModFile modFile, final Path path) { - try { - return Optional.of(Files.newInputStream(modFile.findResource(path.toString()))); - } - catch (final FileNotFoundException e) { - LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName()); - return Optional.empty(); - } - catch (final Exception e) { - LOGGER.error("Failed to load resource {} from mod {}, cause {}", path, modFile.getFileName(), e); - return Optional.empty(); - } - } - - protected Optional loadModFileFrom(final IModFile file, final Path path) { - try { - final Path pathInModFile = file.findResource(path.toString()); - return Optional.of(createMod(pathInModFile).file()); - } - catch (Exception e) { - LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName()); - throw new ModFileLoadingException("Failed to load mod file "+file.getFileName()); - } - } - - protected String identifyMod(final IModFile modFile) { - return modFile.getFileName(); - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModLocator.java deleted file mode 100644 index 628d562347..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModLocator.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import net.minecraftforge.forgespi.locating.IModLocator; - -import java.nio.file.Path; -import java.util.List; -import java.util.stream.Stream; - -public abstract class AbstractJarFileModLocator extends AbstractJarFileModProvider implements IModLocator -{ - @Override - public List scanMods() - { - return scanCandidates().map(this::createMod).toList(); - } - - public abstract Stream scanCandidates(); -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModProvider.java deleted file mode 100644 index 3a337fd5ff..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractJarFileModProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import com.mojang.logging.LogUtils; -import cpw.mods.jarhandling.SecureJar; -import net.minecraftforge.fml.loading.LogMarkers; -import net.minecraftforge.forgespi.locating.IModFile; -import org.slf4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.stream.Stream; - -public abstract class AbstractJarFileModProvider extends AbstractModProvider -{ - private static final Logger LOGGER = LogUtils.getLogger(); - - @Override - public void scanFile(final IModFile file, final Consumer pathConsumer) { - LOGGER.debug(LogMarkers.SCAN,"Scan started: {}", file); - final Function status = p->file.getSecureJar().verifyPath(p); - try (Stream files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) { - file.setSecurityStatus(files.peek(pathConsumer).map(status).reduce((s1, s2)-> SecureJar.Status.values()[Math.min(s1.ordinal(), s2.ordinal())]).orElse(SecureJar.Status.INVALID)); - } catch (IOException e) { - e.printStackTrace(); - } - LOGGER.debug(LogMarkers.SCAN,"Scan finished: {}", file); - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java index c3c855b1e2..8669dbd1fa 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/AbstractModProvider.java @@ -16,26 +16,28 @@ import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModLocator; import net.minecraftforge.forgespi.locating.IModProvider; import net.minecraftforge.forgespi.locating.ModFileLoadingException; + +import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; +import java.io.IOException; +import java.nio.file.Files; import java.nio.file.Path; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; -import java.util.function.Function; -import java.util.jar.Manifest; +import java.util.function.Consumer; +import java.util.jar.JarFile; +@ApiStatus.Internal public abstract class AbstractModProvider implements IModProvider { private static final Logger LOGGER = LogUtils.getLogger(); protected static final String MODS_TOML = "META-INF/mods.toml"; - protected static final String MANIFEST = "META-INF/MANIFEST.MF"; - protected IModLocator.ModFileOrException createMod(Path... path) { + protected IModLocator.ModFileOrException createMod(Path path) { var mjm = new ModJarMetadata(); var sj = SecureJar.from( - Manifest::new, jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path), path ); @@ -49,18 +51,18 @@ public abstract class AbstractModProvider implements IModProvider { LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path); mod = new ModFile(sj, this, ModFileParser::modsTomlParser); } else if (type != null) { - LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MANIFEST, type, path); + LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", JarFile.MANIFEST_NAME, type, path); mod = new ModFile(sj, this, this::manifestParser, type); } else - return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + Arrays.toString(path))); + return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path)); mjm.setModFile(mod); return new IModLocator.ModFileOrException(mod, null); } protected IModFileInfo manifestParser(final IModFile mod) { - Function> cfg = name -> Optional.ofNullable(mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes().getValue(name)); - var license = cfg.apply("LICENSE").orElse(""); + var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes(); + var license = mf.getValue("LICENSE"); var dummy = new IConfigurable() { @Override public Optional getConfigElement(String... key) { @@ -72,7 +74,7 @@ public abstract class AbstractModProvider implements IModProvider { } }; - return new DefaultModFileInfo(mod, license, dummy); + return new DefaultModFileInfo(mod, license == null ? "" : license, dummy); } @Override @@ -80,10 +82,50 @@ public abstract class AbstractModProvider implements IModProvider { return true; } + @Override + public void initArguments(final Map arguments) { + } + protected String getDefaultJarModType() { return null; } + @Override + public void scanFile(IModFile file, Consumer pathConsumer) { + LOGGER.debug(LogMarkers.SCAN, "Scan started: {}", file); + var jar = file.getSecureJar(); + var root = jar.getRootPath(); + Consumer consumer = pathConsumer; + + //TODO: [SecureJar] Actually redesign this to have a proper validation. + var holder = new Holder(); + holder.value = SecureJar.Status.NONE; + if (jar.hasSecurityData()) { + consumer = path -> { + pathConsumer.accept(path); + var status = jar.verifyPath(path); + if (status.ordinal() < holder.value.ordinal()) + holder.value = status; + }; + } + + try { + Files.walk(root) + .filter(p -> p.toString().endsWith(".class")) + .forEach(consumer); + + file.setSecurityStatus(holder.value); + } catch(IOException e) { + e.printStackTrace(); + } + + LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", file); + } + + private static class Holder { + T value; + } + private record DefaultModFileInfo(IModFile mod, String license, IConfigurable configurable) implements IModFileInfo, IConfigurable { @Override public Optional getConfigElement(final String... strings) { return Optional.empty(); } @Override public List getConfigList(final String... strings) { return null; } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java index 347d8d639d..1d73f4c72e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ClasspathLocator.java @@ -5,68 +5,109 @@ package net.minecraftforge.fml.loading.moddiscovery; -import net.minecraftforge.fml.loading.ClasspathLocatorUtils; import com.mojang.logging.LogUtils; + import net.minecraftforge.fml.loading.LogMarkers; +import net.minecraftforge.forgespi.locating.IModLocator; + +import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; -import java.io.File; import java.io.IOException; +import java.net.URI; import java.net.URL; -import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Enumeration; +import java.util.Collections; +import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.stream.Stream; +import java.util.jar.Attributes; +import java.util.jar.JarFile; +import java.util.jar.Manifest; -public class ClasspathLocator extends AbstractJarFileModLocator { +@ApiStatus.Internal +public class ClasspathLocator extends AbstractModProvider implements IModLocator { private static final Logger LOGGER = LogUtils.getLogger(); - private final List legacyClasspath = Arrays.stream(System.getProperty("legacyClassPath", "").split(File.pathSeparator)).map(Path::of).toList(); - private boolean enabled = false; + private static final Attributes.Name MOD_TYPE = new Attributes.Name("FMLModType"); @Override public String name() { - return "userdev classpath"; + return "classpath"; } @Override - public Stream scanCandidates() { - if (!enabled) - return Stream.of(); + public List scanMods() { + //var cl = ClassLoader.getSystemClassLoader(); + var cl = getClass().getClassLoader(); - try { - var claimed = new ArrayList<>(legacyClasspath); - var paths = Stream.builder(); + // Find 'minecraft' during dev time this is also Forge. So skip it. + // Can return null for dedicated server as Minecraft isn't on the classpath + // On the client it doesn't matter as it's the vanilla jar so wouldnt have mods.toml in it. + var minecraft = getPathFromResource(cl, "net/minecraft/obfuscate/DontObfuscate.class"); - findPaths(claimed, MODS_TOML).forEach(paths::add); - findPaths(claimed, MANIFEST).forEach(paths::add); - - return paths.build(); - } catch (IOException e) { - LOGGER.error(LogMarkers.SCAN, "Error trying to find resources", e); - throw new RuntimeException(e); + var claimed = new HashSet(); + var tomls = getUrls(cl, MODS_TOML); + for (var url : tomls) { + var path = getPath(url, MODS_TOML); + if (!path.equals(minecraft)) + claimed.add(path); } - } - private List findPaths(List claimed, String resource) throws IOException { - var ret = new ArrayList(); - final Enumeration resources = ClassLoader.getSystemClassLoader().getResources(resource); - while (resources.hasMoreElements()) { - URL url = resources.nextElement(); - Path path = ClasspathLocatorUtils.findJarPathFor(resource, resource, url); - if (claimed.stream().anyMatch(path::equals) || !Files.exists(path) || Files.isDirectory(path)) + var manifests = getUrls(cl, JarFile.MANIFEST_NAME); + for (var url : manifests) { + var path = getPath(url, JarFile.MANIFEST_NAME); + if (claimed.contains(path)) continue; - ret.add(path); + + try (var is = url.openStream()) { + var mf = new Manifest(is); + var type = mf.getMainAttributes().getValue(MOD_TYPE); + if (type != null) + claimed.add(path); + } catch (IOException e) { + LOGGER.warn(LogMarkers.SCAN, "Error reading manifest from: " + url, e); + } } + + var ret = new ArrayList(); + for (var path : claimed) + ret.add(createMod(path)); return ret; } - @Override - public void initArguments(Map arguments) { - var launchTarget = (String) arguments.get("launchTarget"); - enabled = launchTarget != null && launchTarget.contains("dev"); + private List getUrls(ClassLoader cl, String resource) { + try { + var lst = Collections.list(cl.getResources(resource)); + if (LOGGER.isDebugEnabled(LogMarkers.SCAN)) { + Collections.sort(lst, (a, b) -> a.toString().compareTo(b.toString())); + LOGGER.debug(LogMarkers.SCAN, "Scanning Classloader: {} for {}", cl, resource); + for (var url : lst) + LOGGER.debug(LogMarkers.SCAN, "\t{}", url); + } + return lst; + } catch (IOException e) { + LOGGER.warn(LogMarkers.SCAN, "Error finding resources for: " + resource, e); + return List.of(); + } + } + + private static Path getPath(URL url, String resource) { + var str = url.toString(); + int len = resource.length(); + if ("jar".equalsIgnoreCase(url.getProtocol())) { + str = url.getFile(); + len += 2; + } + str = str.substring(0, str.length() - len); + var path = Paths.get(URI.create(str)); + return path; + } + + private static Path getPathFromResource(ClassLoader cl, String resource) { + var url = cl.getResource(resource); + if (url == null) + return null; + return getPath(url, resource); } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/CoreModFile.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/CoreModFile.java index 80522e0b8d..21c051c52c 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/CoreModFile.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/CoreModFile.java @@ -12,6 +12,9 @@ import java.io.Reader; import java.nio.file.Files; import java.nio.file.Path; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal public class CoreModFile implements ICoreModFile { private final Path internalPath; private final ModFile file; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ExplodedDirectoryLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ExplodedDirectoryLocator.java deleted file mode 100644 index 3ea07f4a37..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ExplodedDirectoryLocator.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import com.mojang.logging.LogUtils; -import net.minecraftforge.fml.loading.LogMarkers; -import net.minecraftforge.forgespi.locating.IModFile; -import net.minecraftforge.forgespi.locating.IModLocator; -import org.slf4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Consumer; -import java.util.stream.Stream; - -public class ExplodedDirectoryLocator implements IModLocator { - private static final Logger LOGGER = LogUtils.getLogger(); - - public record ExplodedMod(String modid, List paths) {} - - private final List explodedMods = new ArrayList<>(); - private final Map mods = new HashMap<>(); - - @Override - public List scanMods() { - explodedMods.forEach(explodedMod -> - ModJarMetadata.buildFile(this, - jar->jar.moduleDataProvider().findFile("/META-INF/mods.toml").isPresent(), - null, - explodedMod.paths().toArray(Path[]::new)) - .ifPresentOrElse(f->mods.put(explodedMod, f), () -> LOGGER.warn(LogMarkers.LOADING, "Failed to find exploded resource mods.toml in directory {}", explodedMod.paths().get(0).toString()))); - return mods.values().stream().map(mf->new IModLocator.ModFileOrException(mf, null)).toList(); - } - - @Override - public String name() { - return "exploded directory"; - } - - @Override - public void scanFile(final IModFile file, final Consumer pathConsumer) { - LOGGER.debug(LogMarkers.SCAN,"Scanning exploded directory {}", file.getFilePath().toString()); - try (Stream files = Files.find(file.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) { - files.forEach(pathConsumer); - } catch (IOException e) { - e.printStackTrace(); - } - LOGGER.debug(LogMarkers.SCAN,"Exploded directory scan complete {}", file.getFilePath().toString()); - } - - @Override - public String toString() - { - return "{ExplodedDir locator}"; - } - - @SuppressWarnings("unchecked") - @Override - public void initArguments(final Map arguments) { - final var explodedTargets = ((Map>) arguments).get("explodedTargets"); - if (explodedTargets != null && !explodedTargets.isEmpty()) { - explodedMods.addAll(explodedTargets); - } - } - - @Override - public boolean isValid(final IModFile modFile) { - return true; - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java index 10f26579f1..38516007cd 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/JarInJarDependencyLocator.java @@ -10,17 +10,21 @@ import com.google.common.collect.Lists; import com.mojang.logging.LogUtils; import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.forgespi.language.IModInfo; +import net.minecraftforge.forgespi.locating.IDependencyLocator; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.ModFileLoadingException; import net.minecraftforge.jarjar.selection.JarSelector; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; +import java.io.InputStream; import java.net.URI; import java.nio.file.FileSystem; import java.nio.file.FileSystems; +import java.nio.file.Files; import java.nio.file.Path; import java.util.Collection; import java.util.Collections; @@ -30,26 +34,35 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; -public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator -{ +@ApiStatus.Internal +public class JarInJarDependencyLocator extends AbstractModProvider implements IDependencyLocator { + private static final String COLOR_CODE = "\u00a7"; + private static final String RESET = COLOR_CODE + "r"; + private static final String YELLOW = COLOR_CODE + "e"; + private static final String RED = COLOR_CODE + "4"; + private static final String GREEN = COLOR_CODE + "2"; + private static final Logger LOGGER = LogUtils.getLogger(); @Override - public String name() - { + public String name() { return "JarInJar"; } @Override - public List scanMods(final Iterable loadedMods) - { + public List scanMods(Iterable loadedMods) { final List sources = Lists.newArrayList(); loadedMods.forEach(sources::add); - final List dependenciesToLoad = JarSelector.detectAndSelect(sources, this::loadResourceFromModFile, this::loadModFileFrom, this::identifyMod, this::exception); + var dependenciesToLoad = JarSelector.detectAndSelect( + sources, + this::loadResourceFromModFile, + this::loadModFileFrom, + this::identifyMod, + this::exception + ); - if (dependenciesToLoad.isEmpty()) - { + if (dependenciesToLoad.isEmpty()) { LOGGER.info("No dependencies to load found. Skipping!"); return Collections.emptyList(); } @@ -59,43 +72,27 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator } @Override - public void initArguments(final Map arguments) - { - // NO-OP, for now - } - - @Override - protected String getDefaultJarModType() - { + protected String getDefaultJarModType() { return IModFile.Type.GAMELIBRARY.name(); } - @SuppressWarnings("resource") - @Override - protected Optional loadModFileFrom(final IModFile file, final Path path) - { - try - { + protected Optional loadModFileFrom(IModFile file, Path path) { + try { final Path pathInModFile = file.findResource(path.toString()); final URI filePathUri = new URI("jij:" + (pathInModFile.toAbsolutePath().toUri().getRawSchemeSpecificPart())).normalize(); final Map outerFsArgs = ImmutableMap.of("packagePath", pathInModFile); final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs); final Path pathInFS = zipFS.getPath("/"); return Optional.of(createMod(pathInFS).file()); - } - catch (Exception e) - { + } catch (Exception e) { LOGGER.error("Failed to load mod file {} from {}", path, file.getFileName()); final RuntimeException exception = new ModFileLoadingException("Failed to load mod file " + file.getFileName()); exception.initCause(e); - throw exception; } } - protected EarlyLoadingException exception(Collection> failedDependencies) - { - + protected EarlyLoadingException exception(Collection> failedDependencies) { final List errors = failedDependencies.stream() .filter(entry -> !entry.sources().isEmpty()) //Should never be the case, but just to be sure .map(this::buildExceptionData) @@ -105,8 +102,7 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator } @NotNull - private EarlyLoadingException.ExceptionData buildExceptionData(final JarSelector.ResolutionFailureInformation entry) - { + private EarlyLoadingException.ExceptionData buildExceptionData(JarSelector.ResolutionFailureInformation entry) { return new EarlyLoadingException.ExceptionData( getErrorTranslationKey(entry), entry.identifier().group() + ":" + entry.identifier().artifact(), @@ -119,16 +115,14 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator } @NotNull - private String getErrorTranslationKey(final JarSelector.ResolutionFailureInformation entry) - { + private String getErrorTranslationKey(JarSelector.ResolutionFailureInformation entry) { return entry.failureReason() == JarSelector.FailureReason.VERSION_RESOLUTION_FAILED ? "fml.dependencyloading.conflictingdependencies" : "fml.dependencyloading.mismatchedcontaineddependencies"; } @NotNull - private Stream getModWithVersionRangeStream(final JarSelector.SourceWithRequestedVersionRange file) - { + private Stream getModWithVersionRangeStream(JarSelector.SourceWithRequestedVersionRange file) { return file.sources() .stream() .map(IModFile::getModFileInfo) @@ -136,23 +130,37 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator .map(modInfo -> new ModWithVersionRange(modInfo, file.requestedVersionRange(), file.includedVersion())); } - @NotNull - private String formatError(final ModWithVersionRange modWithVersionRange) - { - return "\u00a7e" + modWithVersionRange.modInfo().getModId() + "\u00a7r - \u00a74" + modWithVersionRange.versionRange().toString() + "\u00a74 - \u00a72" + modWithVersionRange.artifactVersion().toString() + "\u00a72"; - } - - @Override - protected String identifyMod(final IModFile modFile) - { - if (modFile.getModFileInfo() == null || modFile.getModInfos().isEmpty()) - { - return modFile.getFileName(); + protected Optional loadResourceFromModFile(IModFile modFile, Path path) { + try { + var pathInModFile = modFile.findResource(path.toString()); + if (!Files.exists(pathInModFile)) { + LOGGER.debug("Failed to load resource {} from {}, it does not contain dependency information.", path, modFile.getFileName()); + return Optional.empty(); + } + return Optional.of(Files.newInputStream(pathInModFile)); + } catch (Exception e) { + LOGGER.error("Failed to load resource {} from mod {}, cause {}", path, modFile.getFileName(), e); + return Optional.empty(); } - - return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining()); } - private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion) - {} + @NotNull + private String formatError(ModWithVersionRange modWithVersionRange){ + return YELLOW + modWithVersionRange.modInfo().getModId() + RESET + " - " + + RED + modWithVersionRange.versionRange().toString() + RESET + " - " + + GREEN + modWithVersionRange.artifactVersion().toString() + RESET; + } + + protected String identifyMod(IModFile modFile) { + if (modFile.getModFileInfo() != null && !modFile.getModInfos().isEmpty()) + return modFile.getModInfos().stream().map(IModInfo::getModId).collect(Collectors.joining()); + + var module = modFile.getSecureJar().moduleDataProvider().name(); + if (module != null && !module.isEmpty()) + return module; + + return modFile.getFileName(); + } + + private record ModWithVersionRange(IModInfo modInfo, VersionRange versionRange, ArtifactVersion artifactVersion) {} } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MavenDirectoryLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MavenDirectoryLocator.java deleted file mode 100644 index e8afa04a53..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MavenDirectoryLocator.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import net.minecraftforge.fml.loading.FMLPaths; -import net.minecraftforge.fml.loading.MavenCoordinateResolver; - -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -public class MavenDirectoryLocator extends AbstractJarFileModLocator -{ - private List modCoords; - - @Override - public Stream scanCandidates() { - return modCoords.stream(); - } - - @Override - public String name() { - return "maven libs"; - } - - public String toString() { - return "{Maven Directory locator for mods "+this.modCoords+"}"; - } - - @SuppressWarnings("unchecked") - @Override - public void initArguments(final Map arguments) { - final List mavenRoots = (List) arguments.get("mavenRoots"); - final List mavenRootPaths = mavenRoots.stream().map(n -> FMLPaths.GAMEDIR.get().resolve(n)).collect(Collectors.toList()); - final List mods = (List) arguments.get("mods"); - final List listedMods = ModListHandler.processModLists((List) arguments.get("modLists"), mavenRootPaths); - - List localModCoords = Stream.concat(mods.stream(),listedMods.stream()).map(MavenCoordinateResolver::get).collect(Collectors.toList()); - // find the modCoords path in each supplied maven path, and turn it into a mod file. (skips not found files) - - this.modCoords = localModCoords.stream().map(mc -> mavenRootPaths.stream().map(root -> root.resolve(mc)).filter(path -> Files.exists(path)).findFirst().orElseThrow(() -> new IllegalArgumentException("Failed to locate requested mod coordinate " + mc))).collect(Collectors.toList()); - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MinecraftLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MinecraftLocator.java index 1b29f4335d..7bb15b499c 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MinecraftLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/MinecraftLocator.java @@ -6,62 +6,36 @@ package net.minecraftforge.fml.loading.moddiscovery; import com.electronwill.nightconfig.core.Config; -import com.mojang.logging.LogUtils; import cpw.mods.jarhandling.SecureJar; import net.minecraftforge.fml.loading.FMLLoader; -import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModLocator; import net.minecraftforge.forgespi.locating.ModFileFactory; -import org.slf4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; -import java.util.stream.Collectors; -import java.util.stream.Stream; -public class MinecraftLocator extends AbstractModProvider implements IModLocator -{ - private static final Logger LOGGER = LogUtils.getLogger(); +import org.jetbrains.annotations.ApiStatus; +@ApiStatus.Internal +public class MinecraftLocator extends AbstractModProvider implements IModLocator { @Override public List scanMods() { - final var launchHandler = FMLLoader.getLaunchHandler(); - var baseMC = launchHandler.getMinecraftPaths(); - var mcjar = ModJarMetadata.buildFile(j->ModFileFactory.FACTORY.build(j, this, this::buildMinecraftTOML), j->true, baseMC.minecraftFilter(), baseMC.minecraftPaths().toArray(Path[]::new)).orElseThrow(); - var artifacts = baseMC.otherArtifacts().stream() - .map(SecureJar::from) - .map(sj -> new ModFile(sj, this, ModFileParser::modsTomlParser)) - .collect(Collectors.toList()); - var othermods = baseMC.otherModPaths().stream() - .map(p -> createMod(p.toArray(Path[]::new))) - .filter(Objects::nonNull); - artifacts.add(mcjar); + var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths(); - return Stream.concat(artifacts.stream().map(f -> new ModFileOrException(f, null)), othermods).toList(); + // Minecraft itself. + var meta = new ModJarMetadata(); + var mcjar = SecureJar.from( + jar -> meta, + minecraft.toArray(Path[]::new) + ); + var mc = ModFileFactory.FACTORY.build(mcjar, this, this::buildMinecraftTOML); + meta.setModFile(mc); + + return List.of(new ModFileOrException(mc, null)); } private IModFileInfo buildMinecraftTOML(final IModFile iModFile) { - final ModFile modFile = (ModFile) iModFile; - /* - final Path mcmodtoml = modFile.findResource("META-INF", "minecraftmod.toml"); - if (Files.notExists(mcmodtoml)) { - LOGGER.fatal(LOADING, "Mod file {} is missing minecraftmod.toml file", modFile.getFilePath()); - return null; - } - - final FileConfig mcmodstomlfile = FileConfig.builder(mcmodtoml).build(); - mcmodstomlfile.load(); - mcmodstomlfile.close(); - */ - - // We haven't changed this in years, and I can't be asked right now to special case this one file in the path. final var conf = Config.inMemory(); conf.set("modLoader", "minecraft"); @@ -76,47 +50,13 @@ public class MinecraftLocator extends AbstractModProvider implements IModLocator mods.set("authors", "MCP: Searge,ProfMobius,IngisKahn,Fesh0r,ZeuX,R4wk,LexManos,Bspkrs"); mods.set("description", "Minecraft, decompiled and deobfuscated with MCP technology"); conf.set("mods", List.of(mods)); - /* - conf.putAll(mcmodstomlfile); - final var extralangs = Stream.builder(); - final Path forgemodtoml = modFile.findResource("META-INF", "mods.toml"); - if (Files.notExists(forgemodtoml)) { - LOGGER.info("No forge mods.toml file found, not loading forge mod"); - } else { - final FileConfig forgemodstomlfile = FileConfig.builder(forgemodtoml).build(); - forgemodstomlfile.load(); - forgemodstomlfile.close(); - conf.putAll(forgemodstomlfile); - conf.>get("mods").add(0, mcmodstomlfile.>get("mods").get(0)); // Add MC as a sub-mod - extralangs.add(new IModFileInfo.LanguageSpec(mcmodstomlfile.get("modLoader"), MavenVersionAdapter.createFromVersionSpec(mcmodstomlfile.get("loaderVersion")))); - } - */ - - - final NightConfigWrapper configWrapper = new NightConfigWrapper(conf); - //final ModFileInfo modFileInfo = new ModFileInfo(modFile, configWrapper, extralangs.build().toList()); - return new ModFileInfo(modFile, configWrapper, configWrapper::setFile, List.of()); + var configWrapper = new NightConfigWrapper(conf); + return new ModFileInfo((ModFile)iModFile, configWrapper, configWrapper::setFile, List.of()); } @Override public String name() { return "minecraft"; } - - @Override - public void scanFile(final IModFile modFile, final Consumer pathConsumer) { - LOGGER.debug(LogMarkers.SCAN, "Scan started: {}", modFile); - try (Stream files = Files.find(modFile.getSecureJar().getRootPath(), Integer.MAX_VALUE, (p, a) -> p.getNameCount() > 0 && p.getFileName().toString().endsWith(".class"))) { - files.forEach(pathConsumer); - } catch (IOException e) { - e.printStackTrace(); - } - LOGGER.debug(LogMarkers.SCAN, "Scan finished: {}", modFile); - } - - @Override - public void initArguments(final Map arguments) { - // no op - } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotation.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotation.java index 6c8fa87659..a1ece7438e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotation.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotation.java @@ -7,65 +7,42 @@ package net.minecraftforge.fml.loading.moddiscovery; import java.lang.annotation.ElementType; import java.util.ArrayList; +import java.util.HashMap; import java.util.Map; import net.minecraftforge.forgespi.language.ModFileScanData; +import net.minecraftforge.forgespi.language.ModFileScanData.EnumData; + +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.Type; import com.google.common.base.MoreObjects; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -public class ModAnnotation -{ - public static ModFileScanData.AnnotationData fromModAnnotation(final Type clazz, final ModAnnotation annotation) { +@ApiStatus.Internal +class ModAnnotation { + public static ModFileScanData.AnnotationData fromModAnnotation(Type clazz, ModAnnotation annotation) { return new ModFileScanData.AnnotationData(annotation.asmType, annotation.type, clazz, annotation.member, annotation.values); } - public static class EnumHolder - { - private final String desc; - private final String value; - - public EnumHolder(String desc, String value) - { - this.desc = desc; - this.value = value; - } - - public String getDesc() - { - return desc; - } - - public String getValue() - { - return value; - } - } private final ElementType type; private final Type asmType; private final String member; - private final Map values = Maps.newHashMap(); + private final Map values = new HashMap<>(); private ArrayList arrayList; private String arrayName; - public ModAnnotation(ElementType type, Type asmType, String member) - { + public ModAnnotation(ElementType type, Type asmType, String member) { this.type = type; this.asmType = asmType; this.member = member; } - - public ModAnnotation(Type asmType, ModAnnotation parent) - { - this.type = parent.type; - this.asmType = asmType; - this.member = parent.member; + + public ModAnnotation(Type asmType, ModAnnotation parent) { + this(parent.type, asmType, parent.member); } + @Override - public String toString() - { + public String toString() { return MoreObjects.toStringHelper("Annotation") .add("type",type) .add("name",asmType.getClassName()) @@ -74,52 +51,45 @@ public class ModAnnotation .toString(); } - public ElementType getType() - { + public ElementType getType() { return type; } - public Type getASMType() - { + + public Type getASMType() { return asmType; } - public String getMember() - { + + public String getMember() { return member; } - public Map getValues() - { + + public Map getValues() { return values; } - public void addArray(String name) - { - this.arrayList = Lists.newArrayList(); + + public void addArray(String name) { + this.arrayList = new ArrayList<>(); this.arrayName = name; } - public void addProperty(String key, Object value) - { + + public void addProperty(String key, Object value) { if (this.arrayList != null) - { arrayList.add(value); - } else - { values.put(key, value); - } } - public void addEnumProperty(String key, String enumName, String value) - { - addProperty(key, new EnumHolder(enumName, value)); + public void addEnumProperty(String key, String enumName, String value) { + addProperty(key, new EnumData(Type.getType(enumName), value)); } - public void endArray() - { + public void endArray() { values.put(arrayName, arrayList); arrayList = null; } - public ModAnnotation addChildAnnotation(String name, String desc) - { - ModAnnotation child = new ModAnnotation(Type.getType(desc), this); + + public ModAnnotation addChildAnnotation(String name, String desc) { + var child = new ModAnnotation(Type.getType(desc), this); addProperty(name, child.getValues()); return child; } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotationVisitor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotationVisitor.java deleted file mode 100644 index 8fd1fd3e34..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotationVisitor.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.Opcodes; - -import java.util.LinkedList; - -public class ModAnnotationVisitor extends AnnotationVisitor { - private final ModAnnotation annotation; - private LinkedList annotations; - private boolean array; - private boolean isSubAnnotation; - - public ModAnnotationVisitor(LinkedList annotations, ModAnnotation annotation) { - super(Opcodes.ASM9); - this.annotations = annotations; - this.annotation = annotation; - } - - public ModAnnotationVisitor(LinkedList annotations, ModAnnotation annotation, String name) { - this(annotations, annotation); - this.array = true; - annotation.addArray(name); - } - - public ModAnnotationVisitor(LinkedList annotations, ModAnnotation annotation, boolean isSubAnnotation) { - this(annotations, annotation); - this.isSubAnnotation = true; - } - - @Override - public void visit(String key, Object value) { - annotation.addProperty(key, value); - } - - @Override - public void visitEnum(String name, String desc, String value) { - annotation.addEnumProperty(name, desc, value); - } - - @Override - public AnnotationVisitor visitArray(String name) { - return new ModAnnotationVisitor(annotations, annotation, name); - } - - @Override - public AnnotationVisitor visitAnnotation(String name, String desc) { - var ma = annotations.getFirst(); - var childAnnotation = ma.addChildAnnotation(name, desc); - annotations.addFirst(childAnnotation); - return new ModAnnotationVisitor(annotations, childAnnotation, true); - } - - @Override - public void visitEnd() { - if (array) - annotation.endArray(); - - if (isSubAnnotation) - annotations.addLast(annotations.removeFirst()); - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java index d96bb1dc08..bdc09297df 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java @@ -6,6 +6,8 @@ package net.minecraftforge.fml.loading.moddiscovery; import net.minecraftforge.forgespi.language.ModFileScanData; + +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; @@ -19,13 +21,14 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; -public class ModClassVisitor extends ClassVisitor { +@ApiStatus.Internal +class ModClassVisitor extends ClassVisitor { private Type asmType; private Type asmSuperType; private Set interfaces; private final LinkedList annotations = new LinkedList<>(); - public ModClassVisitor() { + ModClassVisitor() { super(Opcodes.ASM9); } @@ -38,19 +41,33 @@ public class ModClassVisitor extends ClassVisitor { @Override public AnnotationVisitor visitAnnotation(final String annotationName, final boolean runtimeVisible) { - ModAnnotation ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName()); + var ann = new ModAnnotation(ElementType.TYPE, Type.getType(annotationName), this.asmType.getClassName()); annotations.addFirst(ann); - return new ModAnnotationVisitor(annotations, ann); + return new ModAnnotationVisitor(ann); } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new ModFieldVisitor(name, annotations); + return new FieldVisitor(Opcodes.ASM9) { + @Override + public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) { + var ann = new ModAnnotation(ElementType.FIELD, Type.getType(annotationName), name); + annotations.addFirst(ann); + return new ModAnnotationVisitor(ann); + } + }; } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new ModMethodVisitor(name, desc, annotations); + return new MethodVisitor(Opcodes.ASM9) { + @Override + public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) { + ModAnnotation ann = new ModAnnotation(ElementType.METHOD, Type.getType(annotationName), name + desc); + annotations.addFirst(ann); + return new ModAnnotationVisitor(ann); + } + }; } public void buildData(final Set classes, final Set baked) { @@ -60,4 +77,58 @@ public class ModClassVisitor extends ClassVisitor { baked.add(ModAnnotation.fromModAnnotation(this.asmType, a)); } } + + private class ModAnnotationVisitor extends AnnotationVisitor { + private final ModAnnotation annotation; + private boolean array; + private boolean isSubAnnotation; + + public ModAnnotationVisitor(ModAnnotation annotation) { + super(Opcodes.ASM9); + this.annotation = annotation; + } + + public ModAnnotationVisitor(ModAnnotation annotation, String name) { + this(annotation); + this.array = true; + annotation.addArray(name); + } + + public ModAnnotationVisitor(ModAnnotation annotation, boolean isSubAnnotation) { + this(annotation); + this.isSubAnnotation = true; + } + + @Override + public void visit(String key, Object value) { + annotation.addProperty(key, value); + } + + @Override + public void visitEnum(String name, String desc, String value) { + annotation.addEnumProperty(name, desc, value); + } + + @Override + public AnnotationVisitor visitArray(String name) { + return new ModAnnotationVisitor(annotation, name); + } + + @Override + public AnnotationVisitor visitAnnotation(String name, String desc) { + var ma = annotations.getFirst(); + var childAnnotation = ma.addChildAnnotation(name, desc); + annotations.addFirst(childAnnotation); + return new ModAnnotationVisitor(childAnnotation, true); + } + + @Override + public void visitEnd() { + if (array) + annotation.endArray(); + + if (isSubAnnotation) + annotations.addLast(annotations.removeFirst()); + } + } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java index 27d4d9dddb..4bcb1a773d 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModDiscoverer.java @@ -21,6 +21,8 @@ import net.minecraftforge.forgespi.language.IModFileInfo; import net.minecraftforge.forgespi.locating.IDependencyLocator; import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModLocator; + +import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; import java.util.ArrayList; @@ -30,6 +32,7 @@ import java.util.Objects; import java.util.ServiceLoader; import java.util.stream.Collectors; +@ApiStatus.Internal public class ModDiscoverer { private static final Logger LOGGER = LogUtils.getLogger(); private final ServiceLoader modLocators; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFieldVisitor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFieldVisitor.java deleted file mode 100644 index 81534de1f2..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFieldVisitor.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; - -import java.lang.annotation.ElementType; -import java.util.LinkedList; - -public class ModFieldVisitor extends FieldVisitor -{ - private final LinkedList annotations; - private final String fieldName; - - public ModFieldVisitor(String name, final LinkedList annotations) - { - super(Opcodes.ASM9); - this.fieldName = name; - this.annotations = annotations; - } - - @Override - public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) - { - ModAnnotation ann = new ModAnnotation(ElementType.FIELD, Type.getType(annotationName), fieldName); - annotations.addFirst(ann); - return new ModAnnotationVisitor(annotations, ann); - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java index 164add39ab..76475da581 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java @@ -23,6 +23,8 @@ import org.slf4j.Logger; import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; @@ -35,16 +37,7 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; public class ModFile implements IModFile { - // Mods either must have a mods.toml or a manifest. We can no longer just put any jar on the classpath. - @Deprecated(forRemoval = true, since = "1.18") - public static final Manifest DEFAULTMANIFEST; private static final Logger LOGGER = LogUtils.getLogger(); - - static { - DEFAULTMANIFEST = new Manifest(); - DEFAULTMANIFEST.getMainAttributes().putValue("FMLModType", "MOD"); - } - private final String jarVersion; private final ModFileFactory.ModFileInfoParser parser; private Map fileProperties; @@ -176,9 +169,13 @@ public class ModFile implements IModFile { } public void identifyLanguage() { - this.loaders = this.modFileInfo.requiredLanguageLoaders().stream() - .map(spec-> FMLLoader.getLanguageLoadingProvider().findLanguage(this, spec.languageName(), spec.acceptedVersions())) - .toList(); + var lst = new ArrayList(this.modFileInfo.requiredLanguageLoaders().size()); + var services = FMLLoader.getLanguageLoadingProvider(); + for (var spec : this.modFileInfo.requiredLanguageLoaders()) { + var service = services.findLanguage(this, spec.languageName(), spec.acceptedVersions()); + lst.add(service); + } + this.loaders = Collections.unmodifiableList(lst); } @Override diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java index 5456481c4c..4d3e47fbb6 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java @@ -15,6 +15,7 @@ import net.minecraftforge.forgespi.locating.ForgeFeature; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.DefaultArtifactVersion; import org.apache.maven.artifact.versioning.VersionRange; +import org.jetbrains.annotations.ApiStatus; import org.slf4j.Logger; import java.net.URL; @@ -24,8 +25,8 @@ import java.util.Map; import java.util.Optional; import java.util.regex.Pattern; -public class ModInfo implements IModInfo, IConfigurable -{ +@ApiStatus.Internal +public class ModInfo implements IModInfo, IConfigurable { private static final Logger LOGGER = LogUtils.getLogger(); private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1"); private static final Pattern VALID_MODID = Pattern.compile("^[a-z][a-z0-9_]{1,63}$"); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java index c2323136ca..5fb58fb69b 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModJarMetadata.java @@ -6,48 +6,17 @@ package net.minecraftforge.fml.loading.moddiscovery; import cpw.mods.jarhandling.JarMetadata; -import cpw.mods.jarhandling.SecureJar; import net.minecraftforge.forgespi.locating.IModFile; -import net.minecraftforge.forgespi.locating.IModLocator; - import java.lang.module.ModuleDescriptor; -import java.nio.file.Path; import java.util.Objects; -import java.util.Optional; -import java.util.function.BiPredicate; -import java.util.function.Function; -import java.util.function.Predicate; +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal public final class ModJarMetadata implements JarMetadata { private IModFile modFile; private ModuleDescriptor descriptor; - // TODO: Remove helper functions to cleanup api - @Deprecated(forRemoval = true, since="1.18") - static Optional buildFile(IModLocator locator, Predicate jarTest, BiPredicate filter, Path... files) { - return buildFile(j->new ModFile(j, locator, ModFileParser::modsTomlParser), jarTest, filter, files); - } - - // TODO: Remove helper functions to cleanup api - @Deprecated(forRemoval = true, since="1.18") - static IModFile buildFile(IModLocator locator, Path... files) { - return buildFile(locator, j->true, null, files).orElseThrow(()->new IllegalArgumentException("Failed to find valid JAR file")); - } - - // TODO: Remove helper functions to cleanup api - @Deprecated(forRemoval = true, since="1.18") - static Optional buildFile(Function mfConstructor, Predicate jarTest, BiPredicate filter, Path... files) { - var mjm = new ModJarMetadata(); - var sj = SecureJar.from(()->ModFile.DEFAULTMANIFEST, j->mjm, filter, files); - if (jarTest.test(sj)) { - var mf = mfConstructor.apply(sj); - mjm.setModFile(mf); - return Optional.of(mf); - } else { - return Optional.empty(); - } - } - ModJarMetadata() { } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModListHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModListHandler.java deleted file mode 100644 index 471d1fb6aa..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModListHandler.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import com.mojang.logging.LogUtils; -import net.minecraftforge.fml.loading.FMLPaths; -import net.minecraftforge.fml.loading.LogMarkers; -import net.minecraftforge.fml.loading.MavenCoordinateResolver; -import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -public class ModListHandler { - private static final Logger LOGGER = LogUtils.getLogger(); - /** - * Reads the modList paths specified, and searches each maven root for mods matching. Returns a list of mods - * found. - * - * @param modListPaths Paths to search for mod file lists - * @param mavenRootPaths Roots to look for mods listed - * @return list of found mod coordinates - */ - public static List processModLists(final List modListPaths, final List mavenRootPaths) { - final List modCoordinates = modListPaths.stream().map(ModListHandler::transformPathToList). - flatMap(Collection::stream). - collect(Collectors.toList()); - - List> localModCoords = modCoordinates.stream().map(mc->Pair.of(MavenCoordinateResolver.get(mc), mc)).collect(Collectors.toList()); - final List> foundCoordinates = localModCoords.stream(). - map(mc -> mavenRootPaths.stream(). - map(root -> Pair.of(root.resolve(mc.getLeft()), mc.getRight())). - filter(path -> Files.exists(path.getLeft())). - findFirst(). - orElseGet(()->{ - LOGGER.warn(LogMarkers.CORE, "Failed to find coordinate {}", mc); - return null; - })). - filter(Objects::nonNull). - collect(Collectors.toList()); - - final List found = foundCoordinates.stream().map(Pair::getRight).collect(Collectors.toList()); - LOGGER.debug(LogMarkers.CORE, "Found mod coordinates from lists: {}", found); - return found; - } - - private static List transformPathToList(final String path) { - LOGGER.debug(LogMarkers.CORE, "Reading mod list {}", path); - Path filePath = FMLPaths.GAMEDIR.get().resolve(path); - if (!Files.exists(filePath)) { - LOGGER.warn(LogMarkers.CORE, "Failed to find modlist file at {}", filePath); - return Collections.emptyList(); - } - - String extension = fileExtension(filePath); - if (Objects.equals("list",extension)) { - return readListFile(filePath).stream().filter(s -> !s.isEmpty()).collect(Collectors.toList()); - } else { - LOGGER.warn(LogMarkers.CORE, "Failed to read unknown file list type {} for file {}", extension, filePath); - } - return Collections.emptyList(); - } - - private static String fileExtension(final Path path) { - String fileName = path.getFileName().toString(); - int idx = fileName.lastIndexOf('.'); - return idx > -1 ? fileName.substring(idx+1) : ""; - } - - /** - * Simple list file, ending in ".list" with one mod coordinate per line - * @param filePath path - * @return list - */ - private static List readListFile(final Path filePath) { - try { - return Files.readAllLines(filePath); - } catch (IOException e) { - LOGGER.warn(LogMarkers.CORE, "Failed to read file list {}", filePath, e); - return Collections.emptyList(); - } - } -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModMethodVisitor.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModMethodVisitor.java deleted file mode 100644 index e0e4d398b0..0000000000 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModMethodVisitor.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (c) Forge Development LLC and contributors - * SPDX-License-Identifier: LGPL-2.1-only - */ - -package net.minecraftforge.fml.loading.moddiscovery; - -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; - -import java.lang.annotation.ElementType; -import java.util.LinkedList; - -public class ModMethodVisitor extends MethodVisitor { - - private final LinkedList annotations; - private String methodName; - private String methodDescriptor; - - public ModMethodVisitor(String name, String desc, final LinkedList annotations) - { - super(Opcodes.ASM9); - this.methodName = name; - this.methodDescriptor = desc; - this.annotations = annotations; - } - - @Override - public AnnotationVisitor visitAnnotation(String annotationName, boolean runtimeVisible) - { - ModAnnotation ann = new ModAnnotation(ElementType.METHOD, Type.getType(annotationName), methodName+methodDescriptor); - annotations.addFirst(ann); - return new ModAnnotationVisitor(annotations, ann); - } - -} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModsFolderLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModsFolderLocator.java index a5999a2115..bdaf4ee2ea 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModsFolderLocator.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModsFolderLocator.java @@ -9,33 +9,28 @@ import com.mojang.logging.LogUtils; import net.minecraftforge.fml.loading.FMLPaths; import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.ModDirTransformerDiscoverer; -import net.minecraftforge.fml.loading.StringUtils; +import net.minecraftforge.forgespi.locating.IModLocator; + import org.slf4j.Logger; +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Comparator; -import java.util.Map; -import java.util.stream.Stream; - -import static cpw.mods.modlauncher.api.LamdbaExceptionUtils.uncheck; +import java.util.List; +import java.util.Locale; /** * Support loading mods located in JAR files in the mods folder */ -public class ModsFolderLocator extends AbstractJarFileModLocator -{ +public class ModsFolderLocator extends AbstractModProvider implements IModLocator { private static final String SUFFIX = ".jar"; private static final Logger LOGGER = LogUtils.getLogger(); private final Path modFolder; private final String customName; public ModsFolderLocator() { - this(FMLPaths.MODSDIR.get()); - } - - ModsFolderLocator(Path modFolder) { - this(modFolder, "mods folder"); + this(FMLPaths.MODSDIR.get(), "mods folder"); } ModsFolderLocator(Path modFolder, String name) { @@ -44,13 +39,22 @@ public class ModsFolderLocator extends AbstractJarFileModLocator } @Override - public Stream scanCandidates() { - LOGGER.debug(LogMarkers.SCAN,"Scanning mods dir {} for mods", this.modFolder); + public List scanMods() { + LOGGER.debug(LogMarkers.SCAN, "Scanning mods dir {} for mods", this.modFolder); var excluded = ModDirTransformerDiscoverer.allExcluded(); + try (var stream = Files.list(this.modFolder)) { + return stream.filter(path -> !excluded.contains(path) && path.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(SUFFIX)) + .sorted(Comparator.comparing(path -> path.getFileName().toString().toLowerCase(Locale.ROOT))) + .map(this::createMod) + .toList(); + } catch (IOException e) { + return sneak(e); + } + } - return uncheck(()-> Files.list(this.modFolder)) - .filter(p-> !excluded.contains(p) && StringUtils.toLowerCase(p.getFileName().toString()).endsWith(SUFFIX)) - .sorted(Comparator.comparing(path-> StringUtils.toLowerCase(path.getFileName().toString()))); + @SuppressWarnings("unchecked") + private static R sneak(Throwable e) throws E { + throw (E)e; } @Override @@ -62,8 +66,4 @@ public class ModsFolderLocator extends AbstractJarFileModLocator public String toString() { return "{"+customName+" locator at "+this.modFolder+"}"; } - - @Override - public void initArguments(final Map arguments) { - } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java index a25b54acbc..37f7800a50 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/NightConfigWrapper.java @@ -15,9 +15,12 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import org.jetbrains.annotations.ApiStatus; + import static java.util.Arrays.asList; -public class NightConfigWrapper implements IConfigurable { +@ApiStatus.Internal +class NightConfigWrapper implements IConfigurable { private final UnmodifiableConfig config; private IModFileInfo file; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java index 08a6310f15..c4c7374dab 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/Scanner.java @@ -9,6 +9,8 @@ import com.mojang.logging.LogUtils; import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.forgespi.language.IModLanguageProvider; import net.minecraftforge.forgespi.language.ModFileScanData; + +import org.jetbrains.annotations.ApiStatus; import org.objectweb.asm.ClassReader; import org.slf4j.Logger; @@ -18,7 +20,8 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -public class Scanner { +@ApiStatus.Internal +class Scanner { private static final Logger LOGGER = LogUtils.getLogger(); private final ModFile fileToScan; diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java index 19e586ed3b..426c644ec0 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonDevLaunchHandler.java @@ -7,15 +7,9 @@ package net.minecraftforge.fml.loading.targets; import cpw.mods.jarhandling.SecureJar; import cpw.mods.modlauncher.api.ServiceRunner; -import net.minecraftforge.fml.loading.LogMarkers; import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; import java.util.function.BiPredicate; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -63,55 +57,6 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler { return args.getArguments(); } - protected List getLibraries(String[] classpath) { - // TODO: These should all be FMLModType: LIBRARY, find them that way? - // Or at the very least include version info - var fmlcore = findJarOnClasspath(classpath, "fmlcore"); - var javafmllang = findJarOnClasspath(classpath, "javafmllanguage"); - var lowcodelang = findJarOnClasspath(classpath, "lowcodelanguage"); - var mclang = findJarOnClasspath(classpath, "mclanguage"); - return List.of(fmlcore, javafmllang, lowcodelang, mclang); - } - - protected BiPredicate getMcFilter(Path extra, List minecraft) { - var packages = getPackages(); // Pulled out so it is passed to the lambda as value - var extraPath = extra.toString().replace('\\', '/'); - - // We serve everything, except for things in the forge packages. - BiPredicate mcFilter = (path, base) -> { - if (base.equals(extraPath) || - path.endsWith("/")) return true; - for (var pkg : packages) - if (path.startsWith(pkg)) return false; - return true; - }; - - return mcFilter; - } - - protected Path getForgeMod(List minecraft) { - var packages = getPackages(); // Pulled out so it is passed to the lambda as value - // We need to separate out our resources/code so that we can show up as a different data pack. - var modJar = SecureJar.from((path, base) -> { - if (!path.endsWith(".class")) return true; - for (var pkg : packages) - if (path.startsWith(pkg)) return true; - return false; - }, minecraft.stream().distinct().toArray(Path[]::new)); - - //modJar.getPackages().stream().sorted().forEach(System.out::println); - return modJar.getRootPath(); - } - - private static String[] getPackages() { - return new String[] { - "net/minecraftforge/", - "META-INF/services/", - "META-INF/coremods.json", - "META-INF/mods.toml" - }; - } - private static String getRandomNumbers(int length) { // Generate a time-based random number, to mimic how n.m.client.Main works return Long.toString(System.nanoTime() % (int) Math.pow(10, length)); @@ -122,48 +67,11 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler { return super.makeService(preLaunch(arguments, gameLayer), gameLayer); } - // TODO: Get rid of this string based classpath crap when I re-write mod loader - protected static Map> getModClasses() { - var modClasses = Optional.ofNullable(System.getenv("MOD_CLASSES")).orElse(""); - LOGGER.debug(LogMarkers.CORE, "Got mod coordinates {} from env", modClasses); - - /* - * So MOD_CLASSES at the end of the day is a Map> but because we want to shove that into a single string. - * And pass it in as an environment variable.. instead od using json, or a file path, or anything sane, cpw did hacky string stuff - * Basically what we want to do is split the string by File.pathSeperator to get each key-value pair. - * Then we find the magic string "%%" and split on that. Using the first half as the mod id and the second as the path. - * BUT the modID is optional, and if not specified {why wouldn't it be?} it uses "defaultmodid" - * Anyways, it was stream hell, but now it's simpler to debug/understand. - */ - Map> ret = new HashMap<>(); - var entries = modClasses.split(File.pathSeparator); - for (var entry : entries) { - var modid = "defaultmodid"; - var path = entry; - - int idx = entry.indexOf("%%"); - if (idx != -1) { - modid = entry.substring(0, idx); - path = entry.substring(idx + 2); - } - - var p = Paths.get(path); - var lst = ret.computeIfAbsent(modid, k -> new ArrayList<>()); - if (!lst.contains(p)) - lst.add(p); - } - - LOGGER.debug(LogMarkers.CORE, "Found supplied mod coordinates:"); - ret.forEach((k, v) -> { - if (v.size() == 1) - LOGGER.debug(LogMarkers.CORE, "\t{}: {}", k, v.get(0)); - else { - LOGGER.debug(LogMarkers.CORE, "\t{}:", k); - v.forEach(e -> LOGGER.debug("\t\t{}", e)); - } - }); - - return ret; + protected static String[] findClassPath() { + var classpath = System.getProperty("legacyClassPath"); + if (classpath == null) + classpath = System.getProperty("java.class.path"); + return classpath.split(File.pathSeparator); } protected static Path findJarOnClasspath(String[] classpath, String match) { @@ -181,8 +89,49 @@ abstract class CommonDevLaunchHandler extends CommonLaunchHandler { } if (ret == null) - new IllegalStateException("Could not find " + match + " in classpath"); + throw new IllegalStateException("Could not find " + match + " in classpath"); return Paths.get(ret); } + + // TODO: [Forge][UFS][DEV] Make Forge and MC seperate sources at dev time so we don't have to filter + protected static Path getMinecraftOnly(Path extra, Path forge) { + var packages = getPackages(); // Pulled out so it is passed to the lambda as value + var extraPath = extra.toString().replace('\\', '/'); + + // We serve everything, except for things in the forge packages. + BiPredicate mcFilter = (path, base) -> { + if (base.equals(extraPath) || + path.endsWith("/")) return true; + for (var pkg : packages) + if (path.startsWith(pkg)) return false; + return true; + }; + var fs = UnionHelper.newFileSystem(mcFilter, new Path[] { forge, extra }); + return fs.getRootDirectories().iterator().next(); + } + + // TODO: [Forge][UFS][DEV] Make Forge and MC seperate sources at dev time so we don't have to filter + protected static Path getForgeOnly(Path forge) { + var packages = getPackages(); // Pulled out so it is passed to the lambda as value + // We need to separate out our resources/code so that we can show up as a different data pack. + var modJar = SecureJar.from((path, base) -> { + if (!path.endsWith(".class")) return true; + for (var pkg : packages) + if (path.startsWith(pkg)) return true; + return false; + }, new Path[] { forge }); + + //modJar.getPackages().stream().sorted().forEach(System.out::println); + return modJar.getRootPath(); + } + + private static String[] getPackages() { + return new String[] { + "net/minecraftforge/", + "META-INF/services/", + "META-INF/coremods.json", + "META-INF/mods.toml" + }; + } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java index 617f93389c..7a5ac2d2dd 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/CommonLaunchHandler.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.net.URI; import java.nio.file.Path; import java.util.List; -import java.util.function.BiPredicate; /** * This is required by FMLLoader because ILaunchHandlerService doesn't have the context we need. @@ -29,16 +28,9 @@ import java.util.function.BiPredicate; * So until that happens, guess this is public api. */ public abstract class CommonLaunchHandler implements ILaunchHandlerService { - public record LocatedPaths( - List minecraftPaths, - BiPredicate minecraftFilter, - List> otherModPaths, - List otherArtifacts - ) {} - protected static final Logger LOGGER = LogUtils.getLogger(); - private final LaunchType type; + protected final LaunchType type; private final String prefix; protected CommonLaunchHandler(LaunchType type, String prefix) { @@ -52,7 +44,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService { public boolean isProduction() { return false; } public abstract String getNaming(); - public abstract LocatedPaths getMinecraftPaths(); + public abstract List getMinecraftPaths(); @Override public void configureTransformationClassLoader(final ITransformingClassLoaderBuilder builder) { @@ -60,7 +52,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService { protected String[] preLaunch(String[] arguments, ModuleLayer layer) { URI uri; - try (var reader = layer.configuration().findModule("fmlloader").orElseThrow().reference().open()) { + try (var reader = layer.configuration().findModule("net.minecraftforge.fmlloader").orElseThrow().reference().open()) { uri = reader.find("log4j2.xml").orElseThrow(); } catch (IOException e) { throw new RuntimeException(e); @@ -89,7 +81,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService { protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false); protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable { - var mod = layer.findModule(module).orElseThrow(); + var mod = layer.findModule(module).orElse(null); if (mod == null) throw new IllegalStateException("Could not find module " + module); var cls = Class.forName(mod, target); if (cls == null) throw new IllegalStateException("Could not find class " + target + " in module " + module); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java index 690ace158b..39230940a6 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLaunchHandler.java @@ -4,269 +4,52 @@ */ package net.minecraftforge.fml.loading.targets; -import java.io.File; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; +import java.net.URI; import java.nio.file.Path; -import java.nio.file.StandardOpenOption; -import java.nio.file.spi.FileSystemProvider; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; +import java.nio.file.Paths; import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.stream.Stream; - import org.jetbrains.annotations.ApiStatus; -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.Opcodes; -import com.electronwill.nightconfig.core.Config; -import com.electronwill.nightconfig.core.file.FileNotFoundAction; -import com.electronwill.nightconfig.core.io.WritingMode; -import com.electronwill.nightconfig.toml.TomlParser; -import com.electronwill.nightconfig.toml.TomlWriter; -import com.google.common.jimfs.Jimfs; - -import cpw.mods.niofs.union.UnionFileSystemProvider; @ApiStatus.Internal abstract class ForgeDevLaunchHandler extends CommonDevLaunchHandler { - private static final String MODS_TOML = "META-INF/mods.toml"; - private static final String PACK_META = "pack.mcmeta"; - private static final UnionFileSystemProvider UFSP = (UnionFileSystemProvider)FileSystemProvider.installedProviders().stream().filter(fsp->fsp.getScheme().equals("union")).findFirst().orElseThrow(()->new IllegalStateException("Couldn't find UnionFileSystemProvider")); - private ForgeDevLaunchHandler(LaunchType type) { super(type, "forge_dev_"); } @Override - public LocatedPaths getMinecraftPaths() { - // Our exploded directories in development include all mods and minecraft itself. - var mods = getModClasses(); + public List getMinecraftPaths() { // The extra jar is on the classpath, so try and pull it out of the legacy classpath - var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find client-extra").split(File.pathSeparator); + var legacyCP = findClassPath(); var extra = findJarOnClasspath(legacyCP, "client-extra"); + // Minecraft is an exploded directory, so find it. + var minecraft = getPathFromResource("net/minecraft/client/Minecraft.class"); + var forge = getPathFromResource("net/minecraftforge/common/MinecraftForge.class"); + // If both Forge and MC are in the same folder, then we are in intellij or gradle + // So we have to create a filtered jar + if (!forge.equals(minecraft)) + return List.of(minecraft, extra); - // Minecraft is extra jar {resources} + our exploded directories in dev - var minecraft = mods.remove("minecraft"); - if (minecraft == null) - throw new IllegalStateException("Could not find 'minecraft' mod paths."); - var mcFilter = getMcFilter(extra, minecraft); - - // The MC code/Patcher edits are in exploded directories - var modstream = Stream.>builder(); - var forge = this.getForgeMod(minecraft); - modstream.add(List.of(forge)); - - // Explode our test mods into a framework that treats them all as separate jars. - var tests = mods.remove("tests"); - if (tests != null) - explodeTestMods(tests).forEach(modstream::add); - - mods.values().forEach(modstream::add); - - return new LocatedPaths( - Stream.concat(minecraft.stream(), List.of(extra).stream()).toList(), - mcFilter, - modstream.build().toList(), - getLibraries(legacyCP) - ); + var filtered = CommonDevLaunchHandler.getMinecraftOnly(extra, minecraft); + return List.of(filtered); } - private List> explodeTestMods(List paths) { - var mod = new ArrayList>(); - var memory = Jimfs.newFileSystem(); + static Path getPathFromResource(String resource) { + var cl = ForgeDevLaunchHandler.class.getClassLoader(); + var url = cl.getResource(resource); + if (url == null) + throw new IllegalStateException("Could not find " + resource + " in classloader " + cl); - // First lets find all class files, that have the @Mod annotation and map packages to modids. - var packages = findTestModPackages(paths); - for (var entry : packages.entrySet()) { - var pkg = entry.getKey(); - var modids = entry.getValue(); - - var resourcePaths = new LinkedHashSet(); - // Jump down into the package for resources - paths.stream() - .mapMulti((p, c) -> modids.forEach(id -> c.accept(p.resolve(id)))) - .filter(Files::exists).forEach(resourcePaths::add); - - var root = memory.getPath(modids.iterator().next()); // use the first modid as our root - buildModsToml(resourcePaths, modids, root); - buildPackMeta(resourcePaths, root); - - if (Files.exists(root)) - resourcePaths.add(root); - - // We want just the class files from the root of the input paths. So make a new union with a filter. - var classes = UFSP.newFileSystem( - (path, base) -> { - if (path.endsWith("/")) { - if (path.startsWith("/")) - path = path.substring(1); - return pkg.startsWith(path) || path.startsWith(pkg); - } - return path.endsWith(".class") && path.startsWith(pkg); - }, paths.toArray(Path[]::new)); - // And we want the resources, and none of the classes, just in case things get kinda fucky and somehow a package overlaps a sub package {shading?} - var resources = UFSP.newFileSystem((path, base) -> !path.endsWith(".class"), resourcePaths.toArray(Path[]::new)); - - mod.add(List.of(classes.getRoot(), resources.getRoot())); + var str = url.toString(); + int len = resource.length(); + if ("jar".equalsIgnoreCase(url.getProtocol())) { + str = url.getFile(); + len += 2; } - - return mod; - } - - // Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories, - // I could make it merge all the way up, but I think this would be fine. - private Map> findTestModPackages(List paths) { - var mods = new HashMap>(); - for (var path : paths) { - try (var files = Files.walk(path)) { - var classes = files - .filter(Files::isRegularFile) - .filter(p -> p.getFileName().toString().endsWith(".class")) - .toList(); - - for (var cls : classes) { - try (var is = Files.newInputStream(cls)) { - var reader = new ClassReader(is); - reader.accept(new ClassVisitor(Opcodes.ASM9) { - private String clsName; - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - this.clsName = name; - super.visit(version, access, name, signature, superName, interfaces); - } - - @Override - public AnnotationVisitor visitAnnotation(String name, boolean runtime) { - if (!"Lnet/minecraftforge/fml/common/Mod;".equals(name)) - return super.visitAnnotation(name, runtime); - - return new AnnotationVisitor(Opcodes.ASM9) { - @Override - public void visit(String key, Object value) { - if ("value".equals(key)) { - int idx = clsName.lastIndexOf('/'); - var pkg = clsName.substring(0, idx); - mods.computeIfAbsent(pkg, k -> new HashSet<>()).add((String)value); - - idx = pkg.lastIndexOf('/'); - while (idx != -1) { - pkg = pkg.substring(0, idx); - idx = pkg.lastIndexOf('/'); - if (mods.containsKey(pkg)) - throw new IllegalStateException("Invalid ForgeDev test mod layout, conflicting packages: " + pkg + " for " + clsName); - } - } - } - }; - } - }, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); - } - } - } catch (IOException e) { - sneak(e); - } - } - return mods; - } - - // Builds or update the mods.toml file for all @Mods in this package - private void buildModsToml(Set resources, Set modids, Path root) { - var toml = resources.stream() - .map(p -> p.resolve(MODS_TOML)) - .filter(Files::exists) - .findFirst() - .orElse(null); - - Config cfg = null; - - if (toml != null) - cfg = new TomlParser().parse(toml, FileNotFoundAction.READ_NOTHING); - else - cfg = Config.inMemory(); - - boolean modified = false; - var defaults = Map.of( - "modLoader", "javafml", - "loaderVersion", "[0,)", - "license", "Doesnt fucking matter" - ); - - for (var key : defaults.keySet()) { - if (!cfg.contains(key)) { - cfg.set(key, defaults.get(key)); - modified = true; - } - } - - var modlist = new ArrayList(); - if (cfg.contains("mods")) { - @SuppressWarnings("unchecked") - var existing = ((List)cfg.get("mods")); - modlist.addAll(existing); - } - - for (var modid : modids) { - if (!modlist.stream().anyMatch(c -> modid.equals(c.get("modId")))) { - modified = true; - var tmp = Config.inMemory(); - tmp.set("modId", modid); - modlist.add(tmp); - } - } - - cfg.set("mods", modlist); - - if (modified) { - var target = root.resolve(MODS_TOML); - try { - Files.createDirectories(target.getParent()); - new TomlWriter().write(cfg, target, WritingMode.REPLACE); - } catch (IOException e) { - throw new IllegalStateException("Failed to create in memory toml: " + target, e); - } - } - } - - // This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there. - private void buildPackMeta(Set paths, Path root) { - var existing = paths.stream() - .map(p -> p.resolve(PACK_META)) - .filter(Files::exists) - .findFirst() - .orElse(null); - - if (existing != null) - return; - var target = root.resolve(PACK_META); - try { - Files.createDirectories(target.getParent()); - Files.writeString(target, - """ - { - "pack": { - "description": "doesn't matter", - "pack_format": 18 - } - } - """, StandardCharsets.UTF_8, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE); - } catch (IOException e) { - throw new IllegalStateException("Failed to make in memory pack.mcmeta: " + target, e); - } - } - - @SuppressWarnings("unchecked") - private static R sneak(Throwable e) throws E { - throw (E)e; + str = str.substring(0, str.length() - len); + var path = Paths.get(URI.create(str)); + return path; } public static class Client extends ForgeDevLaunchHandler { diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java new file mode 100644 index 0000000000..2267a2f063 --- /dev/null +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeDevLocator.java @@ -0,0 +1,276 @@ +package net.minecraftforge.fml.loading.targets; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import org.jetbrains.annotations.ApiStatus; +import org.objectweb.asm.AnnotationVisitor; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Opcodes; + +import com.electronwill.nightconfig.core.Config; +import com.electronwill.nightconfig.core.file.FileNotFoundAction; +import com.electronwill.nightconfig.core.io.WritingMode; +import com.electronwill.nightconfig.toml.TomlParser; +import com.electronwill.nightconfig.toml.TomlWriter; +import com.google.common.jimfs.Jimfs; + +import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider; +import net.minecraftforge.forgespi.locating.IModLocator; + +@ApiStatus.Internal +public class ForgeDevLocator extends AbstractModProvider implements IModLocator { + private static final String PACK_META = "pack.mcmeta"; + + @Override + public String name() { + return "forge_dev_locator"; + } + + @Override + public List scanMods() { + var handler = FMLLoader.getLaunchHandler(); + + if (!(handler instanceof ForgeDevLaunchHandler)) + return List.of(); + + var mods = getMods(); + var ret = new ArrayList(); + for (var path : mods) { + var mod = createMod(path); + if (mod != null) + ret.add(mod); + } + return ret; + } + + private List getMods() { + // Forge is an exploded directory as well + var minecraft = ForgeDevLaunchHandler.getPathFromResource("net/minecraft/client/Minecraft.class"); + var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class"); + if (minecraft.equals(forge)) { + // If both Forge and MC are in the same folder, then we are in intellij or gradle + // So we have to create a filtered jar + forge = CommonDevLaunchHandler.getForgeOnly(forge); + } + var ret = new ArrayList(); + ret.add(forge); + + var isTest = Boolean.getBoolean("forgedev.enableTestMods"); + if (!isTest) + return ret; + + var test = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/test/BaseTestMod.class"); + // Explode our test mods into a framework that treats them all as separate jars. + var tests = explodeTestMods(test); + ret.addAll(tests); + + return ret; + } + + private List explodeTestMods(Path path) { + var mod = new ArrayList(); + var memory = Jimfs.newFileSystem(); + + // First lets find all class files, that have the @Mod annotation and map packages to modids. + var packages = findTestModPackages(path); + for (var entry : packages.entrySet()) { + var pkg = entry.getKey(); + var modids = entry.getValue(); + + // Find resource directories for every mod in this group + var resourcePaths = new LinkedHashSet(); + for (var modid : modids) { + var rsc = path.resolve(modid); + if (Files.exists(rsc)) + resourcePaths.add(rsc); + } + + var root = memory.getPath(modids.iterator().next()); // use the first modid as our root + buildModsToml(resourcePaths, modids, root); + buildPackMeta(resourcePaths, root); + + if (Files.exists(root)) + resourcePaths.add(root); + + // We want just the class files from the root of the input paths. So make a new union with a filter. + var classes = UnionHelper.newFileSystem( + (name, base) -> { + if (name.endsWith("/")) { + if (name.startsWith("/")) + name = name.substring(1); + return pkg.startsWith(name) || name.startsWith(pkg); + } + return name.endsWith(".class") && name.startsWith(pkg); + }, new Path[] { path } + ); + + // And we want the resources, and none of the classes, just in case things get kinda fucky and somehow a package overlaps a sub package {shading?} + var resources = UnionHelper.newFileSystem((name, base) -> !name.endsWith(".class"), resourcePaths.toArray(Path[]::new)); + + // Union of unions, Yay! + var union = UnionHelper.newFileSystem(null, new Path[] { + classes.getRootDirectories().iterator().next(), + resources.getRootDirectories().iterator().next() + }); + mod.add(union.getRootDirectories().iterator().next()); + } + + return mod; + } + + // Find all the @Mods so we can generate tomls, and so we can pick packages. Right now it doesn't allow mods in parent directories, + // I could make it merge all the way up, but I think this would be fine. + private Map> findTestModPackages(Path path) { + var mods = new HashMap>(); + try (var files = Files.walk(path)) { + var classes = files + .filter(Files::isRegularFile) + .filter(p -> p.getFileName().toString().endsWith(".class")) + .toList(); + + for (var cls : classes) { + try (var is = Files.newInputStream(cls)) { + var reader = new ClassReader(is); + reader.accept(new ClassVisitor(Opcodes.ASM9) { + private String clsName; + @Override + public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { + this.clsName = name; + super.visit(version, access, name, signature, superName, interfaces); + } + + @Override + public AnnotationVisitor visitAnnotation(String name, boolean runtime) { + if (!"Lnet/minecraftforge/fml/common/Mod;".equals(name)) + return super.visitAnnotation(name, runtime); + + return new AnnotationVisitor(Opcodes.ASM9) { + @Override + public void visit(String key, Object value) { + if ("value".equals(key)) { + int idx = clsName.lastIndexOf('/'); + var pkg = clsName.substring(0, idx); + mods.computeIfAbsent(pkg, k -> new HashSet<>()).add((String)value); + + idx = pkg.lastIndexOf('/'); + while (idx != -1) { + pkg = pkg.substring(0, idx); + idx = pkg.lastIndexOf('/'); + if (mods.containsKey(pkg)) + throw new IllegalStateException("Invalid ForgeDev test mod layout, conflicting packages: " + pkg + " for " + clsName); + } + } + } + }; + } + }, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES); + } + } + } catch (IOException e) { + sneak(e); + } + return mods; + } + + // Builds or update the mods.toml file for all @Mods in this package + private void buildModsToml(Set resources, Set modids, Path root) { + var toml = resources.stream() + .map(p -> p.resolve(MODS_TOML)) + .filter(Files::exists) + .findFirst() + .orElse(null); + + Config cfg = null; + + if (toml != null) + cfg = new TomlParser().parse(toml, FileNotFoundAction.READ_NOTHING); + else + cfg = Config.inMemory(); + + boolean modified = false; + var defaults = Map.of( + "modLoader", "javafml", + "loaderVersion", "[0,)", + "license", "Doesnt fucking matter" + ); + + for (var key : defaults.keySet()) { + if (!cfg.contains(key)) { + cfg.set(key, defaults.get(key)); + modified = true; + } + } + + var modlist = new ArrayList(); + if (cfg.contains("mods")) { + @SuppressWarnings("unchecked") + var existing = ((List)cfg.get("mods")); + modlist.addAll(existing); + } + + for (var modid : modids) { + if (!modlist.stream().anyMatch(c -> modid.equals(c.get("modId")))) { + modified = true; + var tmp = Config.inMemory(); + tmp.set("modId", modid); + modlist.add(tmp); + } + } + + cfg.set("mods", modlist); + + if (modified) { + var target = root.resolve(MODS_TOML); + try { + Files.createDirectories(target.getParent()); + new TomlWriter().write(cfg, target, WritingMode.REPLACE); + } catch (IOException e) { + throw new IllegalStateException("Failed to create in memory toml: " + target, e); + } + } + } + + // This is optional, it just hides a warning screen when starting up. I should probably remove this once I restructure how data gen for test mods work and make it generate there. + private void buildPackMeta(Set paths, Path root) { + var existing = paths.stream() + .map(p -> p.resolve(PACK_META)) + .filter(Files::exists) + .findFirst() + .orElse(null); + + if (existing != null) + return; + var target = root.resolve(PACK_META); + try { + Files.createDirectories(target.getParent()); + Files.writeString(target, + """ + { + "pack": { + "description": "doesn't matter", + "pack_format": 18 + } + } + """, StandardCharsets.UTF_8, StandardOpenOption.WRITE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE); + } catch (IOException e) { + throw new IllegalStateException("Failed to make in memory pack.mcmeta: " + target, e); + } + } + + @SuppressWarnings("unchecked") + private static R sneak(Throwable e) throws E { + throw (E)e; + } +} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java index feac79b85d..e6596cc225 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeProdLaunchHandler.java @@ -7,14 +7,10 @@ package net.minecraftforge.fml.loading.targets; import java.nio.file.Path; import java.util.List; -import java.util.function.BiPredicate; - import org.jetbrains.annotations.ApiStatus; -import cpw.mods.jarhandling.SecureJar; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.LibraryFinder; -import net.minecraftforge.fml.loading.VersionInfo; @ApiStatus.Internal abstract class ForgeProdLaunchHandler extends CommonLaunchHandler { @@ -25,75 +21,22 @@ abstract class ForgeProdLaunchHandler extends CommonLaunchHandler { @Override public String getNaming() { return "srg"; } @Override public boolean isProduction() { return true; } - protected Path mvn(VersionInfo info, String artifact) { - return mvn(info, artifact, ""); - } - protected Path mvn(VersionInfo info, String artifact, String classifier) { - return mvn(info.forgeGroup(), artifact, classifier, info.mcAndForgeVersion()); - } - protected Path mvn(String group, String artifact, String classifier, String version) { - return LibraryFinder.findPathForMaven(group, artifact, "", classifier, version); - } - @Override - public LocatedPaths getMinecraftPaths() { + public List getMinecraftPaths() { var vers = FMLLoader.versionInfo(); - - // Minecraft - var mc = getMCPaths(vers); - - // mods (Forge) - var forgejar = mvn(vers, "forge", "universal"); - - // Libraries - var fmlcore = mvn(vers, "fmlcore"); - var javafmllang = mvn(vers, "javafmllanguage"); - var lowcodelang = mvn(vers, "lowcodelanguage"); - var mclang = mvn(vers, "mclanguage"); - - return new LocatedPaths( - mc, - null, - List.of(List.of(forgejar)), - List.of(fmlcore, javafmllang, lowcodelang, mclang) - ); + var mc = LibraryFinder.findPathForMaven(vers.forgeGroup(), "forge", "", this.type.name(), vers.mcAndForgeVersion()); + return List.of(mc); } - protected abstract List getMCPaths(VersionInfo vers); - public static class Client extends ForgeProdLaunchHandler { public Client() { super(CLIENT); } - - @Override - protected List getMCPaths(VersionInfo vers) { - var mc = mvn("net.minecraft", "client", "srg", vers.mcAndMCPVersion()); - var mcextra = mvn("net.minecraft", "client", "extra", vers.mcAndMCPVersion()); - var patches = mvn(vers, "forge", "client"); - return List.of(mc, mcextra, patches); - } } + public static class Server extends ForgeProdLaunchHandler { public Server() { super(SERVER); } - - @Override - protected List getMCPaths(VersionInfo vers) { - var mc = mvn("net.minecraft", "server", "srg", vers.mcAndMCPVersion()); - var mcextra = mvn("net.minecraft", "server", "extra", vers.mcAndMCPVersion()); - var patches = mvn(vers, "forge", "server"); - - // TODO: Get rid of this by filtering the file at install time. - // We only want it for it's resources. So filter everything else out. - BiPredicate filter = (path, base) -> { - return path.equals("META-INF/versions/") || // This is required because it bypasses our filter for the manifest, and it's a multi-release jar. - (!path.endsWith(".class") && !path.startsWith("META-INF/")); - }; - mcextra = SecureJar.from(filter, mcextra).getRootPath(); - - return List.of(mc, mcextra, patches); - } } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLaunchHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLaunchHandler.java index 60b292348d..a8aaa440a0 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLaunchHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLaunchHandler.java @@ -6,14 +6,13 @@ package net.minecraftforge.fml.loading.targets; import net.minecraftforge.fml.loading.FMLLoader; -import java.io.File; import java.nio.file.Path; import java.util.List; -import java.util.Objects; -import java.util.stream.Stream; - +import java.util.function.BiPredicate; import org.jetbrains.annotations.ApiStatus; +import cpw.mods.jarhandling.SecureJar; + @ApiStatus.Internal abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler { private ForgeUserdevLaunchHandler(LaunchType type) { @@ -21,8 +20,8 @@ abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler { } @Override - public LocatedPaths getMinecraftPaths() { - var legacyCP = Objects.requireNonNull(System.getProperty("legacyClassPath"), "Missing legacyClassPath, cannot find userdev jars").split(File.pathSeparator); + public List getMinecraftPaths() { + var legacyCP = findClassPath(); var vers = FMLLoader.versionInfo(); // Minecraft is extra jar {resources} + forge jar {patches} @@ -30,22 +29,8 @@ abstract class ForgeUserdevLaunchHandler extends CommonDevLaunchHandler { var extra = findJarOnClasspath(legacyCP, "client-extra"); var forge = findJarOnClasspath(legacyCP, "forge-" + vers.mcAndForgeVersion()); // We need to filter the forge jar to just MC code - var filter = getMcFilter(extra, List.of(forge)); - - // Mods is forge classes + anything from MOD_CLASSES - var modstream = Stream.>builder(); - // We want the forge as a seperate mod jar. - var forgemod = this.getForgeMod(List.of(forge)); - modstream.add(List.of(forgemod)); - // Mod code is in exploded directories - getModClasses().forEach((modid, paths) -> modstream.add(paths)); - - return new LocatedPaths( - List.of(forge, extra), - filter, - modstream.build().toList(), - getLibraries(legacyCP) - ); + var minecraft = CommonDevLaunchHandler.getMinecraftOnly(extra, forge); + return List.of(minecraft); } public static class Client extends ForgeUserdevLaunchHandler { diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java new file mode 100644 index 0000000000..c333a28b9c --- /dev/null +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/ForgeUserdevLocator.java @@ -0,0 +1,27 @@ +package net.minecraftforge.fml.loading.targets; + +import java.util.List; +import org.jetbrains.annotations.ApiStatus; +import net.minecraftforge.fml.loading.FMLLoader; +import net.minecraftforge.fml.loading.moddiscovery.AbstractModProvider; +import net.minecraftforge.forgespi.locating.IModLocator; + +@ApiStatus.Internal +public class ForgeUserdevLocator extends AbstractModProvider implements IModLocator { + @Override + public String name() { + return "forge_userdev_locator"; + } + + @Override + public List scanMods() { + var handler = FMLLoader.getLaunchHandler(); + + if (!(handler instanceof ForgeUserdevLaunchHandler)) + return List.of(); + var forge = ForgeDevLaunchHandler.getPathFromResource("net/minecraftforge/common/MinecraftForge.class"); + var filtered = ForgeUserdevLaunchHandler.getForgeOnly(forge); + var mod = createMod(filtered); + return List.of(mod); + } +} diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java new file mode 100644 index 0000000000..d4475212f3 --- /dev/null +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/targets/UnionHelper.java @@ -0,0 +1,51 @@ +package net.minecraftforge.fml.loading.targets; + +import java.io.IOException; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Path; +import java.nio.file.spi.FileSystemProvider; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.function.BiPredicate; + +import org.jetbrains.annotations.ApiStatus; + +@ApiStatus.Internal +final class UnionHelper { + private static final FileSystemProvider UFSP = getUnionFileSystemProvider(); + private static FileSystemProvider getUnionFileSystemProvider() { + for (var provider : FileSystemProvider.installedProviders()) { + if ("union".equals(provider.getScheme())) + return provider; + } + throw new IllegalStateException("Missing UnionFileSystemProvider"); + }; + + static FileSystem newFileSystem(BiPredicate filter, Path[] paths) { + try { + if (paths == null || paths.length == 0) + throw new IllegalArgumentException("Must contain atleast one path"); + + if (filter == null && paths.length == 1) + return FileSystems.newFileSystem(paths[0]); + + var map = new HashMap(); + if (filter != null) + map.put("filter", filter); + + var lst = new ArrayList<>(Arrays.asList(paths)); + var base = lst.remove(0); + map.put("additional", lst); + return UFSP.newFileSystem(base, map); + } catch (IOException e) { + return sneak(e); + } + } + + @SuppressWarnings("unchecked") + private static R sneak(Throwable e) throws E { + throw (E)e; + } +} diff --git a/fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService b/fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService index 8838a64024..48b92283d6 100644 --- a/fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService +++ b/fmlloader/src/main/resources/META-INF/services/cpw.mods.modlauncher.serviceapi.ITransformerDiscoveryService @@ -1,2 +1 @@ -net.minecraftforge.fml.loading.ModDirTransformerDiscoverer -net.minecraftforge.fml.loading.ClasspathTransformerDiscoverer \ No newline at end of file +net.minecraftforge.fml.loading.ModDirTransformerDiscoverer \ No newline at end of file diff --git a/fmlloader/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/fmlloader/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator index 0ace126c60..35831f8821 100644 --- a/fmlloader/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator +++ b/fmlloader/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator @@ -1,5 +1,5 @@ net.minecraftforge.fml.loading.moddiscovery.ModsFolderLocator -net.minecraftforge.fml.loading.moddiscovery.MavenDirectoryLocator -net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator net.minecraftforge.fml.loading.moddiscovery.MinecraftLocator net.minecraftforge.fml.loading.moddiscovery.ClasspathLocator +net.minecraftforge.fml.loading.targets.ForgeDevLocator +net.minecraftforge.fml.loading.targets.ForgeUserdevLocator diff --git a/fmlloader/src/main/resources/log4j2.xml b/fmlloader/src/main/resources/log4j2.xml index 6276295182..d7ef415f85 100644 --- a/fmlloader/src/main/resources/log4j2.xml +++ b/fmlloader/src/main/resources/log4j2.xml @@ -1,5 +1,5 @@ - + diff --git a/gradle.properties b/gradle.properties index 878bf1f7ec..c3e75e0e86 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,11 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false \ No newline at end of file +org.gradle.daemon=false + +JAVA_VERSION=17 +MC_VERSION=1.20.2 +MC_NEXT_VERSION=1.21 +MCP_VERSION=20230921.100330 +MAPPING_CHANNEL=official +MAPPING_VERSION=1.20.2 diff --git a/javafmllanguage/build.gradle b/javafmllanguage/build.gradle index a6ba148b64..aef1968dd2 100644 --- a/javafmllanguage/build.gradle +++ b/javafmllanguage/build.gradle @@ -1,12 +1,13 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'com.github.ben-manes.versions' - id 'org.javamodularity.moduleplugin' version '1.8.3' apply false - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } -dependencyUpdates.rejectVersionIf { isNonStable(it.candidate.version) } +apply from: rootProject.file('build_shared.gradle') dependencies { compileOnly(libs.nulls) @@ -14,38 +15,25 @@ dependencies { implementation(project(':fmlcore')) } -task sourcesJar(type: Jar) { - archiveClassifier = 'sources' - from sourceSets.main.allSource +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() } -ext { - MANIFESTS = [ - '': [ - 'FMLModType': 'LANGPROVIDER', - 'Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'Git-Commit': GIT_INFO.abbreviatedId, - 'Git-Branch': GIT_INFO.branch, - 'Build-Number': "${System.getenv('BUILD_NUMBER')?:0}", - ] as LinkedHashMap, - 'net/minecraftforge/fml/loading/': [ - 'Specification-Title': 'FMLLoader', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'FML Loader', - 'Implementation-Version': '1.0', - 'Implementation-Vendor': 'Forge' - ] as LinkedHashMap - ] -} - -jar.doFirst { - manifest.attributes['Automatic-Module-Name'] = project.name - MANIFESTS.each { pkg, values -> - if (pkg == '') - manifest.attributes(values) - else - manifest.attributes(values, pkg) +tasks.named('jar', Jar).configure { + manifest { + attributes([ + 'Automatic-Module-Name': 'net.minecraftforge.javafmlmod', + 'FMLModType': 'LANGPROVIDER' + ] as LinkedHashMap) + attributes([ + 'Specification-Title': 'JavaFMLMod', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': '1', + 'Implementation-Title': 'JavaFMLMod', + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': FORGE_VERSION + ] as LinkedHashMap, 'net/minecraftforge/fml/javafmlmod/') } } @@ -55,16 +43,22 @@ tasks.withType(JavaCompile) { license { header = rootProject.file('LICENSE-header.txt') - - include 'net/minecraftforge/' } -artifacts { - archives jar - archives sourcesJar -} - -publishing.publications.mavenJava(MavenPublication) { - from components.java - artifact sourcesJar +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'javafmllanguage' + pom { + name = project.name + description = 'Language provider for Minecraft Forge that provides basic java mod functionality' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } \ No newline at end of file diff --git a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java index cdfcce93fc..630070342c 100644 --- a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java +++ b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/AutomaticEventSubscriber.java @@ -6,67 +6,74 @@ package net.minecraftforge.fml.javafmlmod; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.Logging; import net.minecraftforge.fml.ModContainer; import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; import net.minecraftforge.forgespi.language.ModFileScanData; +import net.minecraftforge.forgespi.language.ModFileScanData.AnnotationData; +import net.minecraftforge.forgespi.language.ModFileScanData.EnumData; import net.minecraftforge.fml.loading.FMLEnvironment; -import net.minecraftforge.fml.loading.moddiscovery.ModAnnotation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.objectweb.asm.Type; -import java.util.Arrays; -import java.util.EnumSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static net.minecraftforge.fml.Logging.LOADING; - /** - * Automatic eventbus subscriber - reads {@link net.minecraftforge.fml.common.Mod.EventBusSubscriber} - * annotations and passes the class instances to the {@link net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus} + * Automatic eventbus subscriber - reads {@link EventBusSubscriber} + * annotations and passes the class instances to the {@link nBus} * defined by the annotation. Defaults to {@code MinecraftForge#EVENT_BUS} */ -public class AutomaticEventSubscriber -{ +public class AutomaticEventSubscriber { private static final Logger LOGGER = LogManager.getLogger(); - private static final Type AUTO_SUBSCRIBER = Type.getType(Mod.EventBusSubscriber.class); + private static final Type AUTO_SUBSCRIBER = Type.getType(EventBusSubscriber.class); private static final Type MOD_TYPE = Type.getType(Mod.class); - public static void inject(final ModContainer mod, final ModFileScanData scanData, final ClassLoader loader) - { - if (scanData == null) return; - LOGGER.debug(LOADING,"Attempting to inject @EventBusSubscriber classes into the eventbus for {}", mod.getModId()); - List ebsTargets = scanData.getAnnotations().stream(). - filter(annotationData -> AUTO_SUBSCRIBER.equals(annotationData.annotationType())). - collect(Collectors.toList()); - Map modids = scanData.getAnnotations().stream(). - filter(annotationData -> MOD_TYPE.equals(annotationData.annotationType())). - collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value"))); - ebsTargets.forEach(ad -> { - @SuppressWarnings("unchecked") - final List sidesValue = (List)ad.annotationData(). - getOrDefault("value", Arrays.asList(new ModAnnotation.EnumHolder(null, "CLIENT"), new ModAnnotation.EnumHolder(null, "DEDICATED_SERVER"))); - final EnumSet sides = sidesValue.stream().map(eh -> Dist.valueOf(eh.getValue())). - collect(Collectors.toCollection(() -> EnumSet.noneOf(Dist.class))); - final String modId = (String)ad.annotationData().getOrDefault("modid", modids.getOrDefault(ad.clazz().getClassName(), mod.getModId())); - final ModAnnotation.EnumHolder busTargetHolder = (ModAnnotation.EnumHolder)ad.annotationData().getOrDefault("bus", new ModAnnotation.EnumHolder(null, "FORGE")); - final Mod.EventBusSubscriber.Bus busTarget = Mod.EventBusSubscriber.Bus.valueOf(busTargetHolder.getValue()); + public static void inject(ModContainer mod, ModFileScanData scanData, ClassLoader loader) { + if (scanData == null) return; + LOGGER.debug(Logging.LOADING, "Attempting to inject @EventBusSubscriber classes into the eventbus for {}", mod.getModId()); + + var targets = scanData.getAnnotations().stream() + .filter(data -> AUTO_SUBSCRIBER.equals(data.annotationType())) + .toList(); + + var modids = scanData.getAnnotations().stream() + .filter(data -> MOD_TYPE.equals(data.annotationType())) + .collect(Collectors.toMap(a -> a.clazz().getClassName(), a -> (String)a.annotationData().get("value"))); + + var defaultSides = List.of(new EnumData(null, "CLIENT"), new EnumData(null, "DEDICATED_SERVER")); + var defaultBus = new EnumData(null, "FORGE"); + + for (var data : targets) { + var modId = modids.getOrDefault(data.clazz().getClassName(), mod.getModId()); + modId = value(data, "modid", modId); + + var sidesValue = value(data, "value", defaultSides); + var sides = sidesValue.stream() + .map(EnumData::value) + .map(Dist::valueOf) + .collect(Collectors.toSet()); + + var busName = value(data, "bus", defaultBus).value(); + var busTarget = Bus.valueOf(busName); if (Objects.equals(mod.getModId(), modId) && sides.contains(FMLEnvironment.dist)) { - try - { - LOGGER.debug(LOADING, "Auto-subscribing {} to {}", ad.clazz().getClassName(), busTarget); - busTarget.bus().get().register(Class.forName(ad.clazz().getClassName(), true, loader)); - } - catch (ClassNotFoundException e) - { - LOGGER.fatal(LOADING, "Failed to load mod class {} for @EventBusSubscriber annotation", ad.clazz(), e); + try { + LOGGER.debug(Logging.LOADING, "Auto-subscribing {} to {}", data.clazz().getClassName(), busTarget); + busTarget.bus().get().register(Class.forName(data.clazz().getClassName(), true, loader)); + } catch (ClassNotFoundException e) { + LOGGER.fatal(Logging.LOADING, "Failed to load mod class {} for @EventBusSubscriber annotation", data.clazz(), e); throw new RuntimeException(e); } } - }); + } } + @SuppressWarnings("unchecked") + private static R value(AnnotationData data, String key, R value) { + return (R)data.annotationData().getOrDefault(key, value); + } } diff --git a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java index e0186a00bc..d007a437b2 100644 --- a/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java +++ b/javafmllanguage/src/main/java/net/minecraftforge/fml/javafmlmod/FMLModContainer.java @@ -25,8 +25,7 @@ import java.lang.reflect.InvocationTargetException; import java.util.Objects; import java.util.Optional; -public class FMLModContainer extends ModContainer -{ +public class FMLModContainer extends ModContainer { private static final Logger LOGGER = LogManager.getLogger(); private static final Marker LOADING = MarkerManager.getMarker("LOADING"); private final ModFileScanData scanResults; @@ -34,8 +33,7 @@ public class FMLModContainer extends ModContainer private Object modInstance; private final Class modClass; - public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) - { + public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) { super(info); LOGGER.debug(LOADING,"Creating FMLModContainer instance for {}", className); this.scanResults = modFileScanResults; @@ -44,66 +42,60 @@ public class FMLModContainer extends ModContainer this.configHandler = Optional.of(ce->this.eventBus.post(ce.self())); final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this); this.contextExtension = () -> contextExtension; - try - { - var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow(); - modClass = Class.forName(layer, className); + + + try { + var moduleName = info.getOwningFile().moduleName(); + var module = gameLayer.findModule(moduleName) + .orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer)); + modClass = Class.forName(module, className); LOGGER.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader()); - } - catch (Throwable e) - { + } catch (Throwable e) { LOGGER.error(LOADING, "Failed to load class {}", className, e); throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e); } } - private void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) - { + private void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) { LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable)); } - private void constructMod() - { - try - { + private void constructMod() { + try { LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName()); this.modInstance = modClass.getDeclaredConstructor().newInstance(); LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName()); - } - catch (Throwable e) - { + } catch (Throwable e) { // When a mod constructor throws an exception, it's wrapped in an InvocationTargetException which hides the // actual exception from the mod loading error screen. if (e instanceof InvocationTargetException wrapped) e = Objects.requireNonNullElse(wrapped.getCause(), e); // unwrap the exception - LOGGER.error(LOADING,"Failed to create mod instance. ModID: {}, class {}", getModId(), modClass.getName(), e); + LOGGER.error(LOADING, "Failed to create mod instance. ModID: {}, class {}", getModId(), modClass.getName(), e); throw new ModLoadingException(modInfo, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmod", e, modClass); } + try { LOGGER.trace(LOADING, "Injecting Automatic event subscribers for {}", getModId()); AutomaticEventSubscriber.inject(this, this.scanResults, this.modClass.getClassLoader()); LOGGER.trace(LOADING, "Completed Automatic event subscribers for {}", getModId()); } catch (Throwable e) { - LOGGER.error(LOADING,"Failed to register automatic subscribers. ModID: {}, class {}", getModId(), modClass.getName(), e); + LOGGER.error(LOADING, "Failed to register automatic subscribers. ModID: {}, class {}", getModId(), modClass.getName(), e); throw new ModLoadingException(modInfo, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmod", e, modClass); } } @Override - public boolean matches(Object mod) - { + public boolean matches(Object mod) { return mod == modInstance; } @Override - public Object getMod() - { + public Object getMod() { return modInstance; } - public IEventBus getEventBus() - { + public IEventBus getEventBus() { return this.eventBus; } diff --git a/lowcodelanguage/build.gradle b/lowcodelanguage/build.gradle index 49b83ad6fc..41fff6e91e 100644 --- a/lowcodelanguage/build.gradle +++ b/lowcodelanguage/build.gradle @@ -1,11 +1,18 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'org.javamodularity.moduleplugin' version '1.8.3' apply false - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } -java.withSourcesJar() +apply from: rootProject.file('build_shared.gradle') + +java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) + withSourcesJar() +} dependencies { compileOnly(libs.nulls) @@ -17,16 +24,16 @@ dependencies { tasks.named('jar', Jar).configure { manifest { attributes([ - 'Automatic-Module-Name': project.name.toLowerCase(), + 'Automatic-Module-Name': 'net.minecraftforge.lowcodemod', 'FMLModType': 'LANGPROVIDER' - ] as java.util.LinkedHashMap) + ] as LinkedHashMap) attributes([ - 'Specification-Title': 'LowCodeMod', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1.0', - 'Implementation-Title': project.name, - 'Implementation-Version': FORGE_VERSION.split('\\.')[0], //project.version, TODO: Split out into a real versioned system, for now use the default that net.minecraftforge.fml.loading.LanguageLoadingProvider.loadLanguageProviders() used - 'Implementation-Vendor': 'Forge Development LLC' + 'Specification-Title': 'LowCodeMod', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': '1.0', + 'Implementation-Title': project.name, + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': FORGE_VERSION.split('\\.')[0] ] as java.util.LinkedHashMap, 'net/minecraftforge/fml/lowcodemod/') } } @@ -37,9 +44,22 @@ tasks.withType(JavaCompile) { license { header = rootProject.file('LICENSE-header.txt') - include 'net/minecraftforge/' } -publishing.publications.mavenJava(MavenPublication) { - from components.java +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'lowcodelanguage' + pom { + name = project.name + description = 'Language provider for Minecraft Forge that loads resource packs as mods' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } \ No newline at end of file diff --git a/mclanguage/build.gradle b/mclanguage/build.gradle index dead425218..1ed0fd341b 100644 --- a/mclanguage/build.gradle +++ b/mclanguage/build.gradle @@ -1,9 +1,14 @@ +import net.minecraftforge.gradleutils.PomUtils + plugins { - id 'org.cadixdev.licenser' id 'java-library' - id 'jacoco' + id 'maven-publish' + id 'org.cadixdev.licenser' + id 'net.minecraftforge.gradleutils' } +apply from: rootProject.file('build_shared.gradle') + dependencies { compileOnly(libs.nulls) implementation(project(':fmlloader')) @@ -11,22 +16,23 @@ dependencies { } java { + toolchain.languageVersion = JavaLanguageVersion.of(JAVA_VERSION) withSourcesJar() } tasks.named('jar', Jar).configure { manifest { attributes([ - 'Automatic-Module-Name': project.name.toLowerCase(), - 'FMLModType': 'LANGPROVIDER', + 'Automatic-Module-Name': 'net.minecraftforge.mclanguageprovider', + 'FMLModType': 'LANGPROVIDER' ] as LinkedHashMap) attributes([ - 'Specification-Title': 'MCLanguage', - 'Specification-Vendor': 'Forge Development LLC', - 'Specification-Version': '1', - 'Implementation-Title': 'MCLanguage', - 'Implementation-Version': '1.0', - 'Implementation-Vendor': 'Forge Development LLC', + 'Specification-Title': 'MCLanguage', + 'Specification-Vendor': 'Forge Development LLC', + 'Specification-Version': '1', + 'Implementation-Title': 'MCLanguage', + 'Implementation-Vendor': 'Forge Development LLC', + 'Implementation-Version': '1.0' ] as LinkedHashMap, 'net/minecraftforge/fml/mclanguageprovider/') } } @@ -37,9 +43,22 @@ tasks.withType(JavaCompile) { license { header = rootProject.file('LICENSE-header.txt') - include 'net/minecraftforge/' } -publishing.publications.mavenJava(MavenPublication) { - from components.java +publishing { + publications.register('mavenJava', MavenPublication).configure { + from components.java + artifactId = 'mclanguage' + pom { + name = project.name + description = 'Language provider for Minecraft Forge that provides Minecraft Itself' + url = 'https://github.com/MinecraftForge/MinecraftForge' + PomUtils.setGitHubDetails(pom, 'MinecraftForge') + license PomUtils.Licenses.LGPLv2_1 + } + } + + repositories { + maven gradleutils.publishingForgeMaven + } } \ No newline at end of file diff --git a/mdk/build.gradle b/mdk/build.gradle index 3864a932ef..a905511f67 100644 --- a/mdk/build.gradle +++ b/mdk/build.gradle @@ -73,12 +73,6 @@ minecraft { // You can set various levels here. // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels property 'forge.logging.console.level', 'debug' - - mods { - "${mod_id}" { - source sourceSets.main - } - } } client { @@ -169,13 +163,12 @@ tasks.named('processResources', ProcessResources).configure { tasks.named('jar', Jar).configure { manifest { attributes([ - 'Specification-Title' : mod_id, - 'Specification-Vendor' : mod_authors, - 'Specification-Version' : '1', // We are version 1 of ourselves - 'Implementation-Title' : project.name, - 'Implementation-Version' : project.jar.archiveVersion, - 'Implementation-Vendor' : mod_authors, - 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + 'Specification-Title' : mod_id, + 'Specification-Vendor' : mod_authors, + 'Specification-Version' : '1', // We are version 1 of ourselves + 'Implementation-Title' : project.name, + 'Implementation-Version' : project.jar.archiveVersion, + 'Implementation-Vendor' : mod_authors ]) } @@ -205,3 +198,20 @@ publishing { tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } + +eclipse { + // Run everytime eclipse builds the code + //autoBuildTasks genEclipseRuns + // Run when importing the project + synchronizationTasks 'genEclipseRuns' +} + +// Merge the resources and classes into the same directory. +// This is done because java expects modules to be in a single directory. +// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem +// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later. +sourceSets.each { + def dir = layout.buildDirectory.dir("sourcesSets/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir +} diff --git a/server_files/args.txt b/server_files/args.txt deleted file mode 100644 index 02061863ea..0000000000 --- a/server_files/args.txt +++ /dev/null @@ -1,13 +0,0 @@ --p @MODULE_PATH@ ---add-modules @MODULES@ ---add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming --Djava.net.preferIPv6Addresses=system --DignoreList=@IGNORE_LIST@ --DlibraryDirectory=libraries --DlegacyClassPath=@CLASS_PATH@ -net.minecraftforge.bootstrap.BootstrapLauncher ---launchTarget @TASK@ ---fml.forgeVersion @FORGE_VERSION@ ---fml.mcVersion @MC_VERSION@ ---fml.forgeGroup @FORGE_GROUP@ ---fml.mcpVersion @MCP_VERSION@ \ No newline at end of file diff --git a/server_files/run.bat b/server_files/run.bat deleted file mode 100644 index 5c7d11358f..0000000000 --- a/server_files/run.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -REM Forge requires a configured set of both JVM and program arguments. -REM Add custom JVM arguments to the user_jvm_args.txt -REM Add custom program arguments {such as nogui} to this file in the next line before the %* or -REM pass them to this script directly -java @user_jvm_args.txt @libraries/@MAVEN_PATH@/win_args.txt %* -pause diff --git a/server_files/run.sh b/server_files/run.sh deleted file mode 100644 index 64f6f9a7cd..0000000000 --- a/server_files/run.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env sh -# Forge requires a configured set of both JVM and program arguments. -# Add custom JVM arguments to the user_jvm_args.txt -# Add custom program arguments {such as nogui} to this file in the next line before the "$@" or -# pass them to this script directly -java @user_jvm_args.txt @libraries/@MAVEN_PATH@/unix_args.txt "$@" diff --git a/server_files/user_jvm_args.txt b/server_files/user_jvm_args.txt deleted file mode 100644 index 7fbf8a7ab9..0000000000 --- a/server_files/user_jvm_args.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Xmx and Xms set the maximum and minimum RAM usage, respectively. -# They can take any number, followed by an M or a G. -# M means Megabyte, G means Gigabyte. -# For example, to set the maximum to 3GB: -Xmx3G -# To set the minimum to 2.5GB: -Xms2500M - -# A good default for a modded server is 4GB. -# Uncomment the next line to set it. -# -Xmx4G \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 79417946ae..dfaf485fbd 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,7 +3,7 @@ import org.gradle.internal.os.OperatingSystem pluginManagement { repositories { gradlePluginPortal() - mavenLocal() + //mavenLocal() maven { url = 'https://maven.minecraftforge.net/' } } } @@ -25,10 +25,12 @@ plugins { dependencyResolutionManagement { versionCatalogs { libs { - library('forgespi', 'net.minecraftforge:forgespi:7.1.0') // Needs modlauncher - library('bootstrap', 'net.minecraftforge:bootstrap:1.2.0') // Needs modlauncher - library('modlauncher', 'net.minecraftforge:modlauncher:10.1.1') // Needs securemodules - library('securemodules', 'net.minecraftforge:securemodules:2.2.3') // Needs unsafe + library('forgespi', 'net.minecraftforge:forgespi:7.1.1') // Needs modlauncher + library('bootstrap', 'net.minecraftforge:bootstrap:2.0.0') // Needs modlauncher + library('bootstrap-api', 'net.minecraftforge:bootstrap-api:2.0.0') + library('bootstrap-shim', 'net.minecraftforge:bootstrap-shim:2.0.0') + library('modlauncher', 'net.minecraftforge:modlauncher:10.1.2') // Needs securemodules + library('securemodules', 'net.minecraftforge:securemodules:2.2.7') // Needs unsafe library('unsafe', 'net.minecraftforge:unsafe:0.9.2') library('accesstransformers', 'net.minecraftforge:accesstransformers:8.1.1') library('antlr-runtime', 'org.antlr:antlr4-runtime:4.9.1') // Needed by Access Transformer because parsing a simple text file was too complicated @@ -37,16 +39,16 @@ dependencyResolutionManagement { library('eventbus', 'net.minecraftforge:eventbus:6.2.0') library('typetools', 'net.jodah:typetools:0.6.3') // Needed by EventBus because of lambdas library('mergetool-api', 'net.minecraftforge:mergetool-api:1.0') - + library('mixin', 'org.spongepowered:mixin:0.8.5') library('nulls', 'org.jetbrains:annotations:23.0.0') // Got to have our null annotations! - library('slf4j-api', 'org.slf4j:slf4j-api:1.8.0-beta4') + library('slf4j-api', 'org.slf4j:slf4j-api:2.0.7') library('maven-artifact', 'org.apache.maven:maven-artifact:3.8.5') - + // Google's InMemory File System. Used by ForgeDev Tests for now, but could be useful for a lot of things. library('jimfs', 'com.google.jimfs:jimfs:1.3.0') bundle('jimfs', ['guava', 'failureaccess']) - + // ASM it's used for so many of our hacks version('asm', '9.6') library('asm', 'org.ow2.asm', 'asm' ).versionRef('asm') @@ -55,27 +57,27 @@ dependencyResolutionManagement { library('asm-commons', 'org.ow2.asm', 'asm-commons' ).versionRef('asm') library('asm-analysis', 'org.ow2.asm', 'asm-analysis').versionRef('asm') bundle('asm', ['asm', 'asm-tree', 'asm-util', 'asm-commons', 'asm-analysis']) - + // Terminal Console Appender.. essentually make pretty colors in the console, but it's been a PITA library('terminalconsoleappender', 'net.minecrell:terminalconsoleappender:1.2.0') version('jline', '3.12.1') library('jline-reader', 'org.jline', 'jline-reader' ).versionRef('jline') library('jline-terminal', 'org.jline', 'jline-terminal').versionRef('jline') bundle('terminalconsoleappender', ['terminalconsoleappender', 'jline-reader', 'jline-terminal']) - + // The core of our configuration system, it has many flaws, but it works for the most part version('night-config', '3.6.4') library('night-config-toml', 'com.electronwill.night-config', 'toml').versionRef('night-config') library('night-config-core', 'com.electronwill.night-config', 'core').versionRef('night-config') bundle('night-config', ['night-config-toml', 'night-config-core']) - + // Jar in Jar FileSystem version('jarjar', '0.3.19') library('jarjar-fs', 'net.minecraftforge', 'JarJarFileSystems').versionRef('jarjar') library('jarjar-meta', 'net.minecraftforge', 'JarJarMetadata' ).versionRef('jarjar') library('jarjar-selector', 'net.minecraftforge', 'JarJarSelector' ).versionRef('jarjar') bundle('jarjar', ['jarjar-fs', 'jarjar-selector', 'jarjar-meta']) - + // These are libraries shipped by the MC launcher, try and keep them in sync with the manifest // but honestly if we don't it just means we ship them as normal libraries by adding them to the installer config in the forge project library('gson', 'com.google.code.gson:gson:2.10.1') @@ -88,8 +90,8 @@ dependencyResolutionManagement { library('mojang-logging', 'com.mojang:logging:1.1.1') library('jopt-simple', 'net.sf.jopt-simple:jopt-simple:5.0.4') library('commons-io', 'commons-io:commons-io:2.13.0') - - version('lwjgl', '3.3.1') + + version('lwjgl', '3.3.2') library('lwjgl', 'org.lwjgl', 'lwjgl' ).versionRef('lwjgl') library('lwjgl-glfw', 'org.lwjgl', 'lwjgl-glfw' ).versionRef('lwjgl') library('lwjgl-opengl', 'org.lwjgl', 'lwjgl-opengl').versionRef('lwjgl') @@ -110,13 +112,14 @@ include 'lowcodelanguage' include 'fmlearlydisplay' include ':mcp' -include ':forge' - project(":mcp").projectDir = file("projects/mcp") + +include ':forge' project(":forge").projectDir = file("projects/forge") +project(':forge').buildFileName = '../../build_forge.gradle' if (!System.env.TEAMCITY_VERSION) { - include ':clean' - project(':clean').projectDir = file('projects/clean') - project(':clean').buildFileName = '../../build_clean.gradle' + include ':clean' + project(':clean').projectDir = file('projects/clean') + project(':clean').buildFileName = '../../build_clean.gradle' } diff --git a/src/fmllauncher/resources/forge_icon.png b/src/fmllauncher/resources/forge_icon.png deleted file mode 100644 index 3c791c5805..0000000000 Binary files a/src/fmllauncher/resources/forge_icon.png and /dev/null differ diff --git a/src/fmllauncher/resources/lekeystore.jks b/src/fmllauncher/resources/lekeystore.jks deleted file mode 100644 index 12749d786b..0000000000 Binary files a/src/fmllauncher/resources/lekeystore.jks and /dev/null differ diff --git a/src/fmllauncher/resources/log4j2.xml b/src/fmllauncher/resources/log4j2.xml deleted file mode 100644 index d7ef415f85..0000000000 --- a/src/fmllauncher/resources/log4j2.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/fmllaunchertest/java/net/minecraftforge/fml/test/TopologicalSortTests.java b/src/fmllaunchertest/java/net/minecraftforge/fml/test/TopologicalSortTests.java deleted file mode 100644 index b0639430e5..0000000000 --- a/src/fmllaunchertest/java/net/minecraftforge/fml/test/TopologicalSortTests.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Minecraft Forge - * Copyright (c) 2016-2021. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package net.minecraftforge.fml.test; - -import com.google.common.graph.GraphBuilder; -import com.google.common.graph.MutableGraph; -import net.minecraftforge.fml.loading.toposort.CyclePresentException; -import net.minecraftforge.fml.loading.toposort.StronglyConnectedComponentDetector; -import net.minecraftforge.fml.loading.toposort.TopologicalSort; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Set; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; - -/** - * Tests for topological sort. - */ -public class TopologicalSortTests { - - @Test - @DisplayName("strongly connected components") - @SuppressWarnings("unchecked") - void testScc() { - MutableGraph graph = GraphBuilder.directed().build(); - graph.putEdge(2, 4); - graph.putEdge(4, 7); - graph.putEdge(4, 6); - graph.putEdge(6, 1); - graph.putEdge(3, 4); - graph.putEdge(1, 4); - graph.putEdge(3, 1); - Set> components = new StronglyConnectedComponentDetector<>(graph).getComponents(); - assertThat(components, containsInAnyOrder(contains(2), contains(3), contains(7), containsInAnyOrder(1, 4, 6))); - } - - @Test - @DisplayName("strongly connected components 2") - @SuppressWarnings("unchecked") - void testScc2() { - MutableGraph graph = GraphBuilder.directed().build(); - graph.putEdge(2, 4); - graph.putEdge(4, 8); - graph.putEdge(8, 2); - graph.putEdge(2, 1); - graph.putEdge(2, 3); - graph.putEdge(1, 9); - graph.putEdge(9, 7); - graph.putEdge(7, 5); - graph.putEdge(5, 1); - graph.putEdge(5, 3); - graph.putEdge(3, 6); - graph.putEdge(6, 5); - graph.putEdge(9, 3); - Set> components = new StronglyConnectedComponentDetector<>(graph).getComponents(); - assertThat(components, containsInAnyOrder(containsInAnyOrder(1, 3, 5, 6, 7, 9), containsInAnyOrder(2, 4, 8))); - } - - @Test - @DisplayName("basic sort") - void testBasicSort() { - MutableGraph graph = GraphBuilder.directed().build(); - graph.putEdge(2, 4); - graph.putEdge(4, 7); - graph.putEdge(4, 6); - graph.putEdge(3, 4); - graph.putEdge(1, 4); - graph.putEdge(3, 1); - List list = TopologicalSort.topologicalSort(graph, Comparator.naturalOrder()); - assertThat(list, contains(2, 3, 1, 4, 6, 7)); - } - - @Test - @DisplayName("basic sort 2") - void testBasicSort2() { - MutableGraph graph = GraphBuilder.directed().build(); - graph.putEdge(7, 6); - graph.putEdge(8, 6); - graph.putEdge(8, 2); - graph.putEdge(12, 2); - graph.putEdge(2, 6); - graph.putEdge(6, 1); - graph.putEdge(2, 4); - graph.putEdge(2, 1); - graph.putEdge(1, 4); - graph.putEdge(1, 3); - graph.putEdge(4, 5); - graph.putEdge(1, 5); - graph.putEdge(5, 3); - graph.putEdge(1, 10); - graph.putEdge(3, 11); - graph.putEdge(5, 9); - graph.putEdge(11, 9); - graph.putEdge(11, 13); - graph.putEdge(10, 13); - List list = TopologicalSort.topologicalSort(graph, Collections.reverseOrder()); - assertThat(list, contains(12, 8, 7, 2, 6, 1, 10, 4, 5, 3, 11, 13, 9)); - } - - @Test - @DisplayName("loop sort") - void testLoopSort() { - MutableGraph graph = GraphBuilder.directed().build(); - graph.putEdge(2, 4); - graph.putEdge(4, 7); - graph.putEdge(4, 6); - graph.putEdge(6, 1); - graph.putEdge(3, 4); - graph.putEdge(1, 4); - graph.putEdge(3, 1); - CyclePresentException ex = Assertions.assertThrows(CyclePresentException.class, () -> { - TopologicalSort.topologicalSort(graph, Comparator.naturalOrder()); - }); - assertThat(ex.getCycles(), contains(containsInAnyOrder(1, 4, 6))); - } -} diff --git a/src/generated/resources/assets/minecraft/atlases/blocks.json b/src/main/generated/assets/minecraft/atlases/blocks.json similarity index 100% rename from src/generated/resources/assets/minecraft/atlases/blocks.json rename to src/main/generated/assets/minecraft/atlases/blocks.json diff --git a/src/generated/resources/assets/minecraft/sounds.json b/src/main/generated/assets/minecraft/sounds.json similarity index 100% rename from src/generated/resources/assets/minecraft/sounds.json rename to src/main/generated/assets/minecraft/sounds.json diff --git a/src/generated/resources/data/forge/tags/blocks/barrels.json b/src/main/generated/data/forge/tags/blocks/barrels.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/barrels.json rename to src/main/generated/data/forge/tags/blocks/barrels.json diff --git a/src/generated/resources/data/forge/tags/blocks/barrels/wooden.json b/src/main/generated/data/forge/tags/blocks/barrels/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/barrels/wooden.json rename to src/main/generated/data/forge/tags/blocks/barrels/wooden.json diff --git a/src/generated/resources/data/forge/tags/blocks/bookshelves.json b/src/main/generated/data/forge/tags/blocks/bookshelves.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/bookshelves.json rename to src/main/generated/data/forge/tags/blocks/bookshelves.json diff --git a/src/generated/resources/data/forge/tags/blocks/chests.json b/src/main/generated/data/forge/tags/blocks/chests.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/chests.json rename to src/main/generated/data/forge/tags/blocks/chests.json diff --git a/src/generated/resources/data/forge/tags/blocks/chests/ender.json b/src/main/generated/data/forge/tags/blocks/chests/ender.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/chests/ender.json rename to src/main/generated/data/forge/tags/blocks/chests/ender.json diff --git a/src/generated/resources/data/forge/tags/blocks/chests/trapped.json b/src/main/generated/data/forge/tags/blocks/chests/trapped.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/chests/trapped.json rename to src/main/generated/data/forge/tags/blocks/chests/trapped.json diff --git a/src/generated/resources/data/forge/tags/blocks/chests/wooden.json b/src/main/generated/data/forge/tags/blocks/chests/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/chests/wooden.json rename to src/main/generated/data/forge/tags/blocks/chests/wooden.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone.json b/src/main/generated/data/forge/tags/blocks/cobblestone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/cobblestone.json rename to src/main/generated/data/forge/tags/blocks/cobblestone.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json b/src/main/generated/data/forge/tags/blocks/cobblestone/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json rename to src/main/generated/data/forge/tags/blocks/cobblestone/deepslate.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json b/src/main/generated/data/forge/tags/blocks/cobblestone/infested.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json rename to src/main/generated/data/forge/tags/blocks/cobblestone/infested.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json b/src/main/generated/data/forge/tags/blocks/cobblestone/mossy.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json rename to src/main/generated/data/forge/tags/blocks/cobblestone/mossy.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json b/src/main/generated/data/forge/tags/blocks/cobblestone/normal.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json rename to src/main/generated/data/forge/tags/blocks/cobblestone/normal.json diff --git a/src/generated/resources/data/forge/tags/blocks/end_stones.json b/src/main/generated/data/forge/tags/blocks/end_stones.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/end_stones.json rename to src/main/generated/data/forge/tags/blocks/end_stones.json diff --git a/src/generated/resources/data/forge/tags/blocks/enderman_place_on_blacklist.json b/src/main/generated/data/forge/tags/blocks/enderman_place_on_blacklist.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/enderman_place_on_blacklist.json rename to src/main/generated/data/forge/tags/blocks/enderman_place_on_blacklist.json diff --git a/src/generated/resources/data/forge/tags/blocks/fence_gates.json b/src/main/generated/data/forge/tags/blocks/fence_gates.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/fence_gates.json rename to src/main/generated/data/forge/tags/blocks/fence_gates.json diff --git a/src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.json b/src/main/generated/data/forge/tags/blocks/fence_gates/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.json rename to src/main/generated/data/forge/tags/blocks/fence_gates/wooden.json diff --git a/src/generated/resources/data/forge/tags/blocks/fences.json b/src/main/generated/data/forge/tags/blocks/fences.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/fences.json rename to src/main/generated/data/forge/tags/blocks/fences.json diff --git a/src/generated/resources/data/forge/tags/blocks/fences/nether_brick.json b/src/main/generated/data/forge/tags/blocks/fences/nether_brick.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/fences/nether_brick.json rename to src/main/generated/data/forge/tags/blocks/fences/nether_brick.json diff --git a/src/generated/resources/data/forge/tags/blocks/fences/wooden.json b/src/main/generated/data/forge/tags/blocks/fences/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/fences/wooden.json rename to src/main/generated/data/forge/tags/blocks/fences/wooden.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass.json b/src/main/generated/data/forge/tags/blocks/glass.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass.json rename to src/main/generated/data/forge/tags/blocks/glass.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/black.json b/src/main/generated/data/forge/tags/blocks/glass/black.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/black.json rename to src/main/generated/data/forge/tags/blocks/glass/black.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/blue.json b/src/main/generated/data/forge/tags/blocks/glass/blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/blue.json rename to src/main/generated/data/forge/tags/blocks/glass/blue.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/brown.json b/src/main/generated/data/forge/tags/blocks/glass/brown.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/brown.json rename to src/main/generated/data/forge/tags/blocks/glass/brown.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/colorless.json b/src/main/generated/data/forge/tags/blocks/glass/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/colorless.json rename to src/main/generated/data/forge/tags/blocks/glass/colorless.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/cyan.json b/src/main/generated/data/forge/tags/blocks/glass/cyan.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/cyan.json rename to src/main/generated/data/forge/tags/blocks/glass/cyan.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/gray.json b/src/main/generated/data/forge/tags/blocks/glass/gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/gray.json rename to src/main/generated/data/forge/tags/blocks/glass/gray.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/green.json b/src/main/generated/data/forge/tags/blocks/glass/green.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/green.json rename to src/main/generated/data/forge/tags/blocks/glass/green.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/light_blue.json b/src/main/generated/data/forge/tags/blocks/glass/light_blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/light_blue.json rename to src/main/generated/data/forge/tags/blocks/glass/light_blue.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/light_gray.json b/src/main/generated/data/forge/tags/blocks/glass/light_gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/light_gray.json rename to src/main/generated/data/forge/tags/blocks/glass/light_gray.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/lime.json b/src/main/generated/data/forge/tags/blocks/glass/lime.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/lime.json rename to src/main/generated/data/forge/tags/blocks/glass/lime.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/magenta.json b/src/main/generated/data/forge/tags/blocks/glass/magenta.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/magenta.json rename to src/main/generated/data/forge/tags/blocks/glass/magenta.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/orange.json b/src/main/generated/data/forge/tags/blocks/glass/orange.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/orange.json rename to src/main/generated/data/forge/tags/blocks/glass/orange.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/pink.json b/src/main/generated/data/forge/tags/blocks/glass/pink.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/pink.json rename to src/main/generated/data/forge/tags/blocks/glass/pink.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/purple.json b/src/main/generated/data/forge/tags/blocks/glass/purple.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/purple.json rename to src/main/generated/data/forge/tags/blocks/glass/purple.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/red.json b/src/main/generated/data/forge/tags/blocks/glass/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/red.json rename to src/main/generated/data/forge/tags/blocks/glass/red.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/silica.json b/src/main/generated/data/forge/tags/blocks/glass/silica.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/silica.json rename to src/main/generated/data/forge/tags/blocks/glass/silica.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/tinted.json b/src/main/generated/data/forge/tags/blocks/glass/tinted.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/tinted.json rename to src/main/generated/data/forge/tags/blocks/glass/tinted.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/white.json b/src/main/generated/data/forge/tags/blocks/glass/white.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/white.json rename to src/main/generated/data/forge/tags/blocks/glass/white.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass/yellow.json b/src/main/generated/data/forge/tags/blocks/glass/yellow.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass/yellow.json rename to src/main/generated/data/forge/tags/blocks/glass/yellow.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes.json b/src/main/generated/data/forge/tags/blocks/glass_panes.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes.json rename to src/main/generated/data/forge/tags/blocks/glass_panes.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/black.json b/src/main/generated/data/forge/tags/blocks/glass_panes/black.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/black.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/black.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json b/src/main/generated/data/forge/tags/blocks/glass_panes/blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/blue.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/blue.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json b/src/main/generated/data/forge/tags/blocks/glass_panes/brown.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/brown.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/brown.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json b/src/main/generated/data/forge/tags/blocks/glass_panes/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/colorless.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/colorless.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json b/src/main/generated/data/forge/tags/blocks/glass_panes/cyan.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/cyan.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/cyan.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json b/src/main/generated/data/forge/tags/blocks/glass_panes/gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/gray.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/gray.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/green.json b/src/main/generated/data/forge/tags/blocks/glass_panes/green.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/green.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/green.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json b/src/main/generated/data/forge/tags/blocks/glass_panes/light_blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/light_blue.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/light_blue.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json b/src/main/generated/data/forge/tags/blocks/glass_panes/light_gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/light_gray.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/light_gray.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json b/src/main/generated/data/forge/tags/blocks/glass_panes/lime.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/lime.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/lime.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json b/src/main/generated/data/forge/tags/blocks/glass_panes/magenta.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/magenta.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/magenta.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json b/src/main/generated/data/forge/tags/blocks/glass_panes/orange.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/orange.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/orange.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json b/src/main/generated/data/forge/tags/blocks/glass_panes/pink.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/pink.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/pink.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json b/src/main/generated/data/forge/tags/blocks/glass_panes/purple.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/purple.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/purple.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/red.json b/src/main/generated/data/forge/tags/blocks/glass_panes/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/red.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/red.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/white.json b/src/main/generated/data/forge/tags/blocks/glass_panes/white.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/white.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/white.json diff --git a/src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json b/src/main/generated/data/forge/tags/blocks/glass_panes/yellow.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/glass_panes/yellow.json rename to src/main/generated/data/forge/tags/blocks/glass_panes/yellow.json diff --git a/src/generated/resources/data/forge/tags/blocks/gravel.json b/src/main/generated/data/forge/tags/blocks/gravel.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/gravel.json rename to src/main/generated/data/forge/tags/blocks/gravel.json diff --git a/src/generated/resources/data/forge/tags/blocks/netherrack.json b/src/main/generated/data/forge/tags/blocks/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/netherrack.json rename to src/main/generated/data/forge/tags/blocks/netherrack.json diff --git a/src/generated/resources/data/forge/tags/blocks/obsidian.json b/src/main/generated/data/forge/tags/blocks/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/obsidian.json rename to src/main/generated/data/forge/tags/blocks/obsidian.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json b/src/main/generated/data/forge/tags/blocks/ore_bearing_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json rename to src/main/generated/data/forge/tags/blocks/ore_bearing_ground/deepslate.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json b/src/main/generated/data/forge/tags/blocks/ore_bearing_ground/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json rename to src/main/generated/data/forge/tags/blocks/ore_bearing_ground/netherrack.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json b/src/main/generated/data/forge/tags/blocks/ore_bearing_ground/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json rename to src/main/generated/data/forge/tags/blocks/ore_bearing_ground/stone.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json b/src/main/generated/data/forge/tags/blocks/ore_rates/dense.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json rename to src/main/generated/data/forge/tags/blocks/ore_rates/dense.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json b/src/main/generated/data/forge/tags/blocks/ore_rates/singular.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json rename to src/main/generated/data/forge/tags/blocks/ore_rates/singular.json diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json b/src/main/generated/data/forge/tags/blocks/ore_rates/sparse.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json rename to src/main/generated/data/forge/tags/blocks/ore_rates/sparse.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/main/generated/data/forge/tags/blocks/ores.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores.json rename to src/main/generated/data/forge/tags/blocks/ores.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/coal.json b/src/main/generated/data/forge/tags/blocks/ores/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/coal.json rename to src/main/generated/data/forge/tags/blocks/ores/coal.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/copper.json b/src/main/generated/data/forge/tags/blocks/ores/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/copper.json rename to src/main/generated/data/forge/tags/blocks/ores/copper.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/diamond.json b/src/main/generated/data/forge/tags/blocks/ores/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/diamond.json rename to src/main/generated/data/forge/tags/blocks/ores/diamond.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/emerald.json b/src/main/generated/data/forge/tags/blocks/ores/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/emerald.json rename to src/main/generated/data/forge/tags/blocks/ores/emerald.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/gold.json b/src/main/generated/data/forge/tags/blocks/ores/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/gold.json rename to src/main/generated/data/forge/tags/blocks/ores/gold.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/iron.json b/src/main/generated/data/forge/tags/blocks/ores/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/iron.json rename to src/main/generated/data/forge/tags/blocks/ores/iron.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/lapis.json b/src/main/generated/data/forge/tags/blocks/ores/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/lapis.json rename to src/main/generated/data/forge/tags/blocks/ores/lapis.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/netherite_scrap.json b/src/main/generated/data/forge/tags/blocks/ores/netherite_scrap.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/netherite_scrap.json rename to src/main/generated/data/forge/tags/blocks/ores/netherite_scrap.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/quartz.json b/src/main/generated/data/forge/tags/blocks/ores/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/quartz.json rename to src/main/generated/data/forge/tags/blocks/ores/quartz.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores/redstone.json b/src/main/generated/data/forge/tags/blocks/ores/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores/redstone.json rename to src/main/generated/data/forge/tags/blocks/ores/redstone.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json b/src/main/generated/data/forge/tags/blocks/ores_in_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json rename to src/main/generated/data/forge/tags/blocks/ores_in_ground/deepslate.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json b/src/main/generated/data/forge/tags/blocks/ores_in_ground/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json rename to src/main/generated/data/forge/tags/blocks/ores_in_ground/netherrack.json diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json b/src/main/generated/data/forge/tags/blocks/ores_in_ground/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json rename to src/main/generated/data/forge/tags/blocks/ores_in_ground/stone.json diff --git a/src/generated/resources/data/forge/tags/blocks/sand.json b/src/main/generated/data/forge/tags/blocks/sand.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/sand.json rename to src/main/generated/data/forge/tags/blocks/sand.json diff --git a/src/generated/resources/data/forge/tags/blocks/sand/colorless.json b/src/main/generated/data/forge/tags/blocks/sand/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/sand/colorless.json rename to src/main/generated/data/forge/tags/blocks/sand/colorless.json diff --git a/src/generated/resources/data/forge/tags/blocks/sand/red.json b/src/main/generated/data/forge/tags/blocks/sand/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/sand/red.json rename to src/main/generated/data/forge/tags/blocks/sand/red.json diff --git a/src/generated/resources/data/forge/tags/blocks/sandstone.json b/src/main/generated/data/forge/tags/blocks/sandstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/sandstone.json rename to src/main/generated/data/forge/tags/blocks/sandstone.json diff --git a/src/generated/resources/data/forge/tags/blocks/stained_glass.json b/src/main/generated/data/forge/tags/blocks/stained_glass.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/stained_glass.json rename to src/main/generated/data/forge/tags/blocks/stained_glass.json diff --git a/src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json b/src/main/generated/data/forge/tags/blocks/stained_glass_panes.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/stained_glass_panes.json rename to src/main/generated/data/forge/tags/blocks/stained_glass_panes.json diff --git a/src/generated/resources/data/forge/tags/blocks/stone.json b/src/main/generated/data/forge/tags/blocks/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/stone.json rename to src/main/generated/data/forge/tags/blocks/stone.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/main/generated/data/forge/tags/blocks/storage_blocks.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/amethyst.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/amethyst.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/coal.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/coal.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/coal.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/copper.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/diamond.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/diamond.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/diamond.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/emerald.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/emerald.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/emerald.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/gold.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/gold.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/gold.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/iron.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/iron.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/iron.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/lapis.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/lapis.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/lapis.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/netherite.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/netherite.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/netherite.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/netherite.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/quartz.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/quartz.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/quartz.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/raw_copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/raw_copper.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/raw_gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/raw_gold.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/raw_iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/raw_iron.json diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/redstone.json b/src/main/generated/data/forge/tags/blocks/storage_blocks/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/blocks/storage_blocks/redstone.json rename to src/main/generated/data/forge/tags/blocks/storage_blocks/redstone.json diff --git a/src/generated/resources/data/forge/tags/entity_types/bosses.json b/src/main/generated/data/forge/tags/entity_types/bosses.json similarity index 100% rename from src/generated/resources/data/forge/tags/entity_types/bosses.json rename to src/main/generated/data/forge/tags/entity_types/bosses.json diff --git a/src/generated/resources/data/forge/tags/fluids/milk.json b/src/main/generated/data/forge/tags/fluids/milk.json similarity index 100% rename from src/generated/resources/data/forge/tags/fluids/milk.json rename to src/main/generated/data/forge/tags/fluids/milk.json diff --git a/src/generated/resources/data/forge/tags/items/armors.json b/src/main/generated/data/forge/tags/items/armors.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/armors.json rename to src/main/generated/data/forge/tags/items/armors.json diff --git a/src/generated/resources/data/forge/tags/items/armors/boots.json b/src/main/generated/data/forge/tags/items/armors/boots.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/armors/boots.json rename to src/main/generated/data/forge/tags/items/armors/boots.json diff --git a/src/generated/resources/data/forge/tags/items/armors/chestplates.json b/src/main/generated/data/forge/tags/items/armors/chestplates.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/armors/chestplates.json rename to src/main/generated/data/forge/tags/items/armors/chestplates.json diff --git a/src/generated/resources/data/forge/tags/items/armors/helmets.json b/src/main/generated/data/forge/tags/items/armors/helmets.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/armors/helmets.json rename to src/main/generated/data/forge/tags/items/armors/helmets.json diff --git a/src/generated/resources/data/forge/tags/items/armors/leggings.json b/src/main/generated/data/forge/tags/items/armors/leggings.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/armors/leggings.json rename to src/main/generated/data/forge/tags/items/armors/leggings.json diff --git a/src/generated/resources/data/forge/tags/items/barrels.json b/src/main/generated/data/forge/tags/items/barrels.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/barrels.json rename to src/main/generated/data/forge/tags/items/barrels.json diff --git a/src/generated/resources/data/forge/tags/items/barrels/wooden.json b/src/main/generated/data/forge/tags/items/barrels/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/barrels/wooden.json rename to src/main/generated/data/forge/tags/items/barrels/wooden.json diff --git a/src/generated/resources/data/forge/tags/items/bones.json b/src/main/generated/data/forge/tags/items/bones.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/bones.json rename to src/main/generated/data/forge/tags/items/bones.json diff --git a/src/generated/resources/data/forge/tags/items/bookshelves.json b/src/main/generated/data/forge/tags/items/bookshelves.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/bookshelves.json rename to src/main/generated/data/forge/tags/items/bookshelves.json diff --git a/src/generated/resources/data/forge/tags/items/chests.json b/src/main/generated/data/forge/tags/items/chests.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/chests.json rename to src/main/generated/data/forge/tags/items/chests.json diff --git a/src/generated/resources/data/forge/tags/items/chests/ender.json b/src/main/generated/data/forge/tags/items/chests/ender.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/chests/ender.json rename to src/main/generated/data/forge/tags/items/chests/ender.json diff --git a/src/generated/resources/data/forge/tags/items/chests/trapped.json b/src/main/generated/data/forge/tags/items/chests/trapped.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/chests/trapped.json rename to src/main/generated/data/forge/tags/items/chests/trapped.json diff --git a/src/generated/resources/data/forge/tags/items/chests/wooden.json b/src/main/generated/data/forge/tags/items/chests/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/chests/wooden.json rename to src/main/generated/data/forge/tags/items/chests/wooden.json diff --git a/src/generated/resources/data/forge/tags/items/cobblestone.json b/src/main/generated/data/forge/tags/items/cobblestone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/cobblestone.json rename to src/main/generated/data/forge/tags/items/cobblestone.json diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json b/src/main/generated/data/forge/tags/items/cobblestone/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json rename to src/main/generated/data/forge/tags/items/cobblestone/deepslate.json diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/infested.json b/src/main/generated/data/forge/tags/items/cobblestone/infested.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/cobblestone/infested.json rename to src/main/generated/data/forge/tags/items/cobblestone/infested.json diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/mossy.json b/src/main/generated/data/forge/tags/items/cobblestone/mossy.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/cobblestone/mossy.json rename to src/main/generated/data/forge/tags/items/cobblestone/mossy.json diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/normal.json b/src/main/generated/data/forge/tags/items/cobblestone/normal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/cobblestone/normal.json rename to src/main/generated/data/forge/tags/items/cobblestone/normal.json diff --git a/src/generated/resources/data/forge/tags/items/crops.json b/src/main/generated/data/forge/tags/items/crops.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops.json rename to src/main/generated/data/forge/tags/items/crops.json diff --git a/src/generated/resources/data/forge/tags/items/crops/beetroot.json b/src/main/generated/data/forge/tags/items/crops/beetroot.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops/beetroot.json rename to src/main/generated/data/forge/tags/items/crops/beetroot.json diff --git a/src/generated/resources/data/forge/tags/items/crops/carrot.json b/src/main/generated/data/forge/tags/items/crops/carrot.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops/carrot.json rename to src/main/generated/data/forge/tags/items/crops/carrot.json diff --git a/src/generated/resources/data/forge/tags/items/crops/nether_wart.json b/src/main/generated/data/forge/tags/items/crops/nether_wart.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops/nether_wart.json rename to src/main/generated/data/forge/tags/items/crops/nether_wart.json diff --git a/src/generated/resources/data/forge/tags/items/crops/potato.json b/src/main/generated/data/forge/tags/items/crops/potato.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops/potato.json rename to src/main/generated/data/forge/tags/items/crops/potato.json diff --git a/src/generated/resources/data/forge/tags/items/crops/wheat.json b/src/main/generated/data/forge/tags/items/crops/wheat.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/crops/wheat.json rename to src/main/generated/data/forge/tags/items/crops/wheat.json diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/main/generated/data/forge/tags/items/dusts.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts.json rename to src/main/generated/data/forge/tags/items/dusts.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/glowstone.json b/src/main/generated/data/forge/tags/items/dusts/glowstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/glowstone.json rename to src/main/generated/data/forge/tags/items/dusts/glowstone.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/prismarine.json b/src/main/generated/data/forge/tags/items/dusts/prismarine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/prismarine.json rename to src/main/generated/data/forge/tags/items/dusts/prismarine.json diff --git a/src/generated/resources/data/forge/tags/items/dusts/redstone.json b/src/main/generated/data/forge/tags/items/dusts/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dusts/redstone.json rename to src/main/generated/data/forge/tags/items/dusts/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/dyes.json b/src/main/generated/data/forge/tags/items/dyes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes.json rename to src/main/generated/data/forge/tags/items/dyes.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/black.json b/src/main/generated/data/forge/tags/items/dyes/black.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/black.json rename to src/main/generated/data/forge/tags/items/dyes/black.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/blue.json b/src/main/generated/data/forge/tags/items/dyes/blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/blue.json rename to src/main/generated/data/forge/tags/items/dyes/blue.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/brown.json b/src/main/generated/data/forge/tags/items/dyes/brown.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/brown.json rename to src/main/generated/data/forge/tags/items/dyes/brown.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/cyan.json b/src/main/generated/data/forge/tags/items/dyes/cyan.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/cyan.json rename to src/main/generated/data/forge/tags/items/dyes/cyan.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/gray.json b/src/main/generated/data/forge/tags/items/dyes/gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/gray.json rename to src/main/generated/data/forge/tags/items/dyes/gray.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/green.json b/src/main/generated/data/forge/tags/items/dyes/green.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/green.json rename to src/main/generated/data/forge/tags/items/dyes/green.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/light_blue.json b/src/main/generated/data/forge/tags/items/dyes/light_blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/light_blue.json rename to src/main/generated/data/forge/tags/items/dyes/light_blue.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/light_gray.json b/src/main/generated/data/forge/tags/items/dyes/light_gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/light_gray.json rename to src/main/generated/data/forge/tags/items/dyes/light_gray.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/lime.json b/src/main/generated/data/forge/tags/items/dyes/lime.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/lime.json rename to src/main/generated/data/forge/tags/items/dyes/lime.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/magenta.json b/src/main/generated/data/forge/tags/items/dyes/magenta.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/magenta.json rename to src/main/generated/data/forge/tags/items/dyes/magenta.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/orange.json b/src/main/generated/data/forge/tags/items/dyes/orange.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/orange.json rename to src/main/generated/data/forge/tags/items/dyes/orange.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/pink.json b/src/main/generated/data/forge/tags/items/dyes/pink.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/pink.json rename to src/main/generated/data/forge/tags/items/dyes/pink.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/purple.json b/src/main/generated/data/forge/tags/items/dyes/purple.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/purple.json rename to src/main/generated/data/forge/tags/items/dyes/purple.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/red.json b/src/main/generated/data/forge/tags/items/dyes/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/red.json rename to src/main/generated/data/forge/tags/items/dyes/red.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/white.json b/src/main/generated/data/forge/tags/items/dyes/white.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/white.json rename to src/main/generated/data/forge/tags/items/dyes/white.json diff --git a/src/generated/resources/data/forge/tags/items/dyes/yellow.json b/src/main/generated/data/forge/tags/items/dyes/yellow.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/dyes/yellow.json rename to src/main/generated/data/forge/tags/items/dyes/yellow.json diff --git a/src/generated/resources/data/forge/tags/items/eggs.json b/src/main/generated/data/forge/tags/items/eggs.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/eggs.json rename to src/main/generated/data/forge/tags/items/eggs.json diff --git a/src/generated/resources/data/forge/tags/items/enchanting_fuels.json b/src/main/generated/data/forge/tags/items/enchanting_fuels.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/enchanting_fuels.json rename to src/main/generated/data/forge/tags/items/enchanting_fuels.json diff --git a/src/generated/resources/data/forge/tags/items/end_stones.json b/src/main/generated/data/forge/tags/items/end_stones.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/end_stones.json rename to src/main/generated/data/forge/tags/items/end_stones.json diff --git a/src/generated/resources/data/forge/tags/items/ender_pearls.json b/src/main/generated/data/forge/tags/items/ender_pearls.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ender_pearls.json rename to src/main/generated/data/forge/tags/items/ender_pearls.json diff --git a/src/generated/resources/data/forge/tags/items/feathers.json b/src/main/generated/data/forge/tags/items/feathers.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/feathers.json rename to src/main/generated/data/forge/tags/items/feathers.json diff --git a/src/generated/resources/data/forge/tags/items/fence_gates.json b/src/main/generated/data/forge/tags/items/fence_gates.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/fence_gates.json rename to src/main/generated/data/forge/tags/items/fence_gates.json diff --git a/src/generated/resources/data/forge/tags/items/fence_gates/wooden.json b/src/main/generated/data/forge/tags/items/fence_gates/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/fence_gates/wooden.json rename to src/main/generated/data/forge/tags/items/fence_gates/wooden.json diff --git a/src/generated/resources/data/forge/tags/items/fences.json b/src/main/generated/data/forge/tags/items/fences.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/fences.json rename to src/main/generated/data/forge/tags/items/fences.json diff --git a/src/generated/resources/data/forge/tags/items/fences/nether_brick.json b/src/main/generated/data/forge/tags/items/fences/nether_brick.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/fences/nether_brick.json rename to src/main/generated/data/forge/tags/items/fences/nether_brick.json diff --git a/src/generated/resources/data/forge/tags/items/fences/wooden.json b/src/main/generated/data/forge/tags/items/fences/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/fences/wooden.json rename to src/main/generated/data/forge/tags/items/fences/wooden.json diff --git a/src/generated/resources/data/forge/tags/items/gems.json b/src/main/generated/data/forge/tags/items/gems.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems.json rename to src/main/generated/data/forge/tags/items/gems.json diff --git a/src/generated/resources/data/forge/tags/items/gems/amethyst.json b/src/main/generated/data/forge/tags/items/gems/amethyst.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/amethyst.json rename to src/main/generated/data/forge/tags/items/gems/amethyst.json diff --git a/src/generated/resources/data/forge/tags/items/gems/diamond.json b/src/main/generated/data/forge/tags/items/gems/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/diamond.json rename to src/main/generated/data/forge/tags/items/gems/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/gems/emerald.json b/src/main/generated/data/forge/tags/items/gems/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/emerald.json rename to src/main/generated/data/forge/tags/items/gems/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/gems/lapis.json b/src/main/generated/data/forge/tags/items/gems/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/lapis.json rename to src/main/generated/data/forge/tags/items/gems/lapis.json diff --git a/src/generated/resources/data/forge/tags/items/gems/prismarine.json b/src/main/generated/data/forge/tags/items/gems/prismarine.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/prismarine.json rename to src/main/generated/data/forge/tags/items/gems/prismarine.json diff --git a/src/generated/resources/data/forge/tags/items/gems/quartz.json b/src/main/generated/data/forge/tags/items/gems/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gems/quartz.json rename to src/main/generated/data/forge/tags/items/gems/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/glass.json b/src/main/generated/data/forge/tags/items/glass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass.json rename to src/main/generated/data/forge/tags/items/glass.json diff --git a/src/generated/resources/data/forge/tags/items/glass/black.json b/src/main/generated/data/forge/tags/items/glass/black.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/black.json rename to src/main/generated/data/forge/tags/items/glass/black.json diff --git a/src/generated/resources/data/forge/tags/items/glass/blue.json b/src/main/generated/data/forge/tags/items/glass/blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/blue.json rename to src/main/generated/data/forge/tags/items/glass/blue.json diff --git a/src/generated/resources/data/forge/tags/items/glass/brown.json b/src/main/generated/data/forge/tags/items/glass/brown.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/brown.json rename to src/main/generated/data/forge/tags/items/glass/brown.json diff --git a/src/generated/resources/data/forge/tags/items/glass/colorless.json b/src/main/generated/data/forge/tags/items/glass/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/colorless.json rename to src/main/generated/data/forge/tags/items/glass/colorless.json diff --git a/src/generated/resources/data/forge/tags/items/glass/cyan.json b/src/main/generated/data/forge/tags/items/glass/cyan.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/cyan.json rename to src/main/generated/data/forge/tags/items/glass/cyan.json diff --git a/src/generated/resources/data/forge/tags/items/glass/gray.json b/src/main/generated/data/forge/tags/items/glass/gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/gray.json rename to src/main/generated/data/forge/tags/items/glass/gray.json diff --git a/src/generated/resources/data/forge/tags/items/glass/green.json b/src/main/generated/data/forge/tags/items/glass/green.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/green.json rename to src/main/generated/data/forge/tags/items/glass/green.json diff --git a/src/generated/resources/data/forge/tags/items/glass/light_blue.json b/src/main/generated/data/forge/tags/items/glass/light_blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/light_blue.json rename to src/main/generated/data/forge/tags/items/glass/light_blue.json diff --git a/src/generated/resources/data/forge/tags/items/glass/light_gray.json b/src/main/generated/data/forge/tags/items/glass/light_gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/light_gray.json rename to src/main/generated/data/forge/tags/items/glass/light_gray.json diff --git a/src/generated/resources/data/forge/tags/items/glass/lime.json b/src/main/generated/data/forge/tags/items/glass/lime.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/lime.json rename to src/main/generated/data/forge/tags/items/glass/lime.json diff --git a/src/generated/resources/data/forge/tags/items/glass/magenta.json b/src/main/generated/data/forge/tags/items/glass/magenta.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/magenta.json rename to src/main/generated/data/forge/tags/items/glass/magenta.json diff --git a/src/generated/resources/data/forge/tags/items/glass/orange.json b/src/main/generated/data/forge/tags/items/glass/orange.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/orange.json rename to src/main/generated/data/forge/tags/items/glass/orange.json diff --git a/src/generated/resources/data/forge/tags/items/glass/pink.json b/src/main/generated/data/forge/tags/items/glass/pink.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/pink.json rename to src/main/generated/data/forge/tags/items/glass/pink.json diff --git a/src/generated/resources/data/forge/tags/items/glass/purple.json b/src/main/generated/data/forge/tags/items/glass/purple.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/purple.json rename to src/main/generated/data/forge/tags/items/glass/purple.json diff --git a/src/generated/resources/data/forge/tags/items/glass/red.json b/src/main/generated/data/forge/tags/items/glass/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/red.json rename to src/main/generated/data/forge/tags/items/glass/red.json diff --git a/src/generated/resources/data/forge/tags/items/glass/silica.json b/src/main/generated/data/forge/tags/items/glass/silica.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/silica.json rename to src/main/generated/data/forge/tags/items/glass/silica.json diff --git a/src/generated/resources/data/forge/tags/items/glass/tinted.json b/src/main/generated/data/forge/tags/items/glass/tinted.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/tinted.json rename to src/main/generated/data/forge/tags/items/glass/tinted.json diff --git a/src/generated/resources/data/forge/tags/items/glass/white.json b/src/main/generated/data/forge/tags/items/glass/white.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/white.json rename to src/main/generated/data/forge/tags/items/glass/white.json diff --git a/src/generated/resources/data/forge/tags/items/glass/yellow.json b/src/main/generated/data/forge/tags/items/glass/yellow.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass/yellow.json rename to src/main/generated/data/forge/tags/items/glass/yellow.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes.json b/src/main/generated/data/forge/tags/items/glass_panes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes.json rename to src/main/generated/data/forge/tags/items/glass_panes.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/black.json b/src/main/generated/data/forge/tags/items/glass_panes/black.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/black.json rename to src/main/generated/data/forge/tags/items/glass_panes/black.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/blue.json b/src/main/generated/data/forge/tags/items/glass_panes/blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/blue.json rename to src/main/generated/data/forge/tags/items/glass_panes/blue.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/brown.json b/src/main/generated/data/forge/tags/items/glass_panes/brown.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/brown.json rename to src/main/generated/data/forge/tags/items/glass_panes/brown.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/colorless.json b/src/main/generated/data/forge/tags/items/glass_panes/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/colorless.json rename to src/main/generated/data/forge/tags/items/glass_panes/colorless.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/cyan.json b/src/main/generated/data/forge/tags/items/glass_panes/cyan.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/cyan.json rename to src/main/generated/data/forge/tags/items/glass_panes/cyan.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/gray.json b/src/main/generated/data/forge/tags/items/glass_panes/gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/gray.json rename to src/main/generated/data/forge/tags/items/glass_panes/gray.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/green.json b/src/main/generated/data/forge/tags/items/glass_panes/green.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/green.json rename to src/main/generated/data/forge/tags/items/glass_panes/green.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json b/src/main/generated/data/forge/tags/items/glass_panes/light_blue.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/light_blue.json rename to src/main/generated/data/forge/tags/items/glass_panes/light_blue.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json b/src/main/generated/data/forge/tags/items/glass_panes/light_gray.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/light_gray.json rename to src/main/generated/data/forge/tags/items/glass_panes/light_gray.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/lime.json b/src/main/generated/data/forge/tags/items/glass_panes/lime.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/lime.json rename to src/main/generated/data/forge/tags/items/glass_panes/lime.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/magenta.json b/src/main/generated/data/forge/tags/items/glass_panes/magenta.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/magenta.json rename to src/main/generated/data/forge/tags/items/glass_panes/magenta.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/orange.json b/src/main/generated/data/forge/tags/items/glass_panes/orange.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/orange.json rename to src/main/generated/data/forge/tags/items/glass_panes/orange.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/pink.json b/src/main/generated/data/forge/tags/items/glass_panes/pink.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/pink.json rename to src/main/generated/data/forge/tags/items/glass_panes/pink.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/purple.json b/src/main/generated/data/forge/tags/items/glass_panes/purple.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/purple.json rename to src/main/generated/data/forge/tags/items/glass_panes/purple.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/red.json b/src/main/generated/data/forge/tags/items/glass_panes/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/red.json rename to src/main/generated/data/forge/tags/items/glass_panes/red.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/white.json b/src/main/generated/data/forge/tags/items/glass_panes/white.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/white.json rename to src/main/generated/data/forge/tags/items/glass_panes/white.json diff --git a/src/generated/resources/data/forge/tags/items/glass_panes/yellow.json b/src/main/generated/data/forge/tags/items/glass_panes/yellow.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/glass_panes/yellow.json rename to src/main/generated/data/forge/tags/items/glass_panes/yellow.json diff --git a/src/generated/resources/data/forge/tags/items/gravel.json b/src/main/generated/data/forge/tags/items/gravel.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gravel.json rename to src/main/generated/data/forge/tags/items/gravel.json diff --git a/src/generated/resources/data/forge/tags/items/gunpowder.json b/src/main/generated/data/forge/tags/items/gunpowder.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/gunpowder.json rename to src/main/generated/data/forge/tags/items/gunpowder.json diff --git a/src/generated/resources/data/forge/tags/items/heads.json b/src/main/generated/data/forge/tags/items/heads.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/heads.json rename to src/main/generated/data/forge/tags/items/heads.json diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/main/generated/data/forge/tags/items/ingots.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots.json rename to src/main/generated/data/forge/tags/items/ingots.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/brick.json b/src/main/generated/data/forge/tags/items/ingots/brick.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/brick.json rename to src/main/generated/data/forge/tags/items/ingots/brick.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/copper.json b/src/main/generated/data/forge/tags/items/ingots/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/copper.json rename to src/main/generated/data/forge/tags/items/ingots/copper.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/gold.json b/src/main/generated/data/forge/tags/items/ingots/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/gold.json rename to src/main/generated/data/forge/tags/items/ingots/gold.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/iron.json b/src/main/generated/data/forge/tags/items/ingots/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/iron.json rename to src/main/generated/data/forge/tags/items/ingots/iron.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/nether_brick.json b/src/main/generated/data/forge/tags/items/ingots/nether_brick.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/nether_brick.json rename to src/main/generated/data/forge/tags/items/ingots/nether_brick.json diff --git a/src/generated/resources/data/forge/tags/items/ingots/netherite.json b/src/main/generated/data/forge/tags/items/ingots/netherite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ingots/netherite.json rename to src/main/generated/data/forge/tags/items/ingots/netherite.json diff --git a/src/generated/resources/data/forge/tags/items/leather.json b/src/main/generated/data/forge/tags/items/leather.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/leather.json rename to src/main/generated/data/forge/tags/items/leather.json diff --git a/src/generated/resources/data/forge/tags/items/mushrooms.json b/src/main/generated/data/forge/tags/items/mushrooms.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/mushrooms.json rename to src/main/generated/data/forge/tags/items/mushrooms.json diff --git a/src/generated/resources/data/forge/tags/items/nether_stars.json b/src/main/generated/data/forge/tags/items/nether_stars.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nether_stars.json rename to src/main/generated/data/forge/tags/items/nether_stars.json diff --git a/src/generated/resources/data/forge/tags/items/netherrack.json b/src/main/generated/data/forge/tags/items/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/netherrack.json rename to src/main/generated/data/forge/tags/items/netherrack.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets.json b/src/main/generated/data/forge/tags/items/nuggets.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets.json rename to src/main/generated/data/forge/tags/items/nuggets.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/gold.json b/src/main/generated/data/forge/tags/items/nuggets/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/gold.json rename to src/main/generated/data/forge/tags/items/nuggets/gold.json diff --git a/src/generated/resources/data/forge/tags/items/nuggets/iron.json b/src/main/generated/data/forge/tags/items/nuggets/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/nuggets/iron.json rename to src/main/generated/data/forge/tags/items/nuggets/iron.json diff --git a/src/generated/resources/data/forge/tags/items/obsidian.json b/src/main/generated/data/forge/tags/items/obsidian.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/obsidian.json rename to src/main/generated/data/forge/tags/items/obsidian.json diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json b/src/main/generated/data/forge/tags/items/ore_bearing_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json rename to src/main/generated/data/forge/tags/items/ore_bearing_ground/deepslate.json diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json b/src/main/generated/data/forge/tags/items/ore_bearing_ground/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json rename to src/main/generated/data/forge/tags/items/ore_bearing_ground/netherrack.json diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json b/src/main/generated/data/forge/tags/items/ore_bearing_ground/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json rename to src/main/generated/data/forge/tags/items/ore_bearing_ground/stone.json diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/dense.json b/src/main/generated/data/forge/tags/items/ore_rates/dense.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_rates/dense.json rename to src/main/generated/data/forge/tags/items/ore_rates/dense.json diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json b/src/main/generated/data/forge/tags/items/ore_rates/singular.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_rates/singular.json rename to src/main/generated/data/forge/tags/items/ore_rates/singular.json diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/sparse.json b/src/main/generated/data/forge/tags/items/ore_rates/sparse.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ore_rates/sparse.json rename to src/main/generated/data/forge/tags/items/ore_rates/sparse.json diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/main/generated/data/forge/tags/items/ores.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores.json rename to src/main/generated/data/forge/tags/items/ores.json diff --git a/src/generated/resources/data/forge/tags/items/ores/coal.json b/src/main/generated/data/forge/tags/items/ores/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/coal.json rename to src/main/generated/data/forge/tags/items/ores/coal.json diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/main/generated/data/forge/tags/items/ores/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/copper.json rename to src/main/generated/data/forge/tags/items/ores/copper.json diff --git a/src/generated/resources/data/forge/tags/items/ores/diamond.json b/src/main/generated/data/forge/tags/items/ores/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/diamond.json rename to src/main/generated/data/forge/tags/items/ores/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/ores/emerald.json b/src/main/generated/data/forge/tags/items/ores/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/emerald.json rename to src/main/generated/data/forge/tags/items/ores/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/ores/gold.json b/src/main/generated/data/forge/tags/items/ores/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/gold.json rename to src/main/generated/data/forge/tags/items/ores/gold.json diff --git a/src/generated/resources/data/forge/tags/items/ores/iron.json b/src/main/generated/data/forge/tags/items/ores/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/iron.json rename to src/main/generated/data/forge/tags/items/ores/iron.json diff --git a/src/generated/resources/data/forge/tags/items/ores/lapis.json b/src/main/generated/data/forge/tags/items/ores/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/lapis.json rename to src/main/generated/data/forge/tags/items/ores/lapis.json diff --git a/src/generated/resources/data/forge/tags/items/ores/netherite_scrap.json b/src/main/generated/data/forge/tags/items/ores/netherite_scrap.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/netherite_scrap.json rename to src/main/generated/data/forge/tags/items/ores/netherite_scrap.json diff --git a/src/generated/resources/data/forge/tags/items/ores/quartz.json b/src/main/generated/data/forge/tags/items/ores/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/quartz.json rename to src/main/generated/data/forge/tags/items/ores/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/ores/redstone.json b/src/main/generated/data/forge/tags/items/ores/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores/redstone.json rename to src/main/generated/data/forge/tags/items/ores/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/main/generated/data/forge/tags/items/ores_in_ground/deepslate.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json rename to src/main/generated/data/forge/tags/items/ores_in_ground/deepslate.json diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json b/src/main/generated/data/forge/tags/items/ores_in_ground/netherrack.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json rename to src/main/generated/data/forge/tags/items/ores_in_ground/netherrack.json diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/main/generated/data/forge/tags/items/ores_in_ground/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json rename to src/main/generated/data/forge/tags/items/ores_in_ground/stone.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/main/generated/data/forge/tags/items/raw_materials.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials.json rename to src/main/generated/data/forge/tags/items/raw_materials.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/copper.json b/src/main/generated/data/forge/tags/items/raw_materials/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/copper.json rename to src/main/generated/data/forge/tags/items/raw_materials/copper.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/gold.json b/src/main/generated/data/forge/tags/items/raw_materials/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/gold.json rename to src/main/generated/data/forge/tags/items/raw_materials/gold.json diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/iron.json b/src/main/generated/data/forge/tags/items/raw_materials/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/raw_materials/iron.json rename to src/main/generated/data/forge/tags/items/raw_materials/iron.json diff --git a/src/generated/resources/data/forge/tags/items/rods.json b/src/main/generated/data/forge/tags/items/rods.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods.json rename to src/main/generated/data/forge/tags/items/rods.json diff --git a/src/generated/resources/data/forge/tags/items/rods/blaze.json b/src/main/generated/data/forge/tags/items/rods/blaze.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/blaze.json rename to src/main/generated/data/forge/tags/items/rods/blaze.json diff --git a/src/generated/resources/data/forge/tags/items/rods/wooden.json b/src/main/generated/data/forge/tags/items/rods/wooden.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/rods/wooden.json rename to src/main/generated/data/forge/tags/items/rods/wooden.json diff --git a/src/generated/resources/data/forge/tags/items/sand.json b/src/main/generated/data/forge/tags/items/sand.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sand.json rename to src/main/generated/data/forge/tags/items/sand.json diff --git a/src/generated/resources/data/forge/tags/items/sand/colorless.json b/src/main/generated/data/forge/tags/items/sand/colorless.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sand/colorless.json rename to src/main/generated/data/forge/tags/items/sand/colorless.json diff --git a/src/generated/resources/data/forge/tags/items/sand/red.json b/src/main/generated/data/forge/tags/items/sand/red.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sand/red.json rename to src/main/generated/data/forge/tags/items/sand/red.json diff --git a/src/generated/resources/data/forge/tags/items/sandstone.json b/src/main/generated/data/forge/tags/items/sandstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/sandstone.json rename to src/main/generated/data/forge/tags/items/sandstone.json diff --git a/src/generated/resources/data/forge/tags/items/seeds.json b/src/main/generated/data/forge/tags/items/seeds.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/seeds.json rename to src/main/generated/data/forge/tags/items/seeds.json diff --git a/src/generated/resources/data/forge/tags/items/seeds/beetroot.json b/src/main/generated/data/forge/tags/items/seeds/beetroot.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/seeds/beetroot.json rename to src/main/generated/data/forge/tags/items/seeds/beetroot.json diff --git a/src/generated/resources/data/forge/tags/items/seeds/melon.json b/src/main/generated/data/forge/tags/items/seeds/melon.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/seeds/melon.json rename to src/main/generated/data/forge/tags/items/seeds/melon.json diff --git a/src/generated/resources/data/forge/tags/items/seeds/pumpkin.json b/src/main/generated/data/forge/tags/items/seeds/pumpkin.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/seeds/pumpkin.json rename to src/main/generated/data/forge/tags/items/seeds/pumpkin.json diff --git a/src/generated/resources/data/forge/tags/items/seeds/wheat.json b/src/main/generated/data/forge/tags/items/seeds/wheat.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/seeds/wheat.json rename to src/main/generated/data/forge/tags/items/seeds/wheat.json diff --git a/src/generated/resources/data/forge/tags/items/shears.json b/src/main/generated/data/forge/tags/items/shears.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/shears.json rename to src/main/generated/data/forge/tags/items/shears.json diff --git a/src/generated/resources/data/forge/tags/items/slimeballs.json b/src/main/generated/data/forge/tags/items/slimeballs.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/slimeballs.json rename to src/main/generated/data/forge/tags/items/slimeballs.json diff --git a/src/generated/resources/data/forge/tags/items/stained_glass.json b/src/main/generated/data/forge/tags/items/stained_glass.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/stained_glass.json rename to src/main/generated/data/forge/tags/items/stained_glass.json diff --git a/src/generated/resources/data/forge/tags/items/stained_glass_panes.json b/src/main/generated/data/forge/tags/items/stained_glass_panes.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/stained_glass_panes.json rename to src/main/generated/data/forge/tags/items/stained_glass_panes.json diff --git a/src/generated/resources/data/forge/tags/items/stone.json b/src/main/generated/data/forge/tags/items/stone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/stone.json rename to src/main/generated/data/forge/tags/items/stone.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/main/generated/data/forge/tags/items/storage_blocks.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks.json rename to src/main/generated/data/forge/tags/items/storage_blocks.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json b/src/main/generated/data/forge/tags/items/storage_blocks/amethyst.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json rename to src/main/generated/data/forge/tags/items/storage_blocks/amethyst.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/coal.json b/src/main/generated/data/forge/tags/items/storage_blocks/coal.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/coal.json rename to src/main/generated/data/forge/tags/items/storage_blocks/coal.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json b/src/main/generated/data/forge/tags/items/storage_blocks/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/copper.json rename to src/main/generated/data/forge/tags/items/storage_blocks/copper.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/diamond.json b/src/main/generated/data/forge/tags/items/storage_blocks/diamond.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/diamond.json rename to src/main/generated/data/forge/tags/items/storage_blocks/diamond.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/emerald.json b/src/main/generated/data/forge/tags/items/storage_blocks/emerald.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/emerald.json rename to src/main/generated/data/forge/tags/items/storage_blocks/emerald.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/gold.json b/src/main/generated/data/forge/tags/items/storage_blocks/gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/gold.json rename to src/main/generated/data/forge/tags/items/storage_blocks/gold.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/iron.json b/src/main/generated/data/forge/tags/items/storage_blocks/iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/iron.json rename to src/main/generated/data/forge/tags/items/storage_blocks/iron.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lapis.json b/src/main/generated/data/forge/tags/items/storage_blocks/lapis.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/lapis.json rename to src/main/generated/data/forge/tags/items/storage_blocks/lapis.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/netherite.json b/src/main/generated/data/forge/tags/items/storage_blocks/netherite.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/netherite.json rename to src/main/generated/data/forge/tags/items/storage_blocks/netherite.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/quartz.json b/src/main/generated/data/forge/tags/items/storage_blocks/quartz.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/quartz.json rename to src/main/generated/data/forge/tags/items/storage_blocks/quartz.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json b/src/main/generated/data/forge/tags/items/storage_blocks/raw_copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json rename to src/main/generated/data/forge/tags/items/storage_blocks/raw_copper.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json b/src/main/generated/data/forge/tags/items/storage_blocks/raw_gold.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json rename to src/main/generated/data/forge/tags/items/storage_blocks/raw_gold.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json b/src/main/generated/data/forge/tags/items/storage_blocks/raw_iron.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json rename to src/main/generated/data/forge/tags/items/storage_blocks/raw_iron.json diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/redstone.json b/src/main/generated/data/forge/tags/items/storage_blocks/redstone.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/storage_blocks/redstone.json rename to src/main/generated/data/forge/tags/items/storage_blocks/redstone.json diff --git a/src/generated/resources/data/forge/tags/items/string.json b/src/main/generated/data/forge/tags/items/string.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/string.json rename to src/main/generated/data/forge/tags/items/string.json diff --git a/src/generated/resources/data/forge/tags/items/tools.json b/src/main/generated/data/forge/tags/items/tools.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools.json rename to src/main/generated/data/forge/tags/items/tools.json diff --git a/src/generated/resources/data/forge/tags/items/tools/bows.json b/src/main/generated/data/forge/tags/items/tools/bows.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/bows.json rename to src/main/generated/data/forge/tags/items/tools/bows.json diff --git a/src/generated/resources/data/forge/tags/items/tools/crossbows.json b/src/main/generated/data/forge/tags/items/tools/crossbows.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/crossbows.json rename to src/main/generated/data/forge/tags/items/tools/crossbows.json diff --git a/src/generated/resources/data/forge/tags/items/tools/fishing_rods.json b/src/main/generated/data/forge/tags/items/tools/fishing_rods.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/fishing_rods.json rename to src/main/generated/data/forge/tags/items/tools/fishing_rods.json diff --git a/src/generated/resources/data/forge/tags/items/tools/shields.json b/src/main/generated/data/forge/tags/items/tools/shields.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/shields.json rename to src/main/generated/data/forge/tags/items/tools/shields.json diff --git a/src/generated/resources/data/forge/tags/items/tools/tridents.json b/src/main/generated/data/forge/tags/items/tools/tridents.json similarity index 100% rename from src/generated/resources/data/forge/tags/items/tools/tridents.json rename to src/main/generated/data/forge/tags/items/tools/tridents.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cave.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_cave.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_cave.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_cold.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_cold.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_cold.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_cold/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_cold/end.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_cold/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_cold/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_coniferous.json b/src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_coniferous.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dense.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dense.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dense.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dense/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dense/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json b/src/main/generated/data/forge/tags/worldgen/biome/is_desert.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_desert.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_desert.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dry.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dry.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dry.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dry/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dry/end.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dry/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dry/nether.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_dry/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_dry/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_hot.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_hot.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_hot/nether.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_hot/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_lush.json b/src/main/generated/data/forge/tags/worldgen/biome/is_lush.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_lush.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_lush.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_mountain.json b/src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_mountain.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_mushroom.json b/src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_mushroom.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_peak.json b/src/main/generated/data/forge/tags/worldgen/biome/is_peak.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_peak.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_peak.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_plains.json b/src/main/generated/data/forge/tags/worldgen/biome/is_plains.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_plains.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_plains.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_plateau.json b/src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_plateau.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json b/src/main/generated/data/forge/tags/worldgen/biome/is_rare.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_rare.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_rare.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_sandy.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_sandy.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_slope.json b/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_slope.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_slope.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_snowy.json b/src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_snowy.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_sparse.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_sparse.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_sparse/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_sparse/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json b/src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_spooky.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json b/src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_swamp.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json b/src/main/generated/data/forge/tags/worldgen/biome/is_underground.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_underground.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_underground.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_void.json b/src/main/generated/data/forge/tags/worldgen/biome/is_void.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_void.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_void.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wasteland.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_wasteland.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_water.json b/src/main/generated/data/forge/tags/worldgen/biome/is_water.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_water.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_water.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_wet.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_wet.json diff --git a/src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json similarity index 100% rename from src/generated/resources/data/forge/tags/worldgen/biome/is_wet/overworld.json rename to src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/acacia_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/acacia_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/acacia_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/azalea_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/azalea_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/azalea_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/birch_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/birch_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/birch_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/cherry_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/cherry_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/cherry_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json b/src/main/generated/data/minecraft/loot_tables/blocks/cobweb.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/cobweb.json rename to src/main/generated/data/minecraft/loot_tables/blocks/cobweb.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/dark_oak_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/dark_oak_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/dark_oak_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json b/src/main/generated/data/minecraft/loot_tables/blocks/dead_bush.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/dead_bush.json rename to src/main/generated/data/minecraft/loot_tables/blocks/dead_bush.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/fern.json b/src/main/generated/data/minecraft/loot_tables/blocks/fern.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/fern.json rename to src/main/generated/data/minecraft/loot_tables/blocks/fern.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/flowering_azalea_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json b/src/main/generated/data/minecraft/loot_tables/blocks/glow_lichen.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/glow_lichen.json rename to src/main/generated/data/minecraft/loot_tables/blocks/glow_lichen.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/grass.json b/src/main/generated/data/minecraft/loot_tables/blocks/grass.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/grass.json rename to src/main/generated/data/minecraft/loot_tables/blocks/grass.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json b/src/main/generated/data/minecraft/loot_tables/blocks/hanging_roots.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/hanging_roots.json rename to src/main/generated/data/minecraft/loot_tables/blocks/hanging_roots.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/jungle_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/jungle_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/jungle_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json b/src/main/generated/data/minecraft/loot_tables/blocks/large_fern.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/large_fern.json rename to src/main/generated/data/minecraft/loot_tables/blocks/large_fern.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/mangrove_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/mangrove_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/mangrove_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json b/src/main/generated/data/minecraft/loot_tables/blocks/nether_sprouts.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/nether_sprouts.json rename to src/main/generated/data/minecraft/loot_tables/blocks/nether_sprouts.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/oak_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/oak_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/oak_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json b/src/main/generated/data/minecraft/loot_tables/blocks/seagrass.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/seagrass.json rename to src/main/generated/data/minecraft/loot_tables/blocks/seagrass.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json b/src/main/generated/data/minecraft/loot_tables/blocks/small_dripleaf.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/small_dripleaf.json rename to src/main/generated/data/minecraft/loot_tables/blocks/small_dripleaf.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json b/src/main/generated/data/minecraft/loot_tables/blocks/spruce_leaves.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/spruce_leaves.json rename to src/main/generated/data/minecraft/loot_tables/blocks/spruce_leaves.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json b/src/main/generated/data/minecraft/loot_tables/blocks/tall_grass.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/tall_grass.json rename to src/main/generated/data/minecraft/loot_tables/blocks/tall_grass.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json b/src/main/generated/data/minecraft/loot_tables/blocks/tall_seagrass.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/tall_seagrass.json rename to src/main/generated/data/minecraft/loot_tables/blocks/tall_seagrass.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json b/src/main/generated/data/minecraft/loot_tables/blocks/twisting_vines.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/twisting_vines.json rename to src/main/generated/data/minecraft/loot_tables/blocks/twisting_vines.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/vine.json b/src/main/generated/data/minecraft/loot_tables/blocks/vine.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/vine.json rename to src/main/generated/data/minecraft/loot_tables/blocks/vine.json diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json b/src/main/generated/data/minecraft/loot_tables/blocks/weeping_vines.json similarity index 100% rename from src/generated/resources/data/minecraft/loot_tables/blocks/weeping_vines.json rename to src/main/generated/data/minecraft/loot_tables/blocks/weeping_vines.json diff --git a/src/generated/resources/data/minecraft/recipes/acacia_chest_boat.json b/src/main/generated/data/minecraft/recipes/acacia_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/acacia_chest_boat.json rename to src/main/generated/data/minecraft/recipes/acacia_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/acacia_fence.json b/src/main/generated/data/minecraft/recipes/acacia_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/acacia_fence.json rename to src/main/generated/data/minecraft/recipes/acacia_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/acacia_fence_gate.json b/src/main/generated/data/minecraft/recipes/acacia_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/acacia_fence_gate.json rename to src/main/generated/data/minecraft/recipes/acacia_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/acacia_sign.json b/src/main/generated/data/minecraft/recipes/acacia_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/acacia_sign.json rename to src/main/generated/data/minecraft/recipes/acacia_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/activator_rail.json b/src/main/generated/data/minecraft/recipes/activator_rail.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/activator_rail.json rename to src/main/generated/data/minecraft/recipes/activator_rail.json diff --git a/src/generated/resources/data/minecraft/recipes/andesite.json b/src/main/generated/data/minecraft/recipes/andesite.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/andesite.json rename to src/main/generated/data/minecraft/recipes/andesite.json diff --git a/src/generated/resources/data/minecraft/recipes/anvil.json b/src/main/generated/data/minecraft/recipes/anvil.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/anvil.json rename to src/main/generated/data/minecraft/recipes/anvil.json diff --git a/src/generated/resources/data/minecraft/recipes/armor_stand.json b/src/main/generated/data/minecraft/recipes/armor_stand.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/armor_stand.json rename to src/main/generated/data/minecraft/recipes/armor_stand.json diff --git a/src/generated/resources/data/minecraft/recipes/arrow.json b/src/main/generated/data/minecraft/recipes/arrow.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/arrow.json rename to src/main/generated/data/minecraft/recipes/arrow.json diff --git a/src/generated/resources/data/minecraft/recipes/bamboo_chest_raft.json b/src/main/generated/data/minecraft/recipes/bamboo_chest_raft.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bamboo_chest_raft.json rename to src/main/generated/data/minecraft/recipes/bamboo_chest_raft.json diff --git a/src/generated/resources/data/minecraft/recipes/bamboo_fence.json b/src/main/generated/data/minecraft/recipes/bamboo_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bamboo_fence.json rename to src/main/generated/data/minecraft/recipes/bamboo_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/bamboo_fence_gate.json b/src/main/generated/data/minecraft/recipes/bamboo_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bamboo_fence_gate.json rename to src/main/generated/data/minecraft/recipes/bamboo_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/bamboo_sign.json b/src/main/generated/data/minecraft/recipes/bamboo_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bamboo_sign.json rename to src/main/generated/data/minecraft/recipes/bamboo_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/birch_chest_boat.json b/src/main/generated/data/minecraft/recipes/birch_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/birch_chest_boat.json rename to src/main/generated/data/minecraft/recipes/birch_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/birch_fence.json b/src/main/generated/data/minecraft/recipes/birch_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/birch_fence.json rename to src/main/generated/data/minecraft/recipes/birch_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/birch_fence_gate.json b/src/main/generated/data/minecraft/recipes/birch_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/birch_fence_gate.json rename to src/main/generated/data/minecraft/recipes/birch_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/birch_sign.json b/src/main/generated/data/minecraft/recipes/birch_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/birch_sign.json rename to src/main/generated/data/minecraft/recipes/birch_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/black_banner.json b/src/main/generated/data/minecraft/recipes/black_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/black_banner.json rename to src/main/generated/data/minecraft/recipes/black_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/blast_furnace.json b/src/main/generated/data/minecraft/recipes/blast_furnace.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/blast_furnace.json rename to src/main/generated/data/minecraft/recipes/blast_furnace.json diff --git a/src/generated/resources/data/minecraft/recipes/blue_banner.json b/src/main/generated/data/minecraft/recipes/blue_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/blue_banner.json rename to src/main/generated/data/minecraft/recipes/blue_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/bow.json b/src/main/generated/data/minecraft/recipes/bow.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bow.json rename to src/main/generated/data/minecraft/recipes/bow.json diff --git a/src/generated/resources/data/minecraft/recipes/brown_banner.json b/src/main/generated/data/minecraft/recipes/brown_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/brown_banner.json rename to src/main/generated/data/minecraft/recipes/brown_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/brush.json b/src/main/generated/data/minecraft/recipes/brush.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/brush.json rename to src/main/generated/data/minecraft/recipes/brush.json diff --git a/src/generated/resources/data/minecraft/recipes/bucket.json b/src/main/generated/data/minecraft/recipes/bucket.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/bucket.json rename to src/main/generated/data/minecraft/recipes/bucket.json diff --git a/src/generated/resources/data/minecraft/recipes/calibrated_sculk_sensor.json b/src/main/generated/data/minecraft/recipes/calibrated_sculk_sensor.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/calibrated_sculk_sensor.json rename to src/main/generated/data/minecraft/recipes/calibrated_sculk_sensor.json diff --git a/src/generated/resources/data/minecraft/recipes/campfire.json b/src/main/generated/data/minecraft/recipes/campfire.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/campfire.json rename to src/main/generated/data/minecraft/recipes/campfire.json diff --git a/src/generated/resources/data/minecraft/recipes/candle.json b/src/main/generated/data/minecraft/recipes/candle.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/candle.json rename to src/main/generated/data/minecraft/recipes/candle.json diff --git a/src/generated/resources/data/minecraft/recipes/cauldron.json b/src/main/generated/data/minecraft/recipes/cauldron.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cauldron.json rename to src/main/generated/data/minecraft/recipes/cauldron.json diff --git a/src/generated/resources/data/minecraft/recipes/chain.json b/src/main/generated/data/minecraft/recipes/chain.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/chain.json rename to src/main/generated/data/minecraft/recipes/chain.json diff --git a/src/generated/resources/data/minecraft/recipes/cherry_chest_boat.json b/src/main/generated/data/minecraft/recipes/cherry_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cherry_chest_boat.json rename to src/main/generated/data/minecraft/recipes/cherry_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/cherry_fence.json b/src/main/generated/data/minecraft/recipes/cherry_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cherry_fence.json rename to src/main/generated/data/minecraft/recipes/cherry_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/cherry_fence_gate.json b/src/main/generated/data/minecraft/recipes/cherry_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cherry_fence_gate.json rename to src/main/generated/data/minecraft/recipes/cherry_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/cherry_sign.json b/src/main/generated/data/minecraft/recipes/cherry_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cherry_sign.json rename to src/main/generated/data/minecraft/recipes/cherry_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/chest_minecart.json b/src/main/generated/data/minecraft/recipes/chest_minecart.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/chest_minecart.json rename to src/main/generated/data/minecraft/recipes/chest_minecart.json diff --git a/src/generated/resources/data/minecraft/recipes/clock.json b/src/main/generated/data/minecraft/recipes/clock.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/clock.json rename to src/main/generated/data/minecraft/recipes/clock.json diff --git a/src/generated/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/coast_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/coast_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/coast_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/compass.json b/src/main/generated/data/minecraft/recipes/compass.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/compass.json rename to src/main/generated/data/minecraft/recipes/compass.json diff --git a/src/generated/resources/data/minecraft/recipes/crimson_fence.json b/src/main/generated/data/minecraft/recipes/crimson_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/crimson_fence.json rename to src/main/generated/data/minecraft/recipes/crimson_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/crimson_fence_gate.json b/src/main/generated/data/minecraft/recipes/crimson_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/crimson_fence_gate.json rename to src/main/generated/data/minecraft/recipes/crimson_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/crimson_sign.json b/src/main/generated/data/minecraft/recipes/crimson_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/crimson_sign.json rename to src/main/generated/data/minecraft/recipes/crimson_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/crossbow.json b/src/main/generated/data/minecraft/recipes/crossbow.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/crossbow.json rename to src/main/generated/data/minecraft/recipes/crossbow.json diff --git a/src/generated/resources/data/minecraft/recipes/cyan_banner.json b/src/main/generated/data/minecraft/recipes/cyan_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/cyan_banner.json rename to src/main/generated/data/minecraft/recipes/cyan_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/dark_oak_chest_boat.json b/src/main/generated/data/minecraft/recipes/dark_oak_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dark_oak_chest_boat.json rename to src/main/generated/data/minecraft/recipes/dark_oak_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/dark_oak_fence.json b/src/main/generated/data/minecraft/recipes/dark_oak_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dark_oak_fence.json rename to src/main/generated/data/minecraft/recipes/dark_oak_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/dark_oak_fence_gate.json b/src/main/generated/data/minecraft/recipes/dark_oak_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dark_oak_fence_gate.json rename to src/main/generated/data/minecraft/recipes/dark_oak_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/dark_oak_sign.json b/src/main/generated/data/minecraft/recipes/dark_oak_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dark_oak_sign.json rename to src/main/generated/data/minecraft/recipes/dark_oak_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/detector_rail.json b/src/main/generated/data/minecraft/recipes/detector_rail.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/detector_rail.json rename to src/main/generated/data/minecraft/recipes/detector_rail.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_axe.json b/src/main/generated/data/minecraft/recipes/diamond_axe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_axe.json rename to src/main/generated/data/minecraft/recipes/diamond_axe.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_boots.json b/src/main/generated/data/minecraft/recipes/diamond_boots.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_boots.json rename to src/main/generated/data/minecraft/recipes/diamond_boots.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_chestplate.json b/src/main/generated/data/minecraft/recipes/diamond_chestplate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_chestplate.json rename to src/main/generated/data/minecraft/recipes/diamond_chestplate.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_helmet.json b/src/main/generated/data/minecraft/recipes/diamond_helmet.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_helmet.json rename to src/main/generated/data/minecraft/recipes/diamond_helmet.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_hoe.json b/src/main/generated/data/minecraft/recipes/diamond_hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_hoe.json rename to src/main/generated/data/minecraft/recipes/diamond_hoe.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_leggings.json b/src/main/generated/data/minecraft/recipes/diamond_leggings.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_leggings.json rename to src/main/generated/data/minecraft/recipes/diamond_leggings.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_pickaxe.json b/src/main/generated/data/minecraft/recipes/diamond_pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_pickaxe.json rename to src/main/generated/data/minecraft/recipes/diamond_pickaxe.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_shovel.json b/src/main/generated/data/minecraft/recipes/diamond_shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_shovel.json rename to src/main/generated/data/minecraft/recipes/diamond_shovel.json diff --git a/src/generated/resources/data/minecraft/recipes/diamond_sword.json b/src/main/generated/data/minecraft/recipes/diamond_sword.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diamond_sword.json rename to src/main/generated/data/minecraft/recipes/diamond_sword.json diff --git a/src/generated/resources/data/minecraft/recipes/diorite.json b/src/main/generated/data/minecraft/recipes/diorite.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/diorite.json rename to src/main/generated/data/minecraft/recipes/diorite.json diff --git a/src/generated/resources/data/minecraft/recipes/dispenser.json b/src/main/generated/data/minecraft/recipes/dispenser.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dispenser.json rename to src/main/generated/data/minecraft/recipes/dispenser.json diff --git a/src/generated/resources/data/minecraft/recipes/dropper.json b/src/main/generated/data/minecraft/recipes/dropper.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dropper.json rename to src/main/generated/data/minecraft/recipes/dropper.json diff --git a/src/generated/resources/data/minecraft/recipes/dune_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/dune_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/dune_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/dune_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/enchanting_table.json b/src/main/generated/data/minecraft/recipes/enchanting_table.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/enchanting_table.json rename to src/main/generated/data/minecraft/recipes/enchanting_table.json diff --git a/src/generated/resources/data/minecraft/recipes/eye_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/eye_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/eye_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/eye_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/fishing_rod.json b/src/main/generated/data/minecraft/recipes/fishing_rod.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/fishing_rod.json rename to src/main/generated/data/minecraft/recipes/fishing_rod.json diff --git a/src/generated/resources/data/minecraft/recipes/flint_and_steel.json b/src/main/generated/data/minecraft/recipes/flint_and_steel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/flint_and_steel.json rename to src/main/generated/data/minecraft/recipes/flint_and_steel.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_apple.json b/src/main/generated/data/minecraft/recipes/golden_apple.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_apple.json rename to src/main/generated/data/minecraft/recipes/golden_apple.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_axe.json b/src/main/generated/data/minecraft/recipes/golden_axe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_axe.json rename to src/main/generated/data/minecraft/recipes/golden_axe.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_boots.json b/src/main/generated/data/minecraft/recipes/golden_boots.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_boots.json rename to src/main/generated/data/minecraft/recipes/golden_boots.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_chestplate.json b/src/main/generated/data/minecraft/recipes/golden_chestplate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_chestplate.json rename to src/main/generated/data/minecraft/recipes/golden_chestplate.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_helmet.json b/src/main/generated/data/minecraft/recipes/golden_helmet.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_helmet.json rename to src/main/generated/data/minecraft/recipes/golden_helmet.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_hoe.json b/src/main/generated/data/minecraft/recipes/golden_hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_hoe.json rename to src/main/generated/data/minecraft/recipes/golden_hoe.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_leggings.json b/src/main/generated/data/minecraft/recipes/golden_leggings.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_leggings.json rename to src/main/generated/data/minecraft/recipes/golden_leggings.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_pickaxe.json b/src/main/generated/data/minecraft/recipes/golden_pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_pickaxe.json rename to src/main/generated/data/minecraft/recipes/golden_pickaxe.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_shovel.json b/src/main/generated/data/minecraft/recipes/golden_shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_shovel.json rename to src/main/generated/data/minecraft/recipes/golden_shovel.json diff --git a/src/generated/resources/data/minecraft/recipes/golden_sword.json b/src/main/generated/data/minecraft/recipes/golden_sword.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/golden_sword.json rename to src/main/generated/data/minecraft/recipes/golden_sword.json diff --git a/src/generated/resources/data/minecraft/recipes/gray_banner.json b/src/main/generated/data/minecraft/recipes/gray_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/gray_banner.json rename to src/main/generated/data/minecraft/recipes/gray_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/green_banner.json b/src/main/generated/data/minecraft/recipes/green_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/green_banner.json rename to src/main/generated/data/minecraft/recipes/green_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/grindstone.json b/src/main/generated/data/minecraft/recipes/grindstone.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/grindstone.json rename to src/main/generated/data/minecraft/recipes/grindstone.json diff --git a/src/generated/resources/data/minecraft/recipes/heavy_weighted_pressure_plate.json b/src/main/generated/data/minecraft/recipes/heavy_weighted_pressure_plate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/heavy_weighted_pressure_plate.json rename to src/main/generated/data/minecraft/recipes/heavy_weighted_pressure_plate.json diff --git a/src/generated/resources/data/minecraft/recipes/hopper.json b/src/main/generated/data/minecraft/recipes/hopper.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/hopper.json rename to src/main/generated/data/minecraft/recipes/hopper.json diff --git a/src/generated/resources/data/minecraft/recipes/host_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/host_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/host_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/host_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_axe.json b/src/main/generated/data/minecraft/recipes/iron_axe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_axe.json rename to src/main/generated/data/minecraft/recipes/iron_axe.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_bars.json b/src/main/generated/data/minecraft/recipes/iron_bars.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_bars.json rename to src/main/generated/data/minecraft/recipes/iron_bars.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_boots.json b/src/main/generated/data/minecraft/recipes/iron_boots.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_boots.json rename to src/main/generated/data/minecraft/recipes/iron_boots.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_chestplate.json b/src/main/generated/data/minecraft/recipes/iron_chestplate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_chestplate.json rename to src/main/generated/data/minecraft/recipes/iron_chestplate.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_door.json b/src/main/generated/data/minecraft/recipes/iron_door.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_door.json rename to src/main/generated/data/minecraft/recipes/iron_door.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_helmet.json b/src/main/generated/data/minecraft/recipes/iron_helmet.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_helmet.json rename to src/main/generated/data/minecraft/recipes/iron_helmet.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_hoe.json b/src/main/generated/data/minecraft/recipes/iron_hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_hoe.json rename to src/main/generated/data/minecraft/recipes/iron_hoe.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_leggings.json b/src/main/generated/data/minecraft/recipes/iron_leggings.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_leggings.json rename to src/main/generated/data/minecraft/recipes/iron_leggings.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_pickaxe.json b/src/main/generated/data/minecraft/recipes/iron_pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_pickaxe.json rename to src/main/generated/data/minecraft/recipes/iron_pickaxe.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_shovel.json b/src/main/generated/data/minecraft/recipes/iron_shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_shovel.json rename to src/main/generated/data/minecraft/recipes/iron_shovel.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_sword.json b/src/main/generated/data/minecraft/recipes/iron_sword.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_sword.json rename to src/main/generated/data/minecraft/recipes/iron_sword.json diff --git a/src/generated/resources/data/minecraft/recipes/iron_trapdoor.json b/src/main/generated/data/minecraft/recipes/iron_trapdoor.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/iron_trapdoor.json rename to src/main/generated/data/minecraft/recipes/iron_trapdoor.json diff --git a/src/generated/resources/data/minecraft/recipes/item_frame.json b/src/main/generated/data/minecraft/recipes/item_frame.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/item_frame.json rename to src/main/generated/data/minecraft/recipes/item_frame.json diff --git a/src/generated/resources/data/minecraft/recipes/jukebox.json b/src/main/generated/data/minecraft/recipes/jukebox.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/jukebox.json rename to src/main/generated/data/minecraft/recipes/jukebox.json diff --git a/src/generated/resources/data/minecraft/recipes/jungle_chest_boat.json b/src/main/generated/data/minecraft/recipes/jungle_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/jungle_chest_boat.json rename to src/main/generated/data/minecraft/recipes/jungle_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/jungle_fence.json b/src/main/generated/data/minecraft/recipes/jungle_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/jungle_fence.json rename to src/main/generated/data/minecraft/recipes/jungle_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/jungle_fence_gate.json b/src/main/generated/data/minecraft/recipes/jungle_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/jungle_fence_gate.json rename to src/main/generated/data/minecraft/recipes/jungle_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/jungle_sign.json b/src/main/generated/data/minecraft/recipes/jungle_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/jungle_sign.json rename to src/main/generated/data/minecraft/recipes/jungle_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/ladder.json b/src/main/generated/data/minecraft/recipes/ladder.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/ladder.json rename to src/main/generated/data/minecraft/recipes/ladder.json diff --git a/src/generated/resources/data/minecraft/recipes/lead.json b/src/main/generated/data/minecraft/recipes/lead.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/lead.json rename to src/main/generated/data/minecraft/recipes/lead.json diff --git a/src/generated/resources/data/minecraft/recipes/lever.json b/src/main/generated/data/minecraft/recipes/lever.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/lever.json rename to src/main/generated/data/minecraft/recipes/lever.json diff --git a/src/generated/resources/data/minecraft/recipes/light_blue_banner.json b/src/main/generated/data/minecraft/recipes/light_blue_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/light_blue_banner.json rename to src/main/generated/data/minecraft/recipes/light_blue_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/light_gray_banner.json b/src/main/generated/data/minecraft/recipes/light_gray_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/light_gray_banner.json rename to src/main/generated/data/minecraft/recipes/light_gray_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/light_weighted_pressure_plate.json b/src/main/generated/data/minecraft/recipes/light_weighted_pressure_plate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/light_weighted_pressure_plate.json rename to src/main/generated/data/minecraft/recipes/light_weighted_pressure_plate.json diff --git a/src/generated/resources/data/minecraft/recipes/lightning_rod.json b/src/main/generated/data/minecraft/recipes/lightning_rod.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/lightning_rod.json rename to src/main/generated/data/minecraft/recipes/lightning_rod.json diff --git a/src/generated/resources/data/minecraft/recipes/lime_banner.json b/src/main/generated/data/minecraft/recipes/lime_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/lime_banner.json rename to src/main/generated/data/minecraft/recipes/lime_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/lodestone.json b/src/main/generated/data/minecraft/recipes/lodestone.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/lodestone.json rename to src/main/generated/data/minecraft/recipes/lodestone.json diff --git a/src/generated/resources/data/minecraft/recipes/loom.json b/src/main/generated/data/minecraft/recipes/loom.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/loom.json rename to src/main/generated/data/minecraft/recipes/loom.json diff --git a/src/generated/resources/data/minecraft/recipes/magenta_banner.json b/src/main/generated/data/minecraft/recipes/magenta_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/magenta_banner.json rename to src/main/generated/data/minecraft/recipes/magenta_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/mangrove_chest_boat.json b/src/main/generated/data/minecraft/recipes/mangrove_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mangrove_chest_boat.json rename to src/main/generated/data/minecraft/recipes/mangrove_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/mangrove_fence.json b/src/main/generated/data/minecraft/recipes/mangrove_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mangrove_fence.json rename to src/main/generated/data/minecraft/recipes/mangrove_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/mangrove_fence_gate.json b/src/main/generated/data/minecraft/recipes/mangrove_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mangrove_fence_gate.json rename to src/main/generated/data/minecraft/recipes/mangrove_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/mangrove_sign.json b/src/main/generated/data/minecraft/recipes/mangrove_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mangrove_sign.json rename to src/main/generated/data/minecraft/recipes/mangrove_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/minecart.json b/src/main/generated/data/minecraft/recipes/minecart.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/minecart.json rename to src/main/generated/data/minecraft/recipes/minecart.json diff --git a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json b/src/main/generated/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json rename to src/main/generated/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json diff --git a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json b/src/main/generated/data/minecraft/recipes/mossy_cobblestone_from_vine.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json rename to src/main/generated/data/minecraft/recipes/mossy_cobblestone_from_vine.json diff --git a/src/generated/resources/data/minecraft/recipes/netherite_ingot.json b/src/main/generated/data/minecraft/recipes/netherite_ingot.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/netherite_ingot.json rename to src/main/generated/data/minecraft/recipes/netherite_ingot.json diff --git a/src/generated/resources/data/minecraft/recipes/netherite_upgrade_smithing_template.json b/src/main/generated/data/minecraft/recipes/netherite_upgrade_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/netherite_upgrade_smithing_template.json rename to src/main/generated/data/minecraft/recipes/netherite_upgrade_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/oak_chest_boat.json b/src/main/generated/data/minecraft/recipes/oak_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/oak_chest_boat.json rename to src/main/generated/data/minecraft/recipes/oak_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/oak_fence.json b/src/main/generated/data/minecraft/recipes/oak_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/oak_fence.json rename to src/main/generated/data/minecraft/recipes/oak_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/oak_fence_gate.json b/src/main/generated/data/minecraft/recipes/oak_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/oak_fence_gate.json rename to src/main/generated/data/minecraft/recipes/oak_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/oak_sign.json b/src/main/generated/data/minecraft/recipes/oak_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/oak_sign.json rename to src/main/generated/data/minecraft/recipes/oak_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/observer.json b/src/main/generated/data/minecraft/recipes/observer.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/observer.json rename to src/main/generated/data/minecraft/recipes/observer.json diff --git a/src/generated/resources/data/minecraft/recipes/orange_banner.json b/src/main/generated/data/minecraft/recipes/orange_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/orange_banner.json rename to src/main/generated/data/minecraft/recipes/orange_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/painting.json b/src/main/generated/data/minecraft/recipes/painting.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/painting.json rename to src/main/generated/data/minecraft/recipes/painting.json diff --git a/src/generated/resources/data/minecraft/recipes/pink_banner.json b/src/main/generated/data/minecraft/recipes/pink_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/pink_banner.json rename to src/main/generated/data/minecraft/recipes/pink_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/piston.json b/src/main/generated/data/minecraft/recipes/piston.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/piston.json rename to src/main/generated/data/minecraft/recipes/piston.json diff --git a/src/generated/resources/data/minecraft/recipes/polished_deepslate.json b/src/main/generated/data/minecraft/recipes/polished_deepslate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/polished_deepslate.json rename to src/main/generated/data/minecraft/recipes/polished_deepslate.json diff --git a/src/generated/resources/data/minecraft/recipes/powered_rail.json b/src/main/generated/data/minecraft/recipes/powered_rail.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/powered_rail.json rename to src/main/generated/data/minecraft/recipes/powered_rail.json diff --git a/src/generated/resources/data/minecraft/recipes/purple_banner.json b/src/main/generated/data/minecraft/recipes/purple_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/purple_banner.json rename to src/main/generated/data/minecraft/recipes/purple_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/rail.json b/src/main/generated/data/minecraft/recipes/rail.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/rail.json rename to src/main/generated/data/minecraft/recipes/rail.json diff --git a/src/generated/resources/data/minecraft/recipes/raiser_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/raiser_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/raiser_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/raiser_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/red_banner.json b/src/main/generated/data/minecraft/recipes/red_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/red_banner.json rename to src/main/generated/data/minecraft/recipes/red_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/redstone_torch.json b/src/main/generated/data/minecraft/recipes/redstone_torch.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/redstone_torch.json rename to src/main/generated/data/minecraft/recipes/redstone_torch.json diff --git a/src/generated/resources/data/minecraft/recipes/rib_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/rib_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/rib_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/rib_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/scaffolding.json b/src/main/generated/data/minecraft/recipes/scaffolding.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/scaffolding.json rename to src/main/generated/data/minecraft/recipes/scaffolding.json diff --git a/src/generated/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/sentry_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/sentry_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/sentry_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/shaper_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/shaper_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/shaper_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/shaper_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/shears.json b/src/main/generated/data/minecraft/recipes/shears.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/shears.json rename to src/main/generated/data/minecraft/recipes/shears.json diff --git a/src/generated/resources/data/minecraft/recipes/shield.json b/src/main/generated/data/minecraft/recipes/shield.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/shield.json rename to src/main/generated/data/minecraft/recipes/shield.json diff --git a/src/generated/resources/data/minecraft/recipes/shulker_box.json b/src/main/generated/data/minecraft/recipes/shulker_box.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/shulker_box.json rename to src/main/generated/data/minecraft/recipes/shulker_box.json diff --git a/src/generated/resources/data/minecraft/recipes/silence_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/silence_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/silence_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/silence_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/smithing_table.json b/src/main/generated/data/minecraft/recipes/smithing_table.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/smithing_table.json rename to src/main/generated/data/minecraft/recipes/smithing_table.json diff --git a/src/generated/resources/data/minecraft/recipes/snout_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/snout_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/snout_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/snout_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/soul_campfire.json b/src/main/generated/data/minecraft/recipes/soul_campfire.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/soul_campfire.json rename to src/main/generated/data/minecraft/recipes/soul_campfire.json diff --git a/src/generated/resources/data/minecraft/recipes/soul_torch.json b/src/main/generated/data/minecraft/recipes/soul_torch.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/soul_torch.json rename to src/main/generated/data/minecraft/recipes/soul_torch.json diff --git a/src/generated/resources/data/minecraft/recipes/spire_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/spire_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spire_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/spire_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/spruce_chest_boat.json b/src/main/generated/data/minecraft/recipes/spruce_chest_boat.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spruce_chest_boat.json rename to src/main/generated/data/minecraft/recipes/spruce_chest_boat.json diff --git a/src/generated/resources/data/minecraft/recipes/spruce_fence.json b/src/main/generated/data/minecraft/recipes/spruce_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spruce_fence.json rename to src/main/generated/data/minecraft/recipes/spruce_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/spruce_fence_gate.json b/src/main/generated/data/minecraft/recipes/spruce_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spruce_fence_gate.json rename to src/main/generated/data/minecraft/recipes/spruce_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/spruce_sign.json b/src/main/generated/data/minecraft/recipes/spruce_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spruce_sign.json rename to src/main/generated/data/minecraft/recipes/spruce_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/spyglass.json b/src/main/generated/data/minecraft/recipes/spyglass.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/spyglass.json rename to src/main/generated/data/minecraft/recipes/spyglass.json diff --git a/src/generated/resources/data/minecraft/recipes/stone_axe.json b/src/main/generated/data/minecraft/recipes/stone_axe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stone_axe.json rename to src/main/generated/data/minecraft/recipes/stone_axe.json diff --git a/src/generated/resources/data/minecraft/recipes/stone_hoe.json b/src/main/generated/data/minecraft/recipes/stone_hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stone_hoe.json rename to src/main/generated/data/minecraft/recipes/stone_hoe.json diff --git a/src/generated/resources/data/minecraft/recipes/stone_pickaxe.json b/src/main/generated/data/minecraft/recipes/stone_pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stone_pickaxe.json rename to src/main/generated/data/minecraft/recipes/stone_pickaxe.json diff --git a/src/generated/resources/data/minecraft/recipes/stone_shovel.json b/src/main/generated/data/minecraft/recipes/stone_shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stone_shovel.json rename to src/main/generated/data/minecraft/recipes/stone_shovel.json diff --git a/src/generated/resources/data/minecraft/recipes/stone_sword.json b/src/main/generated/data/minecraft/recipes/stone_sword.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stone_sword.json rename to src/main/generated/data/minecraft/recipes/stone_sword.json diff --git a/src/generated/resources/data/minecraft/recipes/stonecutter.json b/src/main/generated/data/minecraft/recipes/stonecutter.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/stonecutter.json rename to src/main/generated/data/minecraft/recipes/stonecutter.json diff --git a/src/generated/resources/data/minecraft/recipes/tide_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/tide_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/tide_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/tide_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/tinted_glass.json b/src/main/generated/data/minecraft/recipes/tinted_glass.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/tinted_glass.json rename to src/main/generated/data/minecraft/recipes/tinted_glass.json diff --git a/src/generated/resources/data/minecraft/recipes/torch.json b/src/main/generated/data/minecraft/recipes/torch.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/torch.json rename to src/main/generated/data/minecraft/recipes/torch.json diff --git a/src/generated/resources/data/minecraft/recipes/trapped_chest.json b/src/main/generated/data/minecraft/recipes/trapped_chest.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/trapped_chest.json rename to src/main/generated/data/minecraft/recipes/trapped_chest.json diff --git a/src/generated/resources/data/minecraft/recipes/tripwire_hook.json b/src/main/generated/data/minecraft/recipes/tripwire_hook.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/tripwire_hook.json rename to src/main/generated/data/minecraft/recipes/tripwire_hook.json diff --git a/src/generated/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/vex_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/vex_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/vex_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/ward_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/ward_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/ward_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/ward_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/warped_fence.json b/src/main/generated/data/minecraft/recipes/warped_fence.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/warped_fence.json rename to src/main/generated/data/minecraft/recipes/warped_fence.json diff --git a/src/generated/resources/data/minecraft/recipes/warped_fence_gate.json b/src/main/generated/data/minecraft/recipes/warped_fence_gate.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/warped_fence_gate.json rename to src/main/generated/data/minecraft/recipes/warped_fence_gate.json diff --git a/src/generated/resources/data/minecraft/recipes/warped_sign.json b/src/main/generated/data/minecraft/recipes/warped_sign.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/warped_sign.json rename to src/main/generated/data/minecraft/recipes/warped_sign.json diff --git a/src/generated/resources/data/minecraft/recipes/wayfinder_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/wayfinder_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wayfinder_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/wayfinder_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/white_banner.json b/src/main/generated/data/minecraft/recipes/white_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/white_banner.json rename to src/main/generated/data/minecraft/recipes/white_banner.json diff --git a/src/generated/resources/data/minecraft/recipes/wild_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipes/wild_armor_trim_smithing_template.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wild_armor_trim_smithing_template.json rename to src/main/generated/data/minecraft/recipes/wild_armor_trim_smithing_template.json diff --git a/src/generated/resources/data/minecraft/recipes/wooden_axe.json b/src/main/generated/data/minecraft/recipes/wooden_axe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wooden_axe.json rename to src/main/generated/data/minecraft/recipes/wooden_axe.json diff --git a/src/generated/resources/data/minecraft/recipes/wooden_hoe.json b/src/main/generated/data/minecraft/recipes/wooden_hoe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wooden_hoe.json rename to src/main/generated/data/minecraft/recipes/wooden_hoe.json diff --git a/src/generated/resources/data/minecraft/recipes/wooden_pickaxe.json b/src/main/generated/data/minecraft/recipes/wooden_pickaxe.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wooden_pickaxe.json rename to src/main/generated/data/minecraft/recipes/wooden_pickaxe.json diff --git a/src/generated/resources/data/minecraft/recipes/wooden_shovel.json b/src/main/generated/data/minecraft/recipes/wooden_shovel.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wooden_shovel.json rename to src/main/generated/data/minecraft/recipes/wooden_shovel.json diff --git a/src/generated/resources/data/minecraft/recipes/wooden_sword.json b/src/main/generated/data/minecraft/recipes/wooden_sword.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/wooden_sword.json rename to src/main/generated/data/minecraft/recipes/wooden_sword.json diff --git a/src/generated/resources/data/minecraft/recipes/yellow_banner.json b/src/main/generated/data/minecraft/recipes/yellow_banner.json similarity index 100% rename from src/generated/resources/data/minecraft/recipes/yellow_banner.json rename to src/main/generated/data/minecraft/recipes/yellow_banner.json diff --git a/src/generated/resources/pack.mcmeta b/src/main/generated/pack.mcmeta similarity index 100% rename from src/generated/resources/pack.mcmeta rename to src/main/generated/pack.mcmeta diff --git a/src/fmlcommon/java/net/minecraftforge/fml/core/ModStateProvider.java b/src/main/java/net/minecraftforge/fml/core/ModStateProvider.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/core/ModStateProvider.java rename to src/main/java/net/minecraftforge/fml/core/ModStateProvider.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/core/ParallelTransition.java b/src/main/java/net/minecraftforge/fml/core/ParallelTransition.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/core/ParallelTransition.java rename to src/main/java/net/minecraftforge/fml/core/ParallelTransition.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/config/ModConfigEvent.java b/src/main/java/net/minecraftforge/fml/event/config/ModConfigEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/config/ModConfigEvent.java rename to src/main/java/net/minecraftforge/fml/event/config/ModConfigEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLClientSetupEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLCommonSetupEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLConstructModEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLDedicatedServerSetupEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/FMLLoadCompleteEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/InterModEnqueueEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/InterModProcessEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/ModLifecycleEvent.java diff --git a/src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/ParallelDispatchEvent.java b/src/main/java/net/minecraftforge/fml/event/lifecycle/ParallelDispatchEvent.java similarity index 100% rename from src/fmlcommon/java/net/minecraftforge/fml/event/lifecycle/ParallelDispatchEvent.java rename to src/main/java/net/minecraftforge/fml/event/lifecycle/ParallelDispatchEvent.java diff --git a/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java b/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java index 0729bfae68..bdc2ac0eaa 100644 --- a/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java +++ b/src/main/java/net/minecraftforge/versions/forge/ForgeVersion.java @@ -8,14 +8,12 @@ package net.minecraftforge.versions.forge; import net.minecraftforge.fml.Logging; import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.VersionChecker; -import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.JarVersionLookupHandler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.Nullable; -public class ForgeVersion -{ +public class ForgeVersion { private static final Logger LOGGER = LogManager.getLogger(); // This is Forge's Mod Id, used for the ForgeMod and resource locations public static final String MOD_ID = "forge"; @@ -26,35 +24,29 @@ public class ForgeVersion static { LOGGER.debug(Logging.CORE, "Forge Version package {} from {}", ForgeVersion.class.getPackage(), ForgeVersion.class.getClassLoader()); - String vers = JarVersionLookupHandler.getImplementationVersion(ForgeVersion.class).orElse(FMLLoader.versionInfo().forgeVersion()); - if (vers == null) throw new RuntimeException("Missing forge version, cannot continue"); - String spec = JarVersionLookupHandler.getSpecificationVersion(ForgeVersion.class).orElse(System.getenv("FORGE_SPEC")); - if (spec == null) throw new RuntimeException("Missing forge spec, cannot continue"); - String group = JarVersionLookupHandler.getImplementationTitle(ForgeVersion.class).orElse(FMLLoader.versionInfo().forgeGroup()); - if (group == null) { - group = "net.minecraftforge"; // If all else fails, Our normal group - } - forgeVersion = vers; - forgeSpec = spec; - forgeGroup = group; + var info = JarVersionLookupHandler.getInfo(ForgeVersion.class); + + if (info.impl().version().isEmpty() || info.spec().version().isEmpty()) + throw new IllegalStateException("Failed to find version for package " + ForgeVersion.class.getPackageName() + " This is an invalid environment"); + + forgeSpec = info.spec().version().get(); + forgeVersion = info.impl().version().get(); + forgeGroup = "net.minecraftforge"; LOGGER.debug(Logging.CORE, "Found Forge version {}", forgeVersion); LOGGER.debug(Logging.CORE, "Found Forge spec {}", forgeSpec); LOGGER.debug(Logging.CORE, "Found Forge group {}", forgeGroup); } - public static String getVersion() - { + public static String getVersion() { return forgeVersion; } - public static VersionChecker.Status getStatus() - { + public static VersionChecker.Status getStatus() { return VersionChecker.getResult(ModList.get().getModFileById(MOD_ID).getMods().get(0)).status(); } @Nullable - public static String getTarget() - { + public static String getTarget() { VersionChecker.CheckResult res = VersionChecker.getResult(ModList.get().getModFileById(MOD_ID).getMods().get(0)); return res.target() == null ? "" : res.target().toString(); } diff --git a/src/main/java/net/minecraftforge/versions/mcp/MCPVersion.java b/src/main/java/net/minecraftforge/versions/mcp/MCPVersion.java index af2990f46b..9f73463a2c 100644 --- a/src/main/java/net/minecraftforge/versions/mcp/MCPVersion.java +++ b/src/main/java/net/minecraftforge/versions/mcp/MCPVersion.java @@ -9,24 +9,25 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import net.minecraftforge.fml.Logging; -import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.JarVersionLookupHandler; public class MCPVersion { private static final Logger LOGGER = LogManager.getLogger(); private static final String mcVersion; private static final String mcpVersion; + static { LOGGER.debug(Logging.CORE, "MCP Version package {} from {}", MCPVersion.class.getPackage(), MCPVersion.class.getClassLoader()); - mcVersion = JarVersionLookupHandler.getSpecificationVersion(MCPVersion.class).orElse(FMLLoader.versionInfo().mcVersion()); - if (mcVersion == null) throw new RuntimeException("Missing MC version, cannot continue"); - - mcpVersion = JarVersionLookupHandler.getImplementationVersion(MCPVersion.class).orElse(FMLLoader.versionInfo().mcpVersion()); - if (mcpVersion == null) throw new RuntimeException("Missing MCP version, cannot continue"); + var info = JarVersionLookupHandler.getInfo(MCPVersion.class); + if (info.spec().version().isEmpty() || info.impl().version().isEmpty()) + throw new IllegalStateException("Failed to find version for package " + MCPVersion.class.getPackageName() + " This is an invalid environment"); + mcVersion = info.spec().version().get(); + mcpVersion = info.impl().version().get(); LOGGER.debug(Logging.CORE, "Found MC version information {}", mcVersion); LOGGER.debug(Logging.CORE, "Found MCP version information {}", mcpVersion); } + public static String getMCVersion() { return mcVersion; } @@ -35,8 +36,7 @@ public class MCPVersion { return mcpVersion; } - public static String getMCPandMCVersion() - { - return mcVersion+"-"+mcpVersion; + public static String getMCPandMCVersion() { + return mcVersion + "-" + mcpVersion; } } diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index d67155d991..0000000000 --- a/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1 +0,0 @@ -FML-System-Mods: forge diff --git a/src/main/resources/forge.srg b/src/main/resources/forge.srg deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/src/generated_test/resources/conditional_loot_test/data/conditional_loot_test/loot_tables/blocks/test.json b/src/test/generated/conditional_loot_test/data/conditional_loot_test/loot_tables/blocks/test.json similarity index 100% rename from src/generated_test/resources/conditional_loot_test/data/conditional_loot_test/loot_tables/blocks/test.json rename to src/test/generated/conditional_loot_test/data/conditional_loot_test/loot_tables/blocks/test.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_doesnt_load_empty.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_doesnt_load_empty.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_doesnt_load_empty.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_doesnt_load_empty.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_recipe_choice.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_recipe_choice.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_recipe_choice.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/conditional_recipe_choice.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/cooking_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shaped_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/shapeless_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/singe_item_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/singe_item_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/singe_item_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/singe_item_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/single_item_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/single_item_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/single_item_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/single_item_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/test_encode_all_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/test_encode_all_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/test_encode_all_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/advancements/recipes/misc/test_encode_all_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/conditional_doesnt_load_empty.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/conditional_doesnt_load_empty.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/conditional_doesnt_load_empty.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/conditional_doesnt_load_empty.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/conditional_recipe_choice.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/conditional_recipe_choice.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/conditional_recipe_choice.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/conditional_recipe_choice.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/cooking_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/cooking_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/cooking_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/cooking_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/cooking_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/cooking_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/cooking_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/cooking_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shaped_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shaped_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shaped_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shaped_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shaped_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shaped_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shaped_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shaped_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shapeless_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shapeless_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shapeless_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shapeless_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shapeless_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shapeless_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/shapeless_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/shapeless_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/singe_item_true_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/singe_item_true_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/singe_item_true_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/singe_item_true_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/single_item_false_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/single_item_false_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/single_item_false_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/single_item_false_conditions.json diff --git a/src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/test_encode_all_conditions.json b/src/test/generated/conditional_recipe/data/conditional_recipe/recipes/test_encode_all_conditions.json similarity index 100% rename from src/generated_test/resources/conditional_recipe/data/conditional_recipe/recipes/test_encode_all_conditions.json rename to src/test/generated/conditional_recipe/data/conditional_recipe/recipes/test_encode_all_conditions.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/compound_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/compound_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/compound_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/compound_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/difference_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/difference_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/difference_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/difference_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/intersection_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/intersection_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/intersection_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/intersection_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_damage_only.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_damage_only.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_damage_only.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_damage_only.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_name_only.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_name_only.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_name_only.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/partial_nbt_name_only.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/strict_nbt_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/strict_nbt_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/strict_nbt_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/advancements/recipes/misc/strict_nbt_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/compound_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/compound_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/compound_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/compound_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/difference_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/difference_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/difference_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/difference_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/intersection_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/intersection_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/intersection_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/intersection_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_damage_only.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_damage_only.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_damage_only.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_damage_only.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_name_only.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_name_only.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_name_only.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/partial_nbt_name_only.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/strict_nbt_ingredient.json b/src/test/generated/custom_ingredients/data/custom_ingredients/recipes/strict_nbt_ingredient.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/recipes/strict_nbt_ingredient.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/recipes/strict_nbt_ingredient.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/tags/items/left.json b/src/test/generated/custom_ingredients/data/custom_ingredients/tags/items/left.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/tags/items/left.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/tags/items/left.json diff --git a/src/generated_test/resources/custom_ingredients/data/custom_ingredients/tags/items/right.json b/src/test/generated/custom_ingredients/data/custom_ingredients/tags/items/right.json similarity index 100% rename from src/generated_test/resources/custom_ingredients/data/custom_ingredients/tags/items/right.json rename to src/test/generated/custom_ingredients/data/custom_ingredients/tags/items/right.json diff --git a/src/generated_test/resources/global_loot_test/data/forge/loot_modifiers/global_loot_modifiers.json b/src/test/generated/global_loot_test/data/forge/loot_modifiers/global_loot_modifiers.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/forge/loot_modifiers/global_loot_modifiers.json rename to src/test/generated/global_loot_test/data/forge/loot_modifiers/global_loot_modifiers.json diff --git a/src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/bamboo_silk.json b/src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/bamboo_silk.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/bamboo_silk.json rename to src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/bamboo_silk.json diff --git a/src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/multiply_loot.json b/src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/multiply_loot.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/multiply_loot.json rename to src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/multiply_loot.json diff --git a/src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/smelting.json b/src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/smelting.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/smelting.json rename to src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/smelting.json diff --git a/src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/wheat_harvest.json b/src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/wheat_harvest.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/global_loot_test/loot_modifiers/wheat_harvest.json rename to src/test/generated/global_loot_test/data/global_loot_test/loot_modifiers/wheat_harvest.json diff --git a/src/generated_test/resources/global_loot_test/data/global_loot_test/loot_tables/blocks/test.json b/src/test/generated/global_loot_test/data/global_loot_test/loot_tables/blocks/test.json similarity index 100% rename from src/generated_test/resources/global_loot_test/data/global_loot_test/loot_tables/blocks/test.json rename to src/test/generated/global_loot_test/data/global_loot_test/loot_tables/blocks/test.json diff --git a/src/generated_test/resources/mdk_datagen/pack.mcmeta b/src/test/generated/mdk_datagen/pack.mcmeta similarity index 100% rename from src/generated_test/resources/mdk_datagen/pack.mcmeta rename to src/test/generated/mdk_datagen/pack.mcmeta diff --git a/src/generated_test/resources/test_helper_mod/pack.mcmeta b/src/test/generated/test_helper_mod/pack.mcmeta similarity index 100% rename from src/generated_test/resources/test_helper_mod/pack.mcmeta rename to src/test/generated/test_helper_mod/pack.mcmeta diff --git a/src/test/resources/META-INF/MANIFEST.MF b/src/test/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..e63a379d1d --- /dev/null +++ b/src/test/resources/META-INF/MANIFEST.MF @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 +Automatic-Module-Name: net.minecraftforge.forge.test