From 4f2f4caaeb13b377c097c89cb16367243c132028 Mon Sep 17 00:00:00 2001 From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:03:27 +0100 Subject: [PATCH] wip neoforged --- fabric/build.gradle | 9 +- forge/build.gradle | 8 +- gradle.properties | 16 +- neoforge/.gitattributes | 5 + neoforge/.gitignore | 26 +++ neoforge/build.gradle | 155 ++++++++++++++++++ neoforge/dependencies.gradle | 2 + .../src/main/resources/META-INF/mods.toml | 27 +++ neoforge/src/main/resources/balm.mixins.json | 30 ++++ .../data/balm/forge/biome_modifier/balm.json | 3 + .../data/balm/tags/items/black_dyes.json | 10 ++ .../data/balm/tags/items/blue_dyes.json | 10 ++ .../data/balm/tags/items/brown_dyes.json | 7 + .../data/balm/tags/items/cooking_oil.json | 6 + .../data/balm/tags/items/cyan_dyes.json | 7 + .../data/balm/tags/items/diamonds.json | 7 + .../resources/data/balm/tags/items/dyes.json | 9 + .../resources/data/balm/tags/items/eggs.json | 7 + .../data/balm/tags/items/emeralds.json | 7 + .../resources/data/balm/tags/items/gems.json | 9 + .../data/balm/tags/items/gold_nuggets.json | 7 + .../data/balm/tags/items/gray_dyes.json | 7 + .../data/balm/tags/items/green_dyes.json | 7 + .../data/balm/tags/items/ingots.json | 9 + .../data/balm/tags/items/iron_ingots.json | 10 ++ .../data/balm/tags/items/iron_nuggets.json | 10 ++ .../data/balm/tags/items/light_blue_dyes.json | 7 + .../data/balm/tags/items/light_gray_dyes.json | 7 + .../data/balm/tags/items/lime_dyes.json | 7 + .../data/balm/tags/items/magenta_dyes.json | 7 + .../data/balm/tags/items/nuggets.json | 9 + .../data/balm/tags/items/orange_dyes.json | 7 + .../resources/data/balm/tags/items/ores.json | 9 + .../data/balm/tags/items/pink_dyes.json | 7 + .../data/balm/tags/items/purple_dyes.json | 7 + .../data/balm/tags/items/red_dyes.json | 7 + .../data/balm/tags/items/stones.json | 18 ++ .../data/balm/tags/items/white_dyes.json | 7 + .../data/balm/tags/items/wooden_chests.json | 8 + .../data/balm/tags/items/wooden_rods.json | 7 + .../data/balm/tags/items/yellow_dyes.json | 7 + neoforge/src/main/resources/pack.mcmeta | 8 + settings.gradle | 8 +- shared/build.gradle | 6 - 44 files changed, 524 insertions(+), 29 deletions(-) create mode 100644 neoforge/.gitattributes create mode 100644 neoforge/.gitignore create mode 100644 neoforge/build.gradle create mode 100644 neoforge/dependencies.gradle create mode 100644 neoforge/src/main/resources/META-INF/mods.toml create mode 100644 neoforge/src/main/resources/balm.mixins.json create mode 100644 neoforge/src/main/resources/data/balm/forge/biome_modifier/balm.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/black_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/blue_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/brown_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/cooking_oil.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/cyan_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/diamonds.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/eggs.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/emeralds.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/gems.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/gold_nuggets.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/gray_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/green_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/ingots.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/iron_ingots.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/iron_nuggets.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/light_blue_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/light_gray_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/lime_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/magenta_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/nuggets.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/orange_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/ores.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/pink_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/purple_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/red_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/stones.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/white_dyes.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/wooden_chests.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/wooden_rods.json create mode 100644 neoforge/src/main/resources/data/balm/tags/items/yellow_dyes.json create mode 100644 neoforge/src/main/resources/pack.mcmeta diff --git a/fabric/build.gradle b/fabric/build.gradle index 00089917..bed866cb 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -25,13 +25,6 @@ dependencies { if (jei_minecraft_version == minecraft_version) { modRuntimeOnly "mezz.jei:jei-$jei_minecraft_version-fabric:$jei_version" } - - modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$rei_version") { - transitive = false - } - - modCompileOnly "curse.maven:jade-324717:$jade_forge_version" - modCompileOnly "mcp.mobius.waila:wthit-api:mojmap-$wthit_version" } apply from: 'dependencies.gradle' @@ -128,7 +121,7 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { modrinth { token = project.findProperty("modrinth.token") ?: System.getenv("MODRINTH_TOKEN") ?: "none" - projectId = project.modrinth_fabric_project_id + projectId = project.modrinth_project_id versionType = project.modrinth_release_type versionNumber = project.version + "+fabric-" + project.minecraft_version uploadFile = remapJar diff --git a/forge/build.gradle b/forge/build.gradle index 53525f20..e07b1746 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -166,12 +166,6 @@ dependencies { if (jei_minecraft_version == minecraft_version) { runtimeOnly fg.deobf("mezz.jei:jei-$jei_minecraft_version-forge:$jei_version") } - - compileOnly fg.deobf("me.shedaniel.cloth:cloth-config-forge:$cloth_config_version") - - compileOnly fg.deobf("curse.maven:jade-324717:$jade_forge_version") - compileOnly fg.deobf("mcp.mobius.waila:wthit-api:forge-$wthit_version") - compileOnly fg.deobf("curse.maven:the-one-probe-245211:$theoneprobe_version") } apply from: 'dependencies.gradle' @@ -242,7 +236,7 @@ task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { modrinth { token = project.findProperty("modrinth.token") ?: System.getenv("MODRINTH_TOKEN") ?: "none" - projectId = project.modrinth_forge_project_id + projectId = project.modrinth_project_id versionType = project.modrinth_release_type versionNumber = project.version + "+forge-" + project.minecraft_version uploadFile = jar diff --git a/gradle.properties b/gradle.properties index 7c55f32d..9566d3c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,14 +2,14 @@ mod_id=balm mod_version = 8.0.1 mod_group=net.blay09.mods +pack_format_number=18 # Publishing curseforge_release_type=release curseforge_forge_project_id=531761 curseforge_fabric_project_id=500525 modrinth_release_type=release -modrinth_fabric_project_id=MBAkmtvl -modrinth_forge_project_id=MBAkmtvl +modrinth_project_id=MBAkmtvl # Minecraft minecraft_version = 1.20.2 @@ -23,6 +23,13 @@ forge_version_range=[48.0.0,) forge_loader_version_range=[48,) forge_mixins=true +# NeoForge +neoforge_version = 20.2.8-beta +neoforge_version_range=[20.2,) +neoforge_loader_version_range=[1,) +mapping_channel=official +mapping_version=1.20.2 + # Fabric fabric_version = 0.89.0+1.20.2 fabric_loader_version = 0.14.22 @@ -31,13 +38,8 @@ fabric_loader_version = 0.14.22 jei_minecraft_version=1.19.2 jei_version=11.4.0.288 rei_version=10.0.581 -wthit_version=6.1.1 -jade_fabric_version=4160727 -jade_forge_version=4159759 mixin_version=0.8.5 modmenu_version=7.2.2 -theoneprobe_version=4159743 -cloth_config_version=11.0.99 # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/neoforge/.gitattributes b/neoforge/.gitattributes new file mode 100644 index 00000000..e91ba1e0 --- /dev/null +++ b/neoforge/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf \ No newline at end of file diff --git a/neoforge/.gitignore b/neoforge/.gitignore new file mode 100644 index 00000000..31d25505 --- /dev/null +++ b/neoforge/.gitignore @@ -0,0 +1,26 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run +runs +run-data + +repo \ No newline at end of file diff --git a/neoforge/build.gradle b/neoforge/build.gradle new file mode 100644 index 00000000..c1de2bc0 --- /dev/null +++ b/neoforge/build.gradle @@ -0,0 +1,155 @@ +plugins { + id 'java-library' + id 'idea' + id 'maven-publish' + id 'net.neoforged.gradle.userdev' version '7.0.5' + id 'net.darkhax.curseforgegradle' version '1.0.14' + id "com.modrinth.minotaur" version "2.+" +} + +version = mod_version +group = mod_group + +repositories { + mavenLocal() +} + +base { + archivesName = "${mod_id}-neoforge-${minecraft_version}" +} + +java.toolchain.languageVersion = JavaLanguageVersion.of(17) + +runs { + configureEach { + // Recommended logging data for a userdev environment + // The markers can be added/remove as needed separated by commas. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + systemProperty 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + systemProperty 'forge.logging.console.level', 'debug' + + modSource project.sourceSets.main + } + + client { + // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + } + + server { + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + programArgument '--nogui' + } + + // This run config launches GameTestServer and runs all registered gametests, then exits. + // By default, the server will crash when no gametests are provided. + // The gametest system is also enabled by default for other run configs under the /test command. + gameTestServer { + systemProperty 'forge.enabledGameTestNamespaces', project.mod_id + } + + data { + // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it + // workingDirectory project.file('run-data') + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + } +} + +sourceSets.main.resources { srcDir 'src/generated/resources' } + +dependencies { + implementation "net.neoforged:neoforge:${neoforge_version}" + compileOnly project(":shared") + + compileOnly "org.jetbrains:annotations:22.0.0" + + compileOnly "mezz.jei:jei-$jei_minecraft_version-common-api:$jei_version" + if (jei_minecraft_version == minecraft_version) { + runtimeOnly "mezz.jei:jei-$jei_minecraft_version-forge:$jei_version" + } +} + +apply from: 'dependencies.gradle' + +tasks.withType(JavaCompile) { + source(project(":shared").sourceSets.main.allSource) +} + +def resourceTargets = ['META-INF/mods.toml', 'pack.mcmeta'] +def replaceProperties = [ + minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range, + neoforge_version: neoforge_version, neoforge_version_range: neoforge_version_range, + neoforge_loader_version_range: neoforge_loader_version_range, + mod_id: mod_id, mod_version: mod_version +] +tasks.withType(ProcessResources).configureEach { + inputs.properties replaceProperties + + filesMatching(resourceTargets) { + expand replaceProperties + } +} + +jar { + from(rootProject.file("LICENSE")) { + rename { "${it}_${mod_id}" } + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation +} + +publishing { + publications { + mavenJava(MavenPublication) { + artifactId = mod_id + "-neoforge" + version = project.version + (!project.version.endsWith("SNAPSHOT") ? "+" + minecraft_version : "") + + from components.java + } + } + + repositories { + maven { + var releasesRepoUrl = "https://maven.twelveiterations.com/repository/maven-releases/" + var snapshotsRepoUrl = "https://maven.twelveiterations.com/repository/maven-snapshots/" + url = uri(version.toString().endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl) + name = "twelveIterationsNexus" + credentials(PasswordCredentials) + } + } +} + +task curseforge(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) { + dependsOn('build') + description = 'Publishes the NeoForge build to CurseForge.' + group = 'publishing' + + apiToken = project.findProperty("curseforge.api_key") ?: System.getenv("CURSEFORGE_TOKEN") ?: "none" + + def mainFile = upload(curseforge_forge_project_id, file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) + mainFile.changelog = rootProject.file('CHANGELOG.md').text + project.minecraft_versions.split(',').toList().each { mainFile.addGameVersion(it) } + mainFile.releaseType = "release" +} + +modrinth { + token = project.findProperty("modrinth.token") ?: System.getenv("MODRINTH_TOKEN") ?: "none" + projectId = project.modrinth_project_id + versionType = project.modrinth_release_type + versionNumber = project.version + "+neoforge-" + project.minecraft_version + uploadFile = jar + changelog = rootProject.file("CHANGELOG.md").text + gameVersions = project.minecraft_versions.split(',').toList() + syncBodyFrom = rootProject.file("modrinth.md").text + loaders = ['neoforge'] +} \ No newline at end of file diff --git a/neoforge/dependencies.gradle b/neoforge/dependencies.gradle new file mode 100644 index 00000000..571b4175 --- /dev/null +++ b/neoforge/dependencies.gradle @@ -0,0 +1,2 @@ +dependencies { +} \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml new file mode 100644 index 00000000..75678bb0 --- /dev/null +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,27 @@ +modLoader="javafml" +loaderVersion="${neoforge_loader_version_range}" +license="All rights reserved" +issueTrackerURL="https://github.com/TwelveIterationMods/Balm/issues" +[[mods]] +modId="balm" +version="${mod_version}" +displayName="Balm" +displayURL="https://mods.twelveiterations.com/" +logoFile="balm-icon.png" +credits="BlayTheNinth" +authors="BlayTheNinth" +description=''' +Abstraction Layer (but not really)™ for Blay's multiplatform mods +''' +[[dependencies.balm]] +modId="neoforge" +mandatory=true +versionRange="${neoforge_version_range}" +ordering="NONE" +side="BOTH" +[[dependencies.balm]] +modId="minecraft" +mandatory=true +versionRange="${minecraft_version_range}" +ordering="NONE" +side="BOTH" diff --git a/neoforge/src/main/resources/balm.mixins.json b/neoforge/src/main/resources/balm.mixins.json new file mode 100644 index 00000000..8ab01373 --- /dev/null +++ b/neoforge/src/main/resources/balm.mixins.json @@ -0,0 +1,30 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "net.blay09.mods.balm.mixin", + "compatibilityLevel": "JAVA_17", + "refmap": "balm.refmap.json", + "mixins": [ + "CropBlockMixin", + "StemBlockMixin", + "ReloadableServerResourcesMixin", + "SlotAccessor", + "MinecraftServerMixin", + "EntityMixin" + ], + "client": [ + "AbstractContainerScreenAccessor", + "CheckboxAccessor", + "ImageButtonAccessor", + "KeyMappingAccessor", + "KeyMappingMixin", + "MouseHandlerAccessor", + "ScreenAccessor", + "MinecraftMixin", + "LootTableMixin", + "ModelBakeryMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/neoforge/src/main/resources/data/balm/forge/biome_modifier/balm.json b/neoforge/src/main/resources/data/balm/forge/biome_modifier/balm.json new file mode 100644 index 00000000..5216ac39 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/forge/biome_modifier/balm.json @@ -0,0 +1,3 @@ +{ + "type": "balm:balm" +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/black_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/black_dyes.json new file mode 100644 index 00000000..a3f22828 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/black_dyes.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:black_dye", + { + "id": "#forge:dyes/black", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/blue_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/blue_dyes.json new file mode 100644 index 00000000..1fc5870f --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/blue_dyes.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + "minecraft:blue_dye", + { + "id":"#forge:dyes/blue", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/brown_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/brown_dyes.json new file mode 100644 index 00000000..82f8abb6 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/brown_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/brown", "required": false}, + "minecraft:brown_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/cooking_oil.json b/neoforge/src/main/resources/data/balm/tags/items/cooking_oil.json new file mode 100644 index 00000000..c8d88be2 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/cooking_oil.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:cookingoil", "required": false} + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/cyan_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/cyan_dyes.json new file mode 100644 index 00000000..1857d293 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/cyan_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/cyan", "required": false}, + "minecraft:cyan_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/diamonds.json b/neoforge/src/main/resources/data/balm/tags/items/diamonds.json new file mode 100644 index 00000000..32f3a649 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/diamonds.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:gems/diamonds", "required": false}, + "minecraft:diamond" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/dyes.json b/neoforge/src/main/resources/data/balm/tags/items/dyes.json new file mode 100644 index 00000000..6ea4ade1 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/dyes.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:dyes", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/eggs.json b/neoforge/src/main/resources/data/balm/tags/items/eggs.json new file mode 100644 index 00000000..e93892a2 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/eggs.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:eggs", "required": false}, + "minecraft:egg" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/emeralds.json b/neoforge/src/main/resources/data/balm/tags/items/emeralds.json new file mode 100644 index 00000000..85cb0d06 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/emeralds.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:gems/emeralds", "required": false}, + "minecraft:emerald" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/gems.json b/neoforge/src/main/resources/data/balm/tags/items/gems.json new file mode 100644 index 00000000..6c7e951a --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/gems.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:gems", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/gold_nuggets.json b/neoforge/src/main/resources/data/balm/tags/items/gold_nuggets.json new file mode 100644 index 00000000..79451b04 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/gold_nuggets.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:nuggets/gold", "required": false}, + "minecraft:gold_nugget" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/gray_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/gray_dyes.json new file mode 100644 index 00000000..aa9d4c85 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/gray_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/gray", "required": false}, + "minecraft:gray_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/green_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/green_dyes.json new file mode 100644 index 00000000..8c38da61 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/green_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/green", "required": false}, + "minecraft:green_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/ingots.json b/neoforge/src/main/resources/data/balm/tags/items/ingots.json new file mode 100644 index 00000000..dd529871 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/ingots.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:ingots", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/iron_ingots.json b/neoforge/src/main/resources/data/balm/tags/items/iron_ingots.json new file mode 100644 index 00000000..50578007 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/iron_ingots.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:ingots/iron", + "required": false + }, + "minecraft:iron_ingot" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/iron_nuggets.json b/neoforge/src/main/resources/data/balm/tags/items/iron_nuggets.json new file mode 100644 index 00000000..ab802169 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/iron_nuggets.json @@ -0,0 +1,10 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:nuggets/iron", + "required": false + }, + "minecraft:iron_nugget" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/light_blue_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/light_blue_dyes.json new file mode 100644 index 00000000..40866a58 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/light_blue_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/light_blue", "required": false}, + "minecraft:light_blue_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/light_gray_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/light_gray_dyes.json new file mode 100644 index 00000000..301fc332 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/light_gray_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/light_gray", "required": false}, + "minecraft:light_gray_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/lime_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/lime_dyes.json new file mode 100644 index 00000000..1390578e --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/lime_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/lime", "required": false}, + "minecraft:lime_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/magenta_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/magenta_dyes.json new file mode 100644 index 00000000..384ec35d --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/magenta_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/magenta", "required": false}, + "minecraft:magenta_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/nuggets.json b/neoforge/src/main/resources/data/balm/tags/items/nuggets.json new file mode 100644 index 00000000..aa420885 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/nuggets.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:nuggets", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/orange_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/orange_dyes.json new file mode 100644 index 00000000..b7153b94 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/orange_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/orange", "required": false}, + "minecraft:orange_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/ores.json b/neoforge/src/main/resources/data/balm/tags/items/ores.json new file mode 100644 index 00000000..dd3ab327 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/ores.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#forge:ores", + "required": false + } + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/pink_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/pink_dyes.json new file mode 100644 index 00000000..cbb866a3 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/pink_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/pink", "required": false}, + "minecraft:pink_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/purple_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/purple_dyes.json new file mode 100644 index 00000000..8fa77045 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/purple_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/purple", "required": false}, + "minecraft:purple_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/red_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/red_dyes.json new file mode 100644 index 00000000..ff385c2e --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/red_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/red", "required": false}, + "minecraft:red_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/stones.json b/neoforge/src/main/resources/data/balm/tags/items/stones.json new file mode 100644 index 00000000..776f412a --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/stones.json @@ -0,0 +1,18 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:stone", "required": false}, + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:polished_andesite", + "minecraft:polished_diorite", + "minecraft:polished_granite", + "minecraft:deepslate", + "minecraft:polished_deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/white_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/white_dyes.json new file mode 100644 index 00000000..21d50102 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/white_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/white", "required": false}, + "minecraft:white_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/wooden_chests.json b/neoforge/src/main/resources/data/balm/tags/items/wooden_chests.json new file mode 100644 index 00000000..c4c30262 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/wooden_chests.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:chests/wooden", "required": false}, + "minecraft:chest", + "minecraft:trapped_chest" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/wooden_rods.json b/neoforge/src/main/resources/data/balm/tags/items/wooden_rods.json new file mode 100644 index 00000000..d62169d2 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/wooden_rods.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:rods/wooden", "required": false}, + "minecraft:stick" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/data/balm/tags/items/yellow_dyes.json b/neoforge/src/main/resources/data/balm/tags/items/yellow_dyes.json new file mode 100644 index 00000000..74847ba8 --- /dev/null +++ b/neoforge/src/main/resources/data/balm/tags/items/yellow_dyes.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + {"id":"#forge:dyes/yellow", "required": false}, + "minecraft:yellow_dye" + ] +} \ No newline at end of file diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta new file mode 100644 index 00000000..7bcc5b91 --- /dev/null +++ b/neoforge/src/main/resources/pack.mcmeta @@ -0,0 +1,8 @@ +{ + "pack": { + "description": { + "text": "${mod_id} resources" + }, + "pack_format": ${pack_format_number} + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 441d7d59..1c3e1fa8 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ pluginManagement { repositories { gradlePluginPortal() + maven { url = 'https://maven.neoforged.net/releases' } maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' @@ -12,6 +13,11 @@ pluginManagement { } } +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' +} + include("shared", "shared-bridge") include("fabric") -include("forge") \ No newline at end of file +include("forge") +include("neoforge") \ No newline at end of file diff --git a/shared/build.gradle b/shared/build.gradle index b3d088e3..1aa444fa 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -17,13 +17,7 @@ dependencies { compileOnly project(":shared-bridge") - compileOnly("me.shedaniel.cloth:cloth-config-fabric:$cloth_config_version") { - transitive = false - } - compileOnly "mezz.jei:jei-$jei_minecraft_version-common-api:$jei_version" - - compileOnly "mcp.mobius.waila:wthit-api:mojmap-$wthit_version" } apply from: 'dependencies.gradle'