Merge branch '2023.2' into 2023.3

# Conflicts: # externalAnnotations/net/minecraft/client/resources/annotations.xml # externalAnnotations/net/minecraft/util/text/annotations.xml # src/main/kotlin/facet/MinecraftFacetEditorTab.kt
minecraft-dev · Jan 16, 2024 · b579f11 · b579f11
2 parents ae651ea + 4327920
commit b579f11
Show file tree

Hide file tree

Showing 893 changed files with 1,945 additions and 2,344 deletions.
diff --git a/.github/workflows/pr_check_target_branch.yml b/.github/workflows/pr_check_target_branch.yml
@@ -0,0 +1,23 @@
+name: Make sure PRs target the dev branch
+
+on:
+  pull_request_target:
+    types: [opened, edited]
+
+jobs:
+  check-branch:
+    runs-on: ubuntu-latest
+    steps:
+      # Do not check out the repository here. See https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+      - uses: Vankka/pr-target-branch-action@v2.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          target: /\b(?!dev\b).*?\b/
+          exclude: dev
+          change-to: dev
+          already-exists-action: nothing
+          comment: |
+            New PRs should target the `dev` branch. The base branch of this PR has been automatically changed to `dev`.
+            Please check that there are no merge conflicts.
+
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/buildSrc/src/main/kotlin/Filter.kt b/buildSrc/src/main/kotlin/Filter.kt
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/buildSrc/src/main/kotlin/mcdev.gradle.kts b/buildSrc/src/main/kotlin/mcdev.gradle.kts
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/buildSrc/src/main/kotlin/util.kt b/buildSrc/src/main/kotlin/util.kt
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/copyright.txt b/copyright.txt
@@ -2,7 +2,7 @@ Minecraft Development for IntelliJ
 
 https://mcdev.io/
 
-Copyright (C) 2023 minecraft-dev
+Copyright (C) 2024 minecraft-dev
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/com/mojang/blaze3d/platform/annotations.xml b/externalAnnotations/com/mojang/blaze3d/platform/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/client/annotations.xml b/externalAnnotations/net/minecraft/client/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/client/option/annotations.xml b/externalAnnotations/net/minecraft/client/option/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/client/resource/language/annotations.xml b/externalAnnotations/net/minecraft/client/resource/language/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/client/resources/annotations.xml b/externalAnnotations/net/minecraft/client/resources/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/client/resources/language/annotations.xml b/externalAnnotations/net/minecraft/client/resources/language/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/command/annotations.xml b/externalAnnotations/net/minecraft/command/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraft/network/chat/annotations.xml b/externalAnnotations/net/minecraft/network/chat/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
@@ -39,6 +39,12 @@
             <val name="foldMethod" val="true"/>
         </annotation>
     </item>
+    <item name="net.minecraft.network.chat.Component net.minecraft.network.chat.MutableComponent translatableEscape(java.lang.String, java.lang.Object...) 0">
+        <annotation name="com.demonwav.mcdev.annotations.Translatable">
+            <val name="foldMethod" val="true"/>
+            <val name="allowArbitraryArgs" val="true"/>
+        </annotation>
+    </item>
     <item name="net.minecraft.network.chat.Component net.minecraft.network.chat.MutableComponent translatableWithFallback(java.lang.String, java.lang.String) 0">
         <annotation name="com.demonwav.mcdev.annotations.Translatable"/>
     </item>

diff --git a/externalAnnotations/net/minecraft/text/annotations.xml b/externalAnnotations/net/minecraft/text/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published
@@ -41,6 +41,12 @@
             <val name="foldMethod" val="true"/>
         </annotation>
     </item>
+    <item name="net.minecraft.text.Text net.minecraft.text.MutableText stringifiedTranslatable(java.lang.String, java.lang.Object...) 0">
+        <annotation name="com.demonwav.mcdev.annotations.Translatable">
+            <val name="foldMethod" val="true"/>
+            <val name="allowArbitraryArgs" val="true"/>
+        </annotation>
+    </item>
     <item name="net.minecraft.text.Text net.minecraft.text.MutableText translatableWithFallback(java.lang.String, java.lang.String) 0">
         <annotation name="com.demonwav.mcdev.annotations.Translatable"/>
     </item>

diff --git a/externalAnnotations/net/minecraft/util/text/annotations.xml b/externalAnnotations/net/minecraft/util/text/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/externalAnnotations/net/minecraftforge/server/command/annotations.xml b/externalAnnotations/net/minecraftforge/server/command/annotations.xml
@@ -3,7 +3,7 @@
 
     https://mcdev.io/
 
-    Copyright (C) 2023 minecraft-dev
+    Copyright (C) 2024 minecraft-dev
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Lesser General Public License as published

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 #
 # https://mcdev.io/
 #
-# Copyright (C) 2023 minecraft-dev
+# Copyright (C) 2024 minecraft-dev
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...nsion/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2BuilderImpl.groovy b/...nsion/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2BuilderImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...ng-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2Impl.groovy b/...ng-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2Impl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...nsion/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3BuilderImpl.groovy b/...nsion/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3BuilderImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...ng-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3Impl.groovy b/...ng-extension/groovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3Impl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...m/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelBuilderImpl.groovy b/...m/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelBuilderImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...oovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelImpl.groovy b/...oovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModelImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...m/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy b/...m/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelBuilderImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...oovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy b/...oovy/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModelImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...nwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelBuilderImpl.groovy b/...nwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelBuilderImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...om/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelImpl.groovy b/...om/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModelImpl.groovy
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...radle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModel.java b/...radle-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModel.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...le-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2.java b/...le-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG2.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...le-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3.java b/...le-tooling-extension/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/McpModelFG3.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...nsion/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModel.java b/...nsion/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/archloom/ArchitecturyModel.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...nsion/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java b/...nsion/java/com/demonwav/mcdev/platform/mcp/gradle/tooling/fabricloom/FabricLoomModel.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/...java/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModel.java b/...java/com/demonwav/mcdev/platform/mcp/gradle/tooling/vanillagradle/VanillaGradleModel.java
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/src/main/grammars/AtLexer.flex b/src/main/grammars/AtLexer.flex
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published

diff --git a/src/main/grammars/AtParser.bnf b/src/main/grammars/AtParser.bnf
@@ -3,7 +3,7 @@
  *
  * https://mcdev.io/
  *
- * Copyright (C) 2023 minecraft-dev
+ * Copyright (C) 2024 minecraft-dev
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published