From 83cd16061f83dc20cd53d4e29d50464da469c189 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Mon, 19 Feb 2024 10:50:59 -0800
Subject: [PATCH] Update BS & remove gradletoken_version

---
 dependencies.gradle                   |  3 +++
 gradle.properties                     | 15 ++++++++-------
 settings.gradle                       |  2 +-
 src/main/java/team/chisel/Chisel.java |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 0fb28c28..f6b30d47 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -19,4 +19,7 @@ dependencies {
     compileOnly("curse.maven:ee3-65509:2305023") {  // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023
         transitive = false
     }
+    compileOnly("com.github.GTNewHorizons:Angelica:1.0.0-alpha28:api") {
+        transitive = false
+    }
 }
diff --git a/gradle.properties b/gradle.properties
index 9a7f9b3a..db81fd86 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -33,7 +33,7 @@ channel = stable
 mappingsVersion = 12
 
 # Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
 
 # Select a default username for testing your mod. You can always override this per-run by running
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -50,10 +50,10 @@ enableGenericInjection = false
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.
 # If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass =
+generateGradleTokenClass = team.chisel.Tags
 
 # Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenVersion = VERSION
 
 # [DEPRECATED] Mod ID replacement token.
 gradleTokenModId =
@@ -61,13 +61,16 @@ gradleTokenModId =
 # [DEPRECATED] Mod name replacement token.
 gradleTokenModName =
 
+# [DEPRECATED] Mod Group replacement token.
+gradleTokenGroupName =
+
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
 # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
 # version in @Mod([...], version = VERSION, [...]).
 # Leave these properties empty to skip individual token replacements.
-replaceGradleTokenInFile = Chisel.java
+replaceGradleTokenInFile =
 
 # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
 # leave this property empty.
@@ -123,7 +126,7 @@ includeWellKnownRepositories = true
 usesMavenPublishing = true
 
 # Maven repository to publish the mod to.
-# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
+# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
 
 # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
 #
@@ -187,5 +190,3 @@ curseForgeRelations =
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
-# Non-GTNH properties
-gradleTokenGroupName = 
diff --git a/settings.gradle b/settings.gradle
index e8946ada..16a5b4ca 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
 }
 
 
diff --git a/src/main/java/team/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java
index 07f64a92..13eba678 100644
--- a/src/main/java/team/chisel/Chisel.java
+++ b/src/main/java/team/chisel/Chisel.java
@@ -67,7 +67,7 @@ public class Chisel {
         1.0f,
         1.0f);
     public static final String MOD_NAME = "Chisel";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
+    public static final String VERSION = Tags.VERSION;
     public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType(
         "holystone",
         1.0f,