Fix ctt errors

FallingColors · May 28, 2024 · bf9c6d3 · bf9c6d3
1 parent 60d93b3
commit bf9c6d3
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/copier.yml b/copier.yml
@@ -1,21 +1,3 @@
-# Copier settings
-
-_answers_file: .copier-answers.hexdummy.yml
-
-_exclude:
-  # for copier-template-tester
-  - ".ctt"
-  - "ctt.toml"
-  # defaults (https://copier.readthedocs.io/en/latest/configuring/#exclude)
-  - "copier.yaml"
-  - "copier.yml"
-  - "~*"
-  - "*.py[co]"
-  - "__pycache__"
-  - ".git"
-  - ".DS_Store"
-  - ".svn"
-
 # questions
 
 advanced:
@@ -117,10 +99,6 @@ minecraft_version:
     - "1.19.2"
     - "1.20.1"
 
----
-!include "prompts/{{ minecraft_version }}.yml"
----
-
 # static/computed values
 
 kotlin_plugin:
@@ -151,3 +129,23 @@ book_id_path:
 gradle_mod_version_key:
   when: false
   default: modVersion
+
+# Copier settings
+
+_subdirectory: "templates/{{ minecraft_version }}"
+
+_answers_file: .copier-answers.hexdummy.yml
+
+_exclude:
+  # for copier-template-tester
+  - ".ctt"
+  - "ctt.toml"
+  # defaults (https://copier.readthedocs.io/en/latest/configuring/#exclude)
+  - "copier.yaml"
+  - "copier.yml"
+  - "~*"
+  - "*.py[co]"
+  - "__pycache__"
+  - ".git"
+  - ".DS_Store"
+  - ".svn"
diff --git a/prompts/1.19.2.yml b/prompts/1.19.2.yml
diff --git a/prompts/1.20.1.yml b/prompts/1.20.1.yml
diff --git a/templates/1.20.1/buildSrc/src/main/kotlin/{{ modid }}/minecraft.gradle.kts.jinja b/templates/1.20.1/buildSrc/src/main/kotlin/{{ modid }}/minecraft.gradle.kts.jinja
@@ -1,4 +1,4 @@
-{% from "macros/mappings.jinja" import is_yarn, is_mojmap with context -%}
+{% from "macros/mappings.jinja" import mappings with context -%}
 
 // A convention plugin that should be applied to all Minecraft-related subprojects, including {{ common_path }}.
 

diff --git a/templates/1.20.1/gradle/libs.versions.toml.jinja b/templates/1.20.1/gradle/libs.versions.toml.jinja
@@ -1,4 +1,4 @@
-{% from "macros/mappings.jinja" import is_yarn, is_mojmap with context -%}
+{% from "macros/mappings.jinja" import mappings with context -%}
 
 # This file is a version catalog - a central place where you can declare all of your dependencies and their versions.
 # In your build scripts, you can reference it with the `libs` accessor. For example: `libs.hexcasting.fabric`