Merge pull request #635 from tmudway/master

Updated BAMO to 0.5.0 to enable 1.20.1 support (and add the animation…

plugins.json

@@ -878,15 +878,17 @@
 		"min_version": "4.6.0",
 		"variant": "both"
 	},
-	"bamo": {
+	"bamo":{
 		"title": "BAMO Exporter",
 		"author": "Ryytikki",
-		"description": "Create custom Minecraft blocks without having to write a single line of code when paired with the BAMO mod. https://www.curseforge.com/minecraft/mc-mods/bamo-block-and-move-on",
-		"icon": "bar_chart",
+		"description": "Create custom Minecraft blocks without having to write a single line of code when paired with the BAMO mod.",
+		"website": "https://www.curseforge.com/minecraft/mc-mods/bamo-block-and-move-on",
+		"icon": "icon.png",
 		"tags": ["Minecraft: Java Edition"],
-		"version": "0.5.0",
-		"variant": "desktop"
-	},
+		"version": "0.5.1",
+		"variant": "desktop",
+		"new_respository_format" : true
+  	},
 	"animation_to_json": {
 		"title": "Animation to JSON Converter",
 		"author": "Gaming32",

plugins/bamo/src/.gitignore

@@ -0,0 +1 @@
+node_modules

src/bamo/package.json → plugins/bamo/src/package.json

@@ -10,6 +10,9 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
+    "@babel/core": "^7.18.2",
+    "@babel/preset-env": "^7.18.2",
+    "babel-loader": "^8.2.5",
     "css-loader": "^6.7.1",
     "to-string-loader": "^1.2.0",
     "webpack": "^5.75.0",

src/bamo/src/components/BamoAdvancedTemplate.html → plugins/bamo/src/src/components/BamoAdvancedTemplate.html

@@ -48,6 +48,16 @@ <h1 style="padding:0; text-align: center;">BAMO Exporter</h1>
                     <p v-if="error=='name'" style="color:red">Block display name cannot be blank</p>
                     <input type="text" class="dark_bordered" v-model="$parent.$data.properties.displayName" placeholder="Name of the Block">
                 </li>
+                <li>
+                    <div class="headerLabel">Minecraft Version</div>
+                    <p class="headerDescription"> The version of minecraft to export for</p>
+                    <select class="dark_bordered" v-model="$parent.$data.properties.version">
+                        <option disabled value="">Please select</option>
+                        <option>1.20.1</option>
+                        <option>1.18.2</option>
+                        <option>1.16.5</option>
+                    </select>
+                </li>
             </ul><br>
 
             <button @click.prevent="changePage($event, 'types')">Continue</button>
@@ -324,6 +334,11 @@ <h1 style="padding:0; text-align: center;">Other Properties</h1>
                     <p class="headerDescription">if y_axis, faces the player when placed</p>
                     <select class="dark_bordered" v-model="$parent.$data.properties.rotType"><option v-for="op in rotationTypes" v-bind:key="op">{{ op }}</option></select>
                 </li>
+                <li>
+                    <input type="checkbox" v-model="parentData.properties.animated">
+                    <div class = "headerLabel">Animated Textures (WIP)</div>
+                    <p class = "headerDescription">Enables texture animations. Currently only recommended for single texture models</p>
+                </li>
             </ul>
             <br>
             <button @click.prevent="changePage($event, 'datapack')">Previous</button>

src/bamo/src/components/BamoBaseComponent.vue → plugins/bamo/src/src/components/BamoBaseComponent.vue

@@ -121,8 +121,9 @@ export default {
             var blockstatesFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\assets\\" + this.properties.namespace + "\\blockstates\\";
             var blockModelsFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\assets\\" + this.properties.namespace + "\\models\\block\\";
             var itemModelsFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\assets\\" + this.properties.namespace + "\\models\\item\\";
-            var blockTexturesFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\assets\\" + this.properties.namespace + "\\textures\\blocks\\";
             var dataFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\data\\";
+            var blockTextureFolderVersion = this.properties.version == "1.20.1" ? "block" : "blocks"
+            var blockTexturesFolder = settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\assets\\" + this.properties.namespace + "\\textures\\" + blockTextureFolderVersion + "\\";
 
             // Create the folders if they dont exist
             var folderList = [objFolder, blockstatesFolder, blockModelsFolder, itemModelsFolder, blockTexturesFolder, dataFolder];
@@ -135,7 +136,9 @@ export default {
             })
 
             // Create mcmeta file
-            var mcmetaData = {"pack" : {"pack_format" : 6, "description" : "Resource Pack for BAMO test files"}};
+            // Format ID is 15 for 1.20.1, 8 for 1.18.2, and 6 for 1.16.5
+            var formatID = this.properties.version == "1.20.1" ? 15 : this.properties.version == "1.18.2" ? 8 : 6
+            var mcmetaData = {"pack" : {"pack_format" : formatID, "description" : "Resource Pack for BAMO test files"}};
             fs.writeFile(settings.minecraftFolder.value + "\\bamopacks\\" + packName + "\\pack.mcmeta", JSON.stringify(mcmetaData), "utf8", (err) => {if (err != null) {console.log("Error generating mcmeta file:", err);}});
             zip.file("pack.mcmeta", JSON.stringify(mcmetaData))
 
@@ -183,7 +186,7 @@ export default {
                     Texture.all.forEach(function(tx){
                         if ((tx.id == comp) || (partCheck && tx.particle == true)){
                             if (tx.namespace == ""){
-                                textureData[key] = ns + ":blocks/" + cleanFileName(tx.name.split(".")[0]);
+                                textureData[key] = ns + ":" + blockTextureFolderVersion + "/" + cleanFileName(tx.name.split(".")[0]);
                             }else{
                                 textureData[key] = tx.namespace + ":" + tx.folder + "/" + cleanFileName(tx.name.split(".")[0])
                             } 
@@ -395,6 +398,7 @@ export default {
 
             var modelData = JSON.parse(codecData);
             var ns = this.properties.namespace
+            var animated = this.properties.animated
             // Copy texture files
             Texture.all.forEach(function(tx){
                 var image;
@@ -406,7 +410,11 @@ export default {
                     }
         
                     fs.writeFile(blockTexturesFolder + "\\" + cleanFileName(tx.name), image, (err) => {if (err != null) {console.log("Error Found writing texture data:", err);}});
-                    zip.file("assets/" + ns + "/textures/blocks/" + cleanFileName(tx.name), image)
+                    zip.file("assets/" + ns + "/textures/" + blockTextureFolderVersion + "/" + cleanFileName(tx.name), image)
+                    if (animated){
+                        fs.writeFile(blockTexturesFolder + "\\" + cleanFileName(tx.name) + ".mcmeta", '{"animation" : {}}', (err) => {if (err != null) {console.log("Error Found writing animation data:", err);}})
+                        zip.file("assets/" + ns + "/textures/" + blockTextureFolderVersion + "/" + cleanFileName(tx.name) + ".mcmeta", '{"animation" : {}}')
+                    }
                 }
             })
 

src/bamo/src/main.js → plugins/bamo/src/src/main.js

@@ -12,10 +12,12 @@ Plugin.register('bamo', {
 	title: 'BAMO Exporter',
 	author: 'Ryytikki',
 	description: 'Create custom Minecraft blocks without having to write a single line of code when paired with the BAMO mod. https://www.curseforge.com/minecraft/mc-mods/bamo-block-and-move-on',
-	icon: 'bar_chart',
+	website: "https://www.curseforge.com/minecraft/mc-mods/bamo-block-and-move-on",
+	icon: 'icon.png',
 	tags: ['Minecraft: Java Edition'],
-	version: '0.5.0',
+	version: '0.5.1',
 	variant: 'desktop',
+	new_respository_format : true,
 
 	onload() {
 

src/bamo/src/util/Settings.js → plugins/bamo/src/src/util/Settings.js

@@ -1,6 +1,7 @@
 export const BAMO_SETTINGS_DEFAULT = {
     displayName: "",
     namespace: "bamo",
+    version: "1.20.1",
     typeList: [],
     material: "Dirt",
     blastRes: 6,
@@ -63,7 +64,8 @@ export const BAMO_SETTINGS_DEFAULT = {
     bufferedHitbox: true,
     hitboxBuffer: 0.5,
     genScRecipe: true,
-    genReversableScRecipe: true
+    genReversableScRecipe: true,
+    animated: false
 };
 
 Object.freeze(BAMO_SETTINGS_DEFAULT);

src/bamo/webpack.config.js → plugins/bamo/src/webpack.config.js

@@ -12,6 +12,13 @@ module.exports = {
 	},
 	module: {
 		rules: [
+			{
+				test: /\.js$/,
+				exclude: /node_modules/,
+				use: {
+					loader: "babel-loader",
+				},
+			},
 			{
                 test: /\.vue$/,
                 loader: 'vue-loader',