Merge branch 'refs/heads/1.19' into 1.18

# Conflicts: # compat/build.gradle # core/src/main/java/folk/sisby/switchy/util/Feedback.java
sisby-folk · Aug 28, 2024 · 7ec209f · 7ec209f
2 parents 2a6baa6 + c4b9b92
commit 7ec209f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -128,8 +128,8 @@ allprojects {
 		publications {
 			mavenJava(MavenPublication) {
 				from components.java
-				artifactId "switchy" + '-' + project.name
-				version "$project.baseVersion+$project.branch"
+				artifactId "${rootProject.slug}-${project.name}"
+				version "${rootProject.baseVersion}+${rootProject.branch}"
 			}
 		}
 	}

diff --git a/cardinal-ui/src/main/java/folk/sisby/switchy/client/api/PrettyElementVisitor.java b/cardinal-ui/src/main/java/folk/sisby/switchy/client/api/PrettyElementVisitor.java
@@ -2,7 +2,14 @@
 
 import folk.sisby.switchy.util.Feedback;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.*;
+import net.minecraft.nbt.NbtByte;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtDouble;
+import net.minecraft.nbt.NbtFloat;
+import net.minecraft.nbt.NbtInt;
+import net.minecraft.nbt.NbtLong;
+import net.minecraft.nbt.NbtShort;
+import net.minecraft.nbt.NbtString;
 import net.minecraft.nbt.visitor.NbtElementVisitor;
 import net.minecraft.nbt.visitor.NbtTextFormatter;
 import net.minecraft.text.MutableText;