Port to 1.20.4 [build] [publish]

Mrbysco · Dec 20, 2023 · fbcc68b · fbcc68b
1 parent e11bac4
commit fbcc68b
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 21 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1 +1 @@
-* Initial update to 1.20.2
+* Initial update to 1.20.4
diff --git a/common/src/main/resources/assets/armorposer/lang/en_us.json b/common/src/main/resources/assets/armorposer/lang/en_us.json
@@ -86,5 +86,11 @@
     "armorposer.config.allowScrolling.tooltip": "Allow scrolling to increase / decrease an angle value in the posing screen",
 
     "armorposer.key.openArmorStandGui": "Open GUI",
-    "armorposer.key.categories.general": "Armor Stand Configurator"
+    "armorposer.key.categories.general": "Armor Stand Configurator",
+
+    "text.autoconfig.armorposer.title": "Armor Poser",
+    "text.autoconfig.armorposer.option.general": "General",
+    "text.autoconfig.armorposer.option.general.enableConfigGui": "Enable Config Gui",
+    "text.autoconfig.armorposer.option.general.enableNameTags": "Enable Name Tags",
+    "text.autoconfig.armorposer.option.general.allowScrolling": "Allow Scrolling"
 }
diff --git a/common/src/main/resources/assets/armorposer/lang/fr_fr.json b/common/src/main/resources/assets/armorposer/lang/fr_fr.json
@@ -86,5 +86,11 @@
     "armorposer.config.allowScrolling.tooltip": "Allow scrolling to increase / decrease an angle value in the posing screen",
 
     "armorposer.key.openArmorStandGui": "Ouvrir le menu",
-    "armorposer.key.categories.general": "Configurateur du porte-armure"
+    "armorposer.key.categories.general": "Configurateur du porte-armure",
+
+    "text.autoconfig.armorposer.title": "Armor Poser",
+    "text.autoconfig.armorposer.option.general": "General",
+    "text.autoconfig.armorposer.option.general.enableConfigGui": "Enable Config Gui",
+    "text.autoconfig.armorposer.option.general.enableNameTags": "Enable Name Tags",
+    "text.autoconfig.armorposer.option.general.allowScrolling": "Allow Scrolling"
 }
diff --git a/common/src/main/resources/assets/armorposer/lang/zh_tw.json b/common/src/main/resources/assets/armorposer/lang/zh_tw.json
@@ -85,5 +85,11 @@
     "armorposer.config.allowScrolling.tooltip": "Allow scrolling to increase / decrease an angle value in the posing screen",
 
     "armorposer.key.openArmorStandGui": "打開GUI",
-    "armorposer.key.categories.general": "盔甲座配置"
+    "armorposer.key.categories.general": "盔甲座配置",
+
+    "text.autoconfig.armorposer.title": "Armor Poser",
+    "text.autoconfig.armorposer.option.general": "General",
+    "text.autoconfig.armorposer.option.general.enableConfigGui": "Enable Config Gui",
+    "text.autoconfig.armorposer.option.general.enableNameTags": "Enable Name Tags",
+    "text.autoconfig.armorposer.option.general.allowScrolling": "Allow Scrolling",
 }
diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Armor Poser resources",
-    "pack_format": 18
+    "pack_format": 22
   }
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -30,10 +30,10 @@
     "armorposer.fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.14.24",
-    "fabric": "*",
-    "minecraft": "~1.20.2",
+    "fabricloader": ">=0.15.3",
+    "minecraft": "~1.20.4",
     "java": ">=17",
+    "fabric-api": "*",
     "cloth-config": ">=12.0.108"
   }
 }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.61'
+    id 'net.neoforged.gradle.userdev' version '7.0.71'
     id 'net.darkhax.curseforgegradle'
     id 'com.modrinth.minotaur'
 }

diff --git a/forge/src/main/java/com/mrbysco/armorposer/ArmorPoser.java b/forge/src/main/java/com/mrbysco/armorposer/ArmorPoser.java
@@ -10,7 +10,6 @@
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.config.ModConfig.Type;
 import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.neoforged.neoforge.network.NetworkRegistry;
 import net.neoforged.neoforge.network.simple.SimpleChannel;
 
@@ -25,8 +24,7 @@ public class ArmorPoser {
 			PROTOCOL_VERSION::equals
 	);
 
-	public ArmorPoser() {
-		IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
+	public ArmorPoser(IEventBus eventBus) {
 		ModLoadingContext.get().registerConfig(Type.COMMON, PoserConfig.commonSpec);
 		eventBus.register(PoserConfig.class);
 

diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
@@ -15,7 +15,13 @@ A GUI to allow configuration of Armor Stand properties
 '''
 [[dependencies.armorposer]]
 modId="minecraft"
-mandatory=true
-versionRange="[1.20.2,1.21)"
+type="required"
+versionRange="[1.20.4,1.21)"
+ordering="NONE"
+side="BOTH"
+[[dependencies.armorposer]]
+modId="neoforge"
+type="required"
+versionRange="[20.4.11-beta,)"
 ordering="NONE"
 side="BOTH"
diff --git a/gradle.properties b/gradle.properties
@@ -1,18 +1,18 @@
 # Project
-version=3.0.0
+version=4.0.0
 group=com.mrbysco.armorposer
 
 # Common
-minecraft_version=1.20.2
+minecraft_version=1.20.4
 
 # NeoForge
-neo_version=20.2.86
+neo_version=20.4.47-beta
 
 # Fabric
-fabric_version=0.90.7+1.20.2
-fabric_loader_version=0.14.24
-cloth_config_version=12.0.109
-mod_menu_version=8.0.0
+fabric_version=0.91.3+1.20.4
+fabric_loader_version=0.15.3
+cloth_config_version=13.0.114
+mod_menu_version=9.0.0
 
 # Mod options
 mod_name=ArmorPoser