From ba2df81fe701845a5d1254a1eaab26639f460795 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Fri, 17 Dec 2021 04:49:29 +0800
Subject: [PATCH] Make Aspects#set not undoable

---
 build.gradle                                  | 21 ++++++++++++++++---
 build.properties                              |  4 ++--
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../mods/thaumcraft/handlers/Aspects.java     | 20 ++++++++++++------
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index da68dbe..d069f8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,17 +1,24 @@
 buildscript {
     repositories {
-        mavenCentral()
         maven {
             name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            url = "https://maven.minecraftforge.net"
         }
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
+        maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
+            url = "https://jitpack.io"
+        }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
     }
 }
 
@@ -74,3 +81,11 @@ task deobfJar(type: Jar) {
 }
 
 tasks.build.dependsOn deobfJar
+
+idea {
+    module {
+        inheritOutputDirs = false
+        outputDir = compileJava.destinationDir
+        testOutputDir = compileTestJava.destinationDir
+    }
+}
diff --git a/build.properties b/build.properties
index f4d36ce..3c03851 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,6 @@
 minecraft.version=1.7.10
-forge.version=10.13.4.1448-1.7.10
+forge.version=10.13.4.1614-1.7.10
 
-mod.version=0.9.6
+mod.version=0.9.7-GTNH
 
 forestry.version=4.1.0.43
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 678d9d8..a4e35a1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
diff --git a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java
index ad11a57..2c5968c 100644
--- a/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java
+++ b/src/main/java/modtweaker2/mods/thaumcraft/handlers/Aspects.java
@@ -37,7 +37,6 @@ public class Aspects {
 		private final String aspects;
 		private final boolean replace;
 		private AspectList oldList;
-		private AspectList newList;
 
 		public Add(ItemStack stack, String aspects, boolean replace) {
 			super("Aspects");
@@ -48,19 +47,28 @@ public class Aspects {
 
 		@Override
 		public void apply() {
-			oldList = ThaumcraftApiHelper.getObjectAspects(stack);
-			if (!replace)
-				newList = ThaumcraftHelper.parseAspects(oldList, aspects);
-			else
+			AspectList newList;
+			if (replace) {
 				newList = ThaumcraftHelper.parseAspects(aspects);
-			
+			} else {
+				oldList = ThaumcraftApiHelper.getObjectAspects(stack);
+				newList = ThaumcraftHelper.parseAspects(oldList, aspects);
+			}
+
 			ThaumcraftApi.objectTags.put(Arrays.asList(stack.getItem(), stack.getItemDamage()), newList);
 			
 			success = true;
 		}
 
+		@Override
+		public boolean canUndo() {
+			return !replace;
+		}
+
 		@Override
 		public void undo() {
+			if (replace)
+				return;
 			if (oldList == null) {
 				ThaumcraftApi.objectTags.remove(Arrays.asList(stack.getItem(), stack.getItemDamage()));
 			} else