Add fallback unicode for 1.20

DistrictOfJoban · Jun 23, 2024 · 21f858a · 21f858a
1 parent 6862913
commit 21f858a
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,14 @@
 ## (JCM v2.0.0 beta-3) for (MTR 4 beta-9) has been released!
 
-**New:**
+**New:**  
 - Add ja_jp (Japanese) translation (Thanks CinderaceOTS!)
 - All Helpline & Emergency buttons now emits a Redstone signal when right-clicked, so you now can use this to setup your own contraption. (Helpline Death Trap anyone?)
 
-**Changes:**
+**Changes:**  
 - All modloaders has been merged into 1 jar again (via [Forgix](https://github.com/PacifistMC/Forgix)), just like in JCM v1
 
-**Download:**
+**Fixes:**
+- Fix JCM-provided fonts showing up as a square in unsupported languages. (Now fallback to Minecraft font)
+
+**Download:**  
 You can download this release on [Modrinth](https://modrinth.com/mod/jcm) or [GitHub](https://github.com/DistrictOfJoban/Joban-Client-Mod/releases)
diff --git a/build.gradle b/build.gradle
@@ -50,7 +50,7 @@ subprojects {
 				(merged_mc_version as int) <= 12004 ? 17 :
 				21
 
-		lg_unicode = (mc_main as int) <= 19 ? rootProject.properties.legacy_unicode_font : ""
+		lg_unicode = (mc_main as int) <= 19 ? rootProject.properties.legacy_unicode_font : rootProject.properties.modern_fallback_font
 		door_blockstate = (mc_main as int) <= 18 ? rootProject.properties.mc_door_118 : rootProject.properties.mc_door_119
 		full_mod_version = version + artifact_date
 	}

diff --git a/gradle.properties b/gradle.properties
@@ -16,11 +16,24 @@ mtr_version=4.0.0-beta-8
 
 # Cross version mapping
 legacy_unicode_font = ,\n \
-  \t\t{\n \
-      \t\t\t\"type\": \"legacy_unicode\",\n \
-      \t\t\t\"sizes\": \"minecraft:font/glyph_sizes.bin\",\n \
-      \t\t\t\"template\": \"minecraft:font/unicode_page_%s.png\"\n \
-  \t\t}
+  {\n \
+    "type": "legacy_unicode", \
+    "sizes": "minecraft:font/glyph_sizes.bin", \
+    "template": "minecraft:font/unicode_page_%s.png" \
+  }
+modern_fallback_font =  ,\n \
+  {\n \
+    "type": "reference", \
+    "id": "minecraft:include/space" \
+  }, \n \
+  {\n \
+    "type": "reference", \
+    "id": "minecraft:include/default" \
+  }, \n \
+  {\n \
+    "type": "reference", \
+    "id": "minecraft:include/unifont" \
+  }
 
 mc_door_118 = {"variants": {"facing=east,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom"},"facing=east,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_hinge","y": 90},"facing=east,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_hinge"},"facing=east,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom","y": 270},"facing=east,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top"},"facing=east,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_hinge","y": 90},"facing=east,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_hinge"},"facing=east,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top","y": 270},"facing=north,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom","y": 270},"facing=north,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_hinge"},"facing=north,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_hinge","y": 270},"facing=north,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom","y": 180},"facing=north,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top","y": 270},"facing=north,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_hinge"},"facing=north,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_hinge","y": 270},"facing=north,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top","y": 180},"facing=south,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom","y": 90},"facing=south,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_hinge","y": 180},"facing=south,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_hinge","y": 90},"facing=south,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom"},"facing=south,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top","y": 90},"facing=south,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_hinge","y": 180},"facing=south,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_hinge","y": 90},"facing=south,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top"},"facing=west,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom","y": 180},"facing=west,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_hinge","y": 270},"facing=west,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_hinge","y": 180},"facing=west,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom","y": 90},"facing=west,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top","y": 180},"facing=west,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_hinge","y": 270},"facing=west,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_hinge","y": 180},"facing=west,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top","y": 90}}}
 mc_door_119 = {"variants": {"facing=east,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom_left"},"facing=east,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_left_open","y": 90},"facing=east,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_right"},"facing=east,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom_right_open","y": 270},"facing=east,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top_left"},"facing=east,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_left_open","y": 90},"facing=east,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_right"},"facing=east,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top_right_open","y": 270},"facing=north,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom_left","y": 270},"facing=north,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_left_open"},"facing=north,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_right","y": 270},"facing=north,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom_right_open","y": 180},"facing=north,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top_left","y": 270},"facing=north,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_left_open"},"facing=north,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_right","y": 270},"facing=north,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top_right_open","y": 180},"facing=south,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom_left","y": 90},"facing=south,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_left_open","y": 180},"facing=south,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_right","y": 90},"facing=south,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom_right_open"},"facing=south,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top_left","y": 90},"facing=south,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_left_open","y": 180},"facing=south,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_right","y": 90},"facing=south,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top_right_open"},"facing=west,half=lower,hinge=left,open=false": {"model": "minecraft:block/iron_door_bottom_left","y": 180},"facing=west,half=lower,hinge=left,open=true": {"model": "minecraft:block/iron_door_bottom_left_open","y": 270},"facing=west,half=lower,hinge=right,open=false": {"model": "minecraft:block/iron_door_bottom_right","y": 180},"facing=west,half=lower,hinge=right,open=true": {"model": "minecraft:block/iron_door_bottom_right_open","y": 90},"facing=west,half=upper,hinge=left,open=false": {"model": "minecraft:block/iron_door_top_left","y": 180},"facing=west,half=upper,hinge=left,open=true": {"model": "minecraft:block/iron_door_top_left_open","y": 270},"facing=west,half=upper,hinge=right,open=false": {"model": "minecraft:block/iron_door_top_right","y": 180},"facing=west,half=upper,hinge=right,open=true": {"model": "minecraft:block/iron_door_top_right_open","y": 90}}}