Merge branch 'smell-of-curry:main' into main

.github/workflows/missing-report.yml

@@ -0,0 +1,54 @@
+name: Missing info report
+
+on:
+  pull_request:
+    branches:
+      - main
+    paths:
+      - pokemons.json
+
+jobs:
+  generate-and-comment:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Generate missing_info.md and log file
+        run: npm run generateEntityFiles
+
+      - name: Upload missing_info.md and log files as artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: reports
+          path: |
+            missing_info.md
+            log-*.log
+
+      - name: Post comments on pull request
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const fs = require('fs');
+            const path = require('path');
+            const missingInfoPath = path.join(process.cwd(), 'missing_info.md');
+            
+            const missingInfo = fs.existsSync(missingInfoPath) ? fs.readFileSync(missingInfoPath, 'utf8') : '';
+
+            if (missingInfo) {
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body: `### Missing Information Report\n\n${missingInfo}\n`
+              });
+            }

.github/workflows/zip-pack.yml

@@ -1,8 +1,8 @@
-name: Zip and Release MCPack
+name: Create new Release
 
 permissions:
   contents: write
-  
+
 on:
   workflow_dispatch:
   push:
@@ -17,49 +17,48 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-      
+
     - name: Install Node.js
       uses: actions/setup-node@v2
       with:
-        node-version: '14'  # Use the version you prefer
+        node-version: '14'
+
+    - name: Install dependencies
+      run: |
+        npm install
+        npm install typescript --save-dev
 
     - name: Read version from manifest
       id: get_version
       run: |
         version=$(jq -r '.header.version | map(tostring) | join(".")' manifest.json)
         echo "Version: $version"
-        echo "::set-output name=version::$version"
+        echo "version=$version" >> $GITHUB_ENV
 
     - name: Create MCPack
       run: |
-        npm install
-        node ./build.js
-        
+        npx ts-node --project tsconfig.json generator/build.ts
+
     - name: Release
       uses: softprops/action-gh-release@v1
       with:
         body_path: CHANGELOG.md
-        name: "v${{ steps.get_version.outputs.version }}"
-        tag_name: "v${{ steps.get_version.outputs.version }}"
+        name: "v${{ env.version }}"
+        tag_name: "v${{ env.version }}"
         files: |
-          PokeBedrock RES ${{ steps.get_version.outputs.version }}.mcpack
-          PokeBedrock RES ${{ steps.get_version.outputs.version }}.zip
-          
+          PokeBedrock RES ${{ env.version }}.mcpack
+          PokeBedrock RES ${{ env.version }}.zip
         draft: false
 
-    - name: Read CHANGELOG.md
-      id: read_changelog
-      run: |
-        changelog=$(cat CHANGELOG.md)
-        echo "::set-output name=changelog::$changelog"
-          
     - name: Discord Webhook Action
-      uses: tsickert/discord-webhook@v5.3.0
+      uses: tsickert/discord-webhook@v6.0.0
       with:
         avatar-url: "https://cdn.discordapp.com/avatars/1093906253517959248/afcb43ebb982eebca879819dda0ce635.webp"
-        webhook-url: ${{ secrets.WEBHOOK_URL  }}
-        embed-title: "[RES] Update v${{ steps.get_version.outputs.version }}"
-        embed-description: "${{ steps.read_changelog.outputs.changelog }}"
+        webhook-url: ${{ secrets.WEBHOOK_URL }}
+        embed-title: "[RES] Update v${{ env.version }}"
+        embed-description: "View full changelog [here](https://github.com/smell-of-curry/pokebedrock-res/blob/main/CHANGELOG.md)"
         embed-url: "https://github.com/smell-of-curry/pokebedrock-res"
-        filename: "PokeBedrock RES ${{ steps.get_version.outputs.version }}.mcpack"
-
+        filename: "PokeBedrock RES ${{ env.version }}.mcpack"
+
+    - name: Complete Workflow
+      run: echo "Workflow completed successfully."

.gitignore

@@ -1,4 +1,4 @@
 node_modules
-generator
-tsconfig.json
-.env
+package-lock.json
+logs
+missing_info.md

.vscode/settings.json

@@ -2,7 +2,11 @@
     "cSpell.words": [
         "actionbar",
         "apricorn",
+        "bulbasaur",
         "dynamaxed",
+        "mcpack",
+        "molang",
+        "neuterer",
         "phud",
         "rotom",
         "smellofcurry"

CHANGELOG.md

@@ -1,6 +1,19 @@
-**Update v2.10.13**
+**Update v2.10.18**
 
-- Added new Water Leader Model by @isme
-- Fixed UI Forms missing `binding_name` property causing error.
-- Updated `heatran` animations to fix molang errors
-- Removed random definitions inside rotom phone.
+- Fixed Armarouge Animations by removing extra `-`
+- Removed random `animation.politoed` animation for politoed
+- Updated all entity files, to map proper animations & textures
+- Updated all render controllers to have correct fileName, and properly map skins
+- Fixed capitalization for Sobbles Geometry.
+- Removed random locator in `groundLeader` geometry.
+- Added names to `pokemeon.json` and re-named some skins.
+- Fixed mewtwo skins
+- Fixed mimikyu skins
+- Fixed spheal skins
+- Fixed cooldown message for commands
+- Updated entity generation
+  - Added render controller generation
+  - Improved logging
+  - Remade some functions to improve readability and structure
+  - Added a lot of missing generation
+  - Fixed a lot of problems with generating files.

animations/neuterer.animation.json

@@ -0,0 +1,36 @@
+{
+	"format_version": "1.8.0",
+	"animations": {
+		"animation.neuterer.idle": {
+			"loop": true,
+			"animation_length": 4,
+			"bones": {
+				"Body": {
+					"rotation": ["10+Math.cos((query.anim_time) *90-60)*1", 0, 0],
+					"position": [0, "0+Math.cos((query.anim_time) *90-30)*-0.1", 0]
+				},
+				"Head": {
+					"rotation": ["-5+Math.cos((query.anim_time) *90-30)*-2", 0, 0]
+				},
+				"RightArm": {
+					"rotation": ["-22.8498+Math.cos((query.anim_time) *90-30)*-2", -31.26174, 19.31662],
+					"position": [0, -1, 0]
+				},
+				"bone": {
+					"rotation": ["11.0548+Math.cos((query.anim_time) *90-90)*1 ", 1.70688, -186.27052],
+					"position": [5.5, 1, 0]
+				},
+				"LeftArm": {
+					"rotation": [23.48402, 71.68981, "45.2536+Math.cos((query.anim_time) *90-30)*1"],
+					"position": [0, 0, 2]
+				},
+				"RightLeg": {
+					"rotation": [-2.01966, 19.86792, 3.16869]
+				},
+				"LeftLeg": {
+					"rotation": [1.16243, -16.78259, -2.49509]
+				}
+			}
+		}
+	}
+}