Merge branch '2022.1' into 2022.2

RedNesto · RedNesto · commit 0ab5461d2eed · 2023-01-06T00:08:52.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,48 @@
+name: Bug report
+description: Create a bug report
+labels: ["status: unverified", "type: bug"]
+body:
+  - type: markdown
+    attributes:
+      value: DO NOT REQUEST SUPPORT FOR OLDER VERSIONS OF MINECRAFT.
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Minecraft Development for IntelliJ plugin version
+    validations:
+      required: true
+  - type: input
+    id: intellij-version
+    attributes:
+      label: IntelliJ version
+    validations:
+      required: true
+  - type: input
+    id: operating-system
+    attributes:
+      label: Operating System
+    validations:
+      required: true
+  - type: dropdown
+    id: target-platform
+    attributes:
+      label: Target platform
+      multiple: true
+      options:
+        - Bukkit
+        - Spigot
+        - Paper
+        - Sponge
+        - Architectury
+        - Minecraft Forge
+        - Fabric
+        - Lite Loader
+        - Velocity
+        - Mixins
+        - BungeeCord
+        - Waterfall
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: Always include a stack trace if there is one. Otherwise, the more information you can provide in terms of how to reproduce the problem, the more likely it'll be fixed. If there is something specific about your project, a link to the GitHub project can be very helpful.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,21 @@
+name: Feature request
+description: Suggest a new feature
+labels: ["status: unverified", "type: enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: DO NOT REQUEST SUPPORT FOR OLDER VERSIONS OF MINECRAFT.
+  - type: input
+    id: plugin-version
+    attributes:
+      label: Minecraft Development for IntelliJ plugin version
+    validations:
+      required: true
+  - type: textarea
+    id: description
+    attributes:
+      label: Description of the feature request
+      description: Please try to avoid vague requests. The more details you can give regarding what the feature request is, how it should work, and why it would be useful, the easier it will be to implement. Feel free to be vague if you have a general idea that something might be cool, but these are less likely to be prioritized and may be denied more often.
+  - type: markdown
+    attributes:
+      value: Please note as well that the developers working on this project don't use every platform it supports, at least not extensively. Different developers have differing knowledge about each platform. With this in mind, giving an in-depth explanation of a feature is targeting can be very helpful, as we may not know as much about what you're referring to as you do.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -8,5 +8,5 @@ jobs:
     name: Validation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -9,11 +9,12 @@ jobs:
     name: Publish
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,11 +16,12 @@ jobs:
           - 'windows-latest'
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 11
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.gradle/caches
diff --git a/readme.md b/readme.md
@@ -11,15 +11,6 @@ Minecraft Development for IntelliJ
         <td align="right"><b>Main Build</b></td>
         <td colspan="2"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
-    <tr>
-        <td align="right" rowspan="5"><b>Nightly Builds</b></td>
-        <td align="left">2021.2</td>
-        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20212"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20212)/statusIcon.svg" alt="2021.2 Nightly Status" /></a></td>
-    </tr>
-    <tr>
-        <td align="left">2021.3</td>
-        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20213"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20213)/statusIcon.svg" alt="2021.3 Nightly Status" /></a></td>
-    </tr>
     <tr>
         <td align="left">2022.1</td>
         <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20221"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20221)/statusIcon.svg" alt="2022.1 Nightly Status" /></a></td>
diff --git a/src/main/kotlin/errorreporter/ErrorReporter.kt b/src/main/kotlin/errorreporter/ErrorReporter.kt
@@ -35,7 +35,6 @@ class ErrorReporter : ErrorReportSubmitter() {
         "Key com.demonwav.mcdev.translations.TranslationFoldingSettings duplicated",
         "Inspection #EntityConstructor has no description"
     )
-    private val baseUrl = "https://github.com/minecraft-dev/mcdev-error-report/issues"
     override fun getReportActionText() = "Report to Minecraft Dev GitHub Issue Tracker"
 
     override fun submit(
@@ -118,11 +117,12 @@ class ErrorReporter : ErrorReportSubmitter() {
             { e ->
                 val message = "<html>Error Submitting Issue: ${e.message}</html>."
                 val actionText = "Open an issue on the GitHub issue tracker"
+                val userUrl = "https://github.com/minecraft-dev/MinecraftDev/issues"
                 NotificationGroupManager.getInstance().getNotificationGroup("Error Report").createNotification(
                     DiagnosticBundle.message("error.report.title"),
                     message,
                     NotificationType.ERROR,
-                ).addAction(BrowseNotificationAction(actionText, baseUrl)).setImportant(false).notify(project)
+                ).addAction(BrowseNotificationAction(actionText, userUrl)).setImportant(false).notify(project)
 
                 consumer.consume(SubmittedReportInfo(null, null, SubmittedReportInfo.SubmissionStatus.FAILED))
             }
diff --git a/src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt b/src/main/kotlin/insight/generation/MinecraftClassCreateAction.kt
@@ -64,27 +64,29 @@ class MinecraftClassCreateAction :
 
             if (mcVersion < MinecraftVersions.MC1_17) {
                 builder.addKind("Block", icon, MinecraftTemplates.FORGE_BLOCK_TEMPLATE)
+                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_ENCHANTMENT_TEMPLATE)
                 builder.addKind("Item", icon, MinecraftTemplates.FORGE_ITEM_TEMPLATE)
                 builder.addKind("Packet", icon, MinecraftTemplates.FORGE_PACKET_TEMPLATE)
-                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_ENCHANTMENT_TEMPLATE)
             } else if (mcVersion < MinecraftVersions.MC1_18) {
                 builder.addKind("Block", icon, MinecraftTemplates.FORGE_1_17_BLOCK_TEMPLATE)
+                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE)
                 builder.addKind("Item", icon, MinecraftTemplates.FORGE_1_17_ITEM_TEMPLATE)
+                builder.addKind("Mob Effect", icon, MinecraftTemplates.FORGE_1_17_MOB_EFFECT_TEMPLATE)
                 builder.addKind("Packet", icon, MinecraftTemplates.FORGE_1_17_PACKET_TEMPLATE)
-                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE)
             } else {
                 builder.addKind("Block", icon, MinecraftTemplates.FORGE_1_17_BLOCK_TEMPLATE)
+                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE)
                 builder.addKind("Item", icon, MinecraftTemplates.FORGE_1_17_ITEM_TEMPLATE)
+                builder.addKind("Mob Effect", icon, MinecraftTemplates.FORGE_1_17_MOB_EFFECT_TEMPLATE)
                 builder.addKind("Packet", icon, MinecraftTemplates.FORGE_1_18_PACKET_TEMPLATE)
-                builder.addKind("Enchantment", icon, MinecraftTemplates.FORGE_1_17_ENCHANTMENT_TEMPLATE)
             }
         }
         if (isFabric) {
             val icon = PlatformAssets.FABRIC_ICON
 
             builder.addKind("Block", icon, MinecraftTemplates.FABRIC_BLOCK_TEMPLATE)
-            builder.addKind("Item", icon, MinecraftTemplates.FABRIC_ITEM_TEMPLATE)
             builder.addKind("Enchantment", icon, MinecraftTemplates.FABRIC_ENCHANTMENT_TEMPLATE)
+            builder.addKind("Item", icon, MinecraftTemplates.FABRIC_ITEM_TEMPLATE)
         }
     }
 
diff --git a/src/main/kotlin/platform/forge/creator/Fg3Template.kt b/src/main/kotlin/platform/forge/creator/Fg3Template.kt
@@ -17,6 +17,7 @@ import com.demonwav.mcdev.platform.forge.util.ForgePackAdditionalData
 import com.demonwav.mcdev.platform.forge.util.ForgePackDescriptor
 import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_1_17_MAIN_CLASS_TEMPLATE
 import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_1_18_MAIN_CLASS_TEMPLATE
+import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_1_19_3_MAIN_CLASS_TEMPLATE
 import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_1_19_MAIN_CLASS_TEMPLATE
 import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_BUILD_GRADLE_TEMPLATE
 import com.demonwav.mcdev.util.MinecraftTemplates.Companion.FG3_GRADLE_PROPERTIES_TEMPLATE
@@ -105,6 +106,24 @@ object Fg3Template : BaseTemplate() {
         return project.applyTemplate(FG3_1_19_MAIN_CLASS_TEMPLATE, props)
     }
 
+    fun apply1_19_3MainClass(
+        project: Project,
+        buildSystem: BuildSystem,
+        config: ForgeProjectConfig,
+        packageName: String,
+        className: String
+    ): String {
+        val props = mapOf(
+            "PACKAGE_NAME" to packageName,
+            "CLASS_NAME" to className,
+            "ARTIFACT_ID" to buildSystem.artifactId,
+            "MOD_NAME" to config.pluginName,
+            "MOD_VERSION" to buildSystem.version
+        )
+
+        return project.applyTemplate(FG3_1_19_3_MAIN_CLASS_TEMPLATE, props)
+    }
+
     fun applyBuildGradle(
         project: Project,
         buildSystem: BuildSystem,
@@ -207,6 +226,11 @@ object Fg3Template : BaseTemplate() {
                 props["UPDATE_URL"] = url
             }
         }
+        config.website?.let { url ->
+            if (url.isNotBlank()) {
+                props["WEBSITE"] = url
+            }
+        }
         if (config.hasAuthors()) {
             props["AUTHOR_LIST"] = config.authors.joinToString(", ")
         }
diff --git a/src/main/kotlin/platform/forge/creator/ForgeProjectCreator.kt b/src/main/kotlin/platform/forge/creator/ForgeProjectCreator.kt
@@ -89,7 +89,9 @@ open class Fg3ProjectCreator(
 
     private fun setupMainClassStep(): BasicJavaClassStep {
         return createJavaClassStep(config.mainClass) { packageName, className ->
-            if (config.mcVersion >= MinecraftVersions.MC1_19) {
+            if (config.mcVersion >= MinecraftVersions.MC1_19_3) {
+                Fg3Template.apply1_19_3MainClass(project, buildSystem, config, packageName, className)
+            } else if (config.mcVersion >= MinecraftVersions.MC1_19) {
                 Fg3Template.apply1_19MainClass(project, buildSystem, config, packageName, className)
             } else if (config.mcVersion >= MinecraftVersions.MC1_18) {
                 Fg3Template.apply1_18MainClass(project, buildSystem, config, packageName, className)
@@ -141,7 +143,7 @@ open class Fg3ProjectCreator(
     }
 
     companion object {
-        val FG5_WRAPPER_VERSION = SemanticVersion.release(7, 4, 2)
+        val FG5_WRAPPER_VERSION = SemanticVersion.release(7, 5, 1)
     }
 }
 
diff --git a/src/main/kotlin/platform/forge/util/ForgePackAdditionalData.kt b/src/main/kotlin/platform/forge/util/ForgePackAdditionalData.kt
@@ -17,11 +17,13 @@ data class ForgePackAdditionalData(val resourcePackFormat: Int, val dataPackForm
     companion object {
         val FORMAT_1_18 = ForgePackAdditionalData(8, 9)
         val FORMAT_1_19 = ForgePackAdditionalData(9, 10)
+        val FORMAT_1_19_3 = ForgePackAdditionalData(12, 10)
 
         fun forMcVersion(version: SemanticVersion): ForgePackAdditionalData? = when {
             version < MinecraftVersions.MC1_18 -> null
             version < MinecraftVersions.MC1_19 -> FORMAT_1_18
-            else -> FORMAT_1_19
+            version < MinecraftVersions.MC1_19_3 -> FORMAT_1_19
+            else -> FORMAT_1_19_3
         }
     }
 }
diff --git a/src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt b/src/main/kotlin/platform/forge/util/ForgePackDescriptor.kt
@@ -40,6 +40,7 @@ data class ForgePackDescriptor(val format: Int, val comment: String) {
         val FORMAT_7 = ForgePackDescriptor(7, "")
         val FORMAT_8 = ForgePackDescriptor(8, "")
         val FORMAT_9 = ForgePackDescriptor(9, "")
+        val FORMAT_12 = ForgePackDescriptor(12, "")
 
         // See https://minecraft.gamepedia.com/Tutorials/Creating_a_resource_pack#.22pack_format.22
         fun forMcVersion(version: SemanticVersion): ForgePackDescriptor? = when {
@@ -49,7 +50,8 @@ data class ForgePackDescriptor(val format: Int, val comment: String) {
             version < MinecraftVersions.MC1_17 -> FORMAT_6
             version < MinecraftVersions.MC1_18 -> FORMAT_7
             version < MinecraftVersions.MC1_19 -> FORMAT_8
-            version >= MinecraftVersions.MC1_19 -> FORMAT_9
+            version < MinecraftVersions.MC1_19_3 -> FORMAT_9
+            version >= MinecraftVersions.MC1_19_3 -> FORMAT_12
             else -> null
         }
     }
diff --git a/src/main/kotlin/util/MinecraftTemplates.kt b/src/main/kotlin/util/MinecraftTemplates.kt
@@ -91,6 +91,7 @@ class MinecraftTemplates : FileTemplateGroupDescriptorFactory {
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_1_17_MAIN_CLASS_TEMPLATE))
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_1_18_MAIN_CLASS_TEMPLATE))
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_1_19_MAIN_CLASS_TEMPLATE))
+            forgeGroup.addTemplate(FileTemplateDescriptor(FG3_1_19_3_MAIN_CLASS_TEMPLATE))
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_BUILD_GRADLE_TEMPLATE))
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_SUBMODULE_BUILD_GRADLE_TEMPLATE))
             forgeGroup.addTemplate(FileTemplateDescriptor(FG3_GRADLE_PROPERTIES_TEMPLATE))
@@ -238,6 +239,7 @@ class MinecraftTemplates : FileTemplateGroupDescriptorFactory {
         const val FG3_1_17_MAIN_CLASS_TEMPLATE = "Forge (1.17+) Main Class.java"
         const val FG3_1_18_MAIN_CLASS_TEMPLATE = "Forge (1.18+) Main Class.java"
         const val FG3_1_19_MAIN_CLASS_TEMPLATE = "Forge (1.19+) Main Class.java"
+        const val FG3_1_19_3_MAIN_CLASS_TEMPLATE = "Forge (1.19.3+) Main Class.java"
         const val FG3_BUILD_GRADLE_TEMPLATE = "Forge (1.13+) build.gradle"
         const val FG3_SUBMODULE_BUILD_GRADLE_TEMPLATE = "Forge (1.13+) Submodule build.gradle"
         const val FG3_GRADLE_PROPERTIES_TEMPLATE = "Forge (1.13+) gradle.properties"
@@ -299,6 +301,7 @@ class MinecraftTemplates : FileTemplateGroupDescriptorFactory {
         const val FORGE_1_17_ITEM_TEMPLATE = "ForgeItem (1.17+).java"
         const val FORGE_1_17_PACKET_TEMPLATE = "ForgePacket (1.17+).java"
         const val FORGE_1_17_ENCHANTMENT_TEMPLATE = "ForgeEnchantment (1.17+).java"
+        const val FORGE_1_17_MOB_EFFECT_TEMPLATE = "ForgeMobEffect (1.17+).java"
 
         const val FORGE_1_18_PACKET_TEMPLATE = "ForgePacket (1.18+).java"
 
diff --git a/src/main/kotlin/util/MinecraftVersions.kt b/src/main/kotlin/util/MinecraftVersions.kt
@@ -19,6 +19,7 @@ object MinecraftVersions {
     val MC1_17 = SemanticVersion.release(1, 17)
     val MC1_18 = SemanticVersion.release(1, 18)
     val MC1_19 = SemanticVersion.release(1, 19)
+    val MC1_19_3 = SemanticVersion.release(1, 19, 3)
 
     fun requiredJavaVersion(minecraftVersion: SemanticVersion) = when {
         minecraftVersion >= MC1_18 -> JavaVersion.compose(17)
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -22,7 +22,7 @@
     <vendor email="demonwav@gmail.com" url="https://minecraftdev.org/">minecraft-dev</vendor>
 
     <description><![CDATA[
-      Brings support for Bukkit, Spigot, Paper, Sponge, Forge, Fabric, MCP, Mixin, Velocity, BungeeCord, Waterfall, and
+      Brings support for Bukkit, Spigot, Paper, Sponge, Forge, Fabric, Architectury, MCP, Mixin, Velocity, BungeeCord, Waterfall, and
       LiteLoader projects to Intellij IDEA.
     ]]></description>
 
diff --git a/src/main/resources/fileTemplates/j2ee/forge/Forge (1.13+) build.gradle.ft b/src/main/resources/fileTemplates/j2ee/forge/Forge (1.13+) build.gradle.ft
@@ -37,7 +37,7 @@ minecraft {
     // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
     //
     // Parchment is an unofficial project maintained by ParchmentMC, separate from MinecraftForge
-    // Additional setup is needed to use their mappings: https://github.com/ParchmentMC/Parchment/wiki/Getting-Started
+    // Additional setup is needed to use their mappings: https://parchmentmc.org/docs/getting-started
     //
     // Use non-default mappings at your own risk. They may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
diff --git a/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19+) Main Class.java.ft b/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19+) Main Class.java.ft
@@ -9,6 +9,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.material.Material;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -72,7 +73,7 @@ public class ${CLASS_NAME} {
     }
 
     // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent
-    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+    @Mod.EventBusSubscriber(modid = MODID, bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     public static class ClientModEvents {
 
         @SubscribeEvent
diff --git a/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19.3+) Main Class.java.ft b/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19.3+) Main Class.java.ft
diff --git a/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19.3+) Main Class.java.html b/src/main/resources/fileTemplates/j2ee/forge/Forge (1.19.3+) Main Class.java.html
diff --git a/src/main/resources/fileTemplates/j2ee/forge/mods.toml.ft b/src/main/resources/fileTemplates/j2ee/forge/mods.toml.ft
diff --git a/src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeMobEffect (1.17+).java.ft b/src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeMobEffect (1.17+).java.ft
diff --git a/src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeModEffect (1.17+).java.html b/src/main/resources/fileTemplates/j2ee/skeleton/forge/ForgeModEffect (1.17+).java.html
