User: rednesto Date: 17 Apr 24 11:41 Revision: 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574 Summary: Update NeoForge MDK Up until https://github.com/neoforged/MDK/commit/6074a78fba8aea8453e10017244da6c385c78109 TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=9262&personal=false Index: src/main/kotlin/creator/buildsystem/gradle-steps.kt =================================================================== --- src/main/kotlin/creator/buildsystem/gradle-steps.kt (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/kotlin/creator/buildsystem/gradle-steps.kt (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -61,7 +61,7 @@ import org.jetbrains.plugins.gradle.service.project.open.canLinkAndRefreshGradleProject import org.jetbrains.plugins.gradle.service.project.open.linkAndRefreshGradleProject -val DEFAULT_GRADLE_VERSION = SemanticVersion.release(8, 5) +val DEFAULT_GRADLE_VERSION = SemanticVersion.release(8, 7) val GRADLE_VERSION_KEY = Key.create("mcdev.gradleVersion") fun FixedAssetsNewProjectWizardStep.addGradleWrapperProperties(project: Project) { Index: src/main/kotlin/platform/fabric/creator/gradle-steps.kt =================================================================== --- src/main/kotlin/platform/fabric/creator/gradle-steps.kt (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/kotlin/platform/fabric/creator/gradle-steps.kt (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -57,7 +57,7 @@ val mcVersion = data.getUserData(FabricVersionChainStep.MC_VERSION_KEY) ?: return val yarnVersion = data.getUserData(FabricVersionChainStep.YARN_VERSION_KEY) ?: return val loaderVersion = data.getUserData(FabricVersionChainStep.LOADER_VERSION_KEY) ?: return - val loomVersion = "1.5-SNAPSHOT" + val loomVersion = "1.6-SNAPSHOT" val javaVersion = findStep().preferredJdk.ordinal val apiVersion = data.getUserData(FabricVersionChainStep.API_VERSION_KEY) val officialMappings = data.getUserData(FabricVersionChainStep.OFFICIAL_MAPPINGS_KEY) ?: false Index: src/main/kotlin/platform/neoforge/creator/gradle-steps.kt =================================================================== --- src/main/kotlin/platform/neoforge/creator/gradle-steps.kt (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/kotlin/platform/neoforge/creator/gradle-steps.kt (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -49,7 +49,7 @@ import com.intellij.openapi.vfs.VfsUtil import com.intellij.util.lang.JavaVersion -private val ngWrapperVersion = SemanticVersion.release(8, 4) +private val ngWrapperVersion = SemanticVersion.release(8, 6) const val MAGIC_RUN_CONFIGS_FILE = ".hello_from_mcdev" Index: src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/resources/fileTemplates/j2ee/fabric/fabric_build.gradle.ft (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -79,7 +79,7 @@ // configure the maven publication publishing { publications { - mavenJava(MavenPublication) { + create("mavenJava", MavenPublication) { from components.java } } Index: src/main/resources/fileTemplates/j2ee/neoforge/NeoForge Main Class.java.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/neoforge/NeoForge Main Class.java.ft (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/resources/fileTemplates/j2ee/neoforge/NeoForge Main Class.java.ft (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -4,6 +4,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; @@ -56,6 +57,7 @@ // Creates a creative tab with the id "${MOD_ID}:example_tab" for the example item, that is placed after the combat tab public static final DeferredHolder EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder() + .title(Component.translatable("itemGroup.${MOD_ID}")) .withTabsBefore(CreativeModeTabs.COMBAT) .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()) .displayItems((parameters, output) -> { @@ -76,7 +78,9 @@ // Register the Deferred Register to the mod event bus so tabs get registered CREATIVE_MODE_TABS.register(modEventBus); - // Register ourselves for server and other game events we are interested in + // Register ourselves for server and other game events we are interested in. + // Note that this is necessary if and only if we want *this* class (ExampleMod) to respond directly to events. + // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below. NeoForge.EVENT_BUS.register(this); // Register the item to a creative tab Index: src/main/resources/fileTemplates/j2ee/neoforge/NeoForge build.gradle.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/neoforge/NeoForge build.gradle.ft (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/resources/fileTemplates/j2ee/neoforge/NeoForge build.gradle.ft (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -3,7 +3,7 @@ id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.74' + id 'net.neoforged.gradle.userdev' version '7.0.97' } version = mod_version @@ -109,16 +109,22 @@ // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.withType(ProcessResources).configureEach { var replaceProperties = [ - minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, - neo_version : neo_version, neo_version_range: neo_version_range, + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range : neo_version_range, - loader_version_range: loader_version_range, + loader_version_range : loader_version_range, - mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors : mod_authors, mod_description: mod_description, + mod_id : mod_id, + mod_name : mod_name, + mod_license : mod_license, + mod_version : mod_version, + mod_authors : mod_authors, + mod_description : mod_description ] inputs.properties replaceProperties filesMatching(['META-INF/mods.toml']) { - expand replaceProperties + [project: project] + expand replaceProperties } } @@ -139,3 +145,11 @@ tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation } + +// IDEA no longer automatically downloads sources/javadoc jars for dependencies, so we need to explicitly enable the behavior. +idea { + module { + downloadSources = true + downloadJavadoc = true + } +} Index: src/main/resources/fileTemplates/j2ee/neoforge/NeoForge mods.toml.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/neoforge/NeoForge mods.toml.ft (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/resources/fileTemplates/j2ee/neoforge/NeoForge mods.toml.ft (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -46,13 +46,26 @@ # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. #displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) +# The description text for the mod (multi line!) (#mandatory) +description='''${mod_description}''' + +#set ( $h = "#" ) +# The [[mixins]] block allows you to declare your mixin config to FML so that it gets loaded. #if (${MIXIN_CONFIG}) [[mixins]] config="${MIXIN_CONFIG}" +#else +${h}[[mixins]] +#config="${mod_id}.mixins.json" #end -# The description text for the mod (multi line!) (#mandatory) -description='''${mod_description}''' +# The [[accessTransformers]] block allows you to declare where your AT file is. +# If this block is omitted, a fallback attempt will be made to load an AT from META-INF/accesstransformer.cfg +${h}[[accessTransformers]] +#file="META-INF/accesstransformer.cfg" + +# The coremods config file path is not configurable and is always loaded from META-INF/coremods.json + # A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional. [[dependencies."${mod_id}"]] #optional # the modid of the dependency Index: src/main/resources/fileTemplates/j2ee/neoforge/NeoForge settings.gradle.ft =================================================================== --- src/main/resources/fileTemplates/j2ee/neoforge/NeoForge settings.gradle.ft (revision b2c6e44eeacb203cc3fbbebdf336e261031e4015) +++ src/main/resources/fileTemplates/j2ee/neoforge/NeoForge settings.gradle.ft (revision 1e828e178ab8423c8225d7d75ce2e6dd7b5ab574) @@ -7,5 +7,5 @@ } plugins { - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' }