Merge pull request #624 from AzureDoom/master

AzureLib Utils v1.0.10

plugins.json

@@ -890,7 +890,7 @@
 		"icon": "azureicon.png",
 		"description": "Create animated blocks, items, entity, and armor using the AzureLib library and plugin. This is a fork of Geckolib and cross compatibility will not be promised in the future.",
 		"tags": ["Minecraft: Java Edition"],
-		"version": "1.0.9",
+		"version": "1.0.10",
 		"min_version": "4.8.0",
 		"new_repository_format": true,
 		"await_loading": true,

plugins/azurelib_utils/about.md

@@ -1,44 +1,51 @@
-Download the mod library here on [CurseForge](https://www.curseforge.com/minecraft/mc-mods/azurelib) and [Modrinth](https://modrinth.com/mod/azurelib). 
+<p align="center">
+<img src="https://www.bisecthosting.com/images/CF/AzureLib/BH_AL_header.png" />
+<a href="https://discord.azuredoom.com/"> <img src="https://img.shields.io/discord/574529906076286996?color=red&label=Discord&logo=Discord&logoColor=red&style=for-the-badge" alt="discord"/> </a>
+</p>
+<p align="center">
+AzureLib represents a branch derived from Geckolib 4.x, serving as an animation engine tailored for Minecraft Mods. It boasts various features, including support for intricate 3D keyframe-driven animations, over 30 different easing functions, concurrent animation capabilities, sound and particle keyframes, event-based keyframes, and numerous other functionalities.
+</br>
 
-Wiki found here: https://wiki.azuredoom.com/
+<p align="center">
+Download the mod here on:
+</p>
 
+<p align="center">
+<a href="https://www.curseforge.com/minecraft/mc-mods/azurelib"> <img src="https://i.imgur.com/JlZqq8q.png" width="128" height="128" alt="curseforge"/></a>
+<a href="https://modrinth.com/mod/azurelib"> <img src="https://i.imgur.com/oM891tg.png" width="128" height="128" alt="modrinth"/> </a>
+</p>
+
+</br>
+
+<p align="center">
+<a href="https://wiki.azuredoom.com/">Wiki found here </a>
+</p>
+
+<p align="center">
 Supported Minecraft versions: 
-- **1.16.5 Forge/Fabric**
-- **1.17.1 Forge/Fabric**
-- **1.18.2 Forge/Fabric**
-- **1.19.2 Forge/Fabric**
-- **1.19.4 Forge/Fabric**
-- **1.20.1 Forge/NeoForge/Fabric**
-- **1.20.4 NeoForge/Fabric**
-- **1.20.6 NeoForge/Fabric**
-
-To add to your code, please do the following: 
-
-```gradle
-repositories {
-  // The Maven with the mods source
-  maven { url 'https://libs.azuredoom.com:4443/mods' }
-}
-
-dependencies {
-    //Common 1.20.1+ Latest Only
-    compileOnly "mod.azure.azurelib:azurelib-common-MCVER:MODVER"
-  
-    //Fabric or Quilt and older
-    modImplementation "mod.azure.azurelib:azurelib-fabric-MCVER:MODVER"
-	//Fabric bug is requiring this
-    modApi "com.terraformersmc:modmenu:VERSION"
-
-    //Forge 1.20.1 and older (Forge is no longer supported)
-    implementation fg.deobf("mod.azure.azurelib:azurelib-forge-MCVER:MODVER")
-  
-    //NeoForge 1.20.1
-    implementation fg.deobf("mod.azure.azurelib:azurelib-neo-MCVER:MODVER")
-  
-    //NeoForge 1.20.4+
-    implementation "mod.azure.azurelib:azurelib-neo-MCVER:MODVER"
-}
+</p>
+
+```
+- 1.15.2 Forge
+- 1.16.5 Forge/Fabric
+- 1.17.1 Forge/Fabric
+- 1.18.2 Forge/Fabric
+- 1.19.2 Forge/Fabric
+- 1.19.4 Forge/Fabric
+- 1.20.1 Forge/NeoForge/Fabric
+- 1.20.4+ NeoForge/Fabric
+- 1.21+ NeoForge/Fabric
 ```
+
+<p align="center">
+Need a server to play with friends? Don't know how to setup one? Just rent an already configured server from BisectHosting!
+<a href="https://bisecthosting.com/azuredoom"> <img src="https://www.bisecthosting.com/images/CF/AzureLib/BH_AL_promo.png" alt="logo"/> </a>
+
+
+<p align="center">
+Click on the picture above, select plan(at least 4GB), and use my code azuredoom to get 25% off your first month and enjoy playing with your friends!
+</p></p>
+
 <style>
   #plugin_browser_page pre {
     overflow-x: auto;

plugins/azurelib_utils/changelog.json

@@ -73,5 +73,20 @@
 				]
 			}
 		]
+	},
+	"1.0.10": {
+		"title": "1.0.10",
+		"date": "2024-09-28",
+		"author": "AzureDoom",
+		"categories": [
+			{
+				"title": "Changes",
+				"list": [
+					"Auto convert bedrock format into format that works properly",
+					"Remove item display transforms from geo file exported for azure_models",
+					"Tweaked ArmorTemplate Names/pivots"
+				]
+			}
+		]
 	}
 }

src/azurelib_utils/armorTemplate.json

@@ -280,28 +280,28 @@
       ]
     },
     {
-      "name": "bipedRightLeg",
+      "name": "bipedLeftLeg",
       "uuid": "37231be7-a8ef-22ca-7fea-40aed58003bb",
       "export": true,
       "isOpen": true,
       "visibility": true,
       "autouv": 0,
       "origin": [
-        2,
+        -2,
         12,
         0
       ],
       "children": [
         "17b9bae0-356a-9bba-fad9-4672e2671191",
         {
-          "name": "armorRightLeg",
+          "name": "armorLeftLeg",
           "uuid": "e4b19746-2d17-1f56-befe-00718165ae50",
           "export": true,
           "isOpen": true,
           "visibility": true,
           "autouv": 0,
           "origin": [
-            2,
+            -2,
             12,
             0
           ],
@@ -310,14 +310,14 @@
           ]
         },
         {
-          "name": "armorRightBoot",
+          "name": "armorLeftBoot",
           "uuid": "9fe26b9a-ad66-9e6b-2fa2-4168e333b4be",
           "export": true,
           "isOpen": true,
           "visibility": true,
           "autouv": 0,
           "origin": [
-            2,
+            -2,
             12,
             0
           ],
@@ -328,28 +328,28 @@
       ]
     },
     {
-      "name": "bipedLeftLeg",
+      "name": "bipedRightLeg",
       "uuid": "45c031a5-b6be-e0a7-5454-b45d07f28429",
       "export": true,
       "isOpen": true,
       "visibility": true,
       "autouv": 0,
       "origin": [
-        -2,
+        2,
         12,
         0
       ],
       "children": [
         "7b31bac4-dc40-2b93-1204-7bbdcfe7d924",
         {
-          "name": "armorLeftLeg",
+          "name": "armorRightLeg",
           "uuid": "60238f18-e74b-c863-cb45-2e2f162221bd",
           "export": true,
           "isOpen": true,
           "visibility": true,
           "autouv": 0,
           "origin": [
-            -2,
+            2,
             12,
             0
           ],
@@ -358,14 +358,14 @@
           ]
         },
         {
-          "name": "armorLeftBoot",
+          "name": "armorRightBoot",
           "uuid": "eb3db34b-ccfe-dae9-ac4d-4e22c3222f70",
           "export": true,
           "isOpen": true,
           "visibility": true,
           "autouv": 0,
           "origin": [
-            -2,
+            2,
             12,
             0
           ],
@@ -379,4 +379,4 @@
   "textures": [
 
   ]
-}
+}

src/azurelib_utils/codec.js

@@ -37,19 +37,54 @@ function onProjectParse(e) {
 }
 
 function onBedrockCompile(e) {
-    console.log('onBedrockCompile e:', e);
+    if (Format.id !== "azure_model") return;
+
+    const geometry = e.model?.["minecraft:geometry"];
+    if (geometry) {
+        geometry.forEach((geo) => {
+            delete geo.item_display_transforms;
+        });
+    }
 }
 
 function animatorBuildFile() {
     const res = Original.get(Animator).buildFile.apply(this, arguments);
-	if (Format.id === "azure_model") {
-        Object.assign(
-            res,
-            {
-                'azurelib_format_version': azurelibSettings.formatVersion,
+
+    if (Format.id !== "azure_model") return res;
+
+    Object.assign(res, {
+        'azurelib_format_version': azurelibSettings.formatVersion,
+    });
+
+    const animations = res.animations;
+    if (!animations) return res;
+
+    for (const animation in animations) {
+        const bones = animations[animation]?.bones;
+        if (!bones) continue;
+
+        for (const boneName in bones) {
+            const bone = bones[boneName];
+            for (const animationGroupType in bone) {
+                const animationGroup = bone[animationGroupType];
+                for (const timestamp in animationGroup) {
+                    const keyframe = animationGroup[timestamp];
+
+                    if (keyframe) {
+                        if (keyframe["lerp_mode"]) delete keyframe["lerp_mode"];
+
+                        let bedrockKeyframeData = keyframe["pre"] || keyframe["post"];
+                        if (bedrockKeyframeData) {
+                            Object.assign(keyframe, bedrockKeyframeData);
+                        }
+                        delete keyframe["pre"];
+                        delete keyframe["post"];
+                    }
+                }
             }
-        );
+        }
     }
+
     return res;
 }
 
@@ -251,9 +286,7 @@ export function maybeExportItemJson(options = {}, as) {
     }
 
     const blockmodelString = JSON.stringify(blockmodel, null, 2);
-
     var scope = codec;
-
     let path = azurelibSettings.itemModelPath;
 
     Blockbench.export({

src/azurelib_utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "azurelib_utils",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": true,
   "description": "AzureLib Animator",
   "main": "index.js",