Merge pull request #97 from FTBTeam/1.20.1/dev

1.20.1/dev
FTBTeam · Jul 17, 2024 · 166dbe5 · 166dbe5
2 parents 1f0be31 + 069d5a1
commit 166dbe5
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/ui/MenuScreenWrapper.java b/common/src/main/java/dev/ftb/mods/ftblibrary/ui/MenuScreenWrapper.java
@@ -15,8 +15,6 @@
 import net.minecraft.world.item.ItemStack;
 
 import java.util.List;
-import java.util.Optional;
-import java.util.function.BinaryOperator;
 
 /**
  * @author LatvianModder

diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ClientTextComponentUtils.java b/common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ClientTextComponentUtils.java
@@ -52,11 +52,7 @@ private static Component defaultStringToComponent(String s) {
 					c.height = Integer.parseInt(map.get("height"));
 				}
 
-				switch (map.getOrDefault("align", "center").toLowerCase()) {
-					case "left" -> c.align = 0;
-					case "center" -> c.align = 1;
-					case "right" -> c.align = 2;
-				}
+				c.align = ImageComponent.ImageAlign.fromString(map.getOrDefault("align", "center"));
 
 				c.fit = map.getOrDefault("fit", "false").equals("true");
 

diff --git a/common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ImageComponent.java b/common/src/main/java/dev/ftb/mods/ftblibrary/util/client/ImageComponent.java
@@ -1,5 +1,6 @@
 package dev.ftb.mods.ftblibrary.util.client;
 
+import dev.ftb.mods.ftblibrary.config.NameMap;
 import dev.ftb.mods.ftblibrary.icon.Icon;
 import net.minecraft.network.chat.ComponentContents;
 
@@ -8,23 +9,21 @@ public class ImageComponent implements ComponentContents {
 	public Icon image = Icon.empty();
 	public int width = 100;
 	public int height = 100;
-	public int align = 1;
+	public ImageAlign align = ImageAlign.CENTER;
 	public boolean fit = false;
 
 	public ImageComponent() {
 		super();
 	}
 
-
-
 	@Override
 	public String toString() {
 		var sb = new StringBuilder("{image:");
 		sb.append(image);
 
 		sb.append(" width:").append(width);
 		sb.append(" height:").append(height);
-		sb.append(" align:").append(align);
+		sb.append(" align:").append(align.name);
 
 		if (fit) {
 			sb.append(" fit:true");
@@ -33,4 +32,26 @@ public String toString() {
 		sb.append('}');
 		return sb.toString();
 	}
+
+	public enum ImageAlign {
+		LEFT("left"),
+		CENTER("center"),
+		RIGHT("right");
+
+		public static final NameMap<ImageAlign> NAME_MAP = NameMap.of(CENTER, values()).id(v -> v.name).create();
+
+		private final String name;
+
+		ImageAlign(String name) {
+			this.name = name;
+		}
+
+		public static ImageAlign fromString(String str) {
+			return switch (str.toLowerCase()) {
+				case "left", "0" -> ImageAlign.LEFT;
+                case "right", "2" -> ImageAlign.RIGHT;
+				default -> CENTER;
+			};
+		}
+	}
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -3,7 +3,7 @@
 	"id": "ftblibrary",
 	"version": "${version}",
 	"name": "FTB Library",
-	"description": "FTB Library adds nothing.",
+	"description": "Foundational library for FTB mods.",
 	"authors": [
 		"FTB Team"
 	],
@@ -29,5 +29,8 @@
 		"fabric": ">=${fabricapiversion}",
 		"minecraft": "~1.20",
 		"architectury": ">=${archversion}"
+	},
+	"breaks": {
+		"ftbquests": "<2001.4.8"
 	}
 }
diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -9,7 +9,7 @@ version = "${version}"
 displayName = "FTB Library"
 authors = "FTB Team"
 description = '''
-FTB Library adds nothing.
+Foundational library for FTB mods.
 '''
 
 [[dependencies.ftblibrary]]
@@ -32,3 +32,10 @@ mandatory = true
 versionRange = "[${archversion},)"
 ordering = "AFTER"
 side = "BOTH"
+
+[[dependencies.ftblibrary]]
+modId = "ftbquests"
+mandatory = false
+versionRange = "[2001.4.8,)"
+ordering = "BEFORE"
+side = "BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.daemon=false
 mod_id=ftblibrary
 archives_base_name=ftb-library
 maven_group=dev.ftb.mods
-mod_version=2001.2.2
+mod_version=2001.2.3
 mod_author=FTB Team
 minecraft_version=1.20.1
 architectury_version=9.0.8