Merge pull request #388 from BedrockTweaks/devel

5.2.0

.github/workflows/deploy.yml

@@ -1,26 +1,59 @@
-name: Build and Deploy Site
+name: Build and deploy files
 
 on:
   push:
     branches:
       - main
+      - devel
 
 jobs:
+  check-branch-build:
+    name: Get branch name
+    runs-on: ubuntu-latest
+    outputs:
+      branch: ${{ steps.check_step.outputs.branch }}
+      status: ${{ steps.check_step.outputs.status }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Get current branch and repo
+        id: check_step
+        run: |
+          raw=$(git branch -r --contains ${{ github.ref }})
+          branch=${raw##*/}
+          status=${{ job.status }}
+          echo "::set-output name=status::$status"
+          echo "::set-output name=branch::$branch"
+          echo "Branch is $branch."
+
   deploy:
     name: Deploy
     runs-on: ubuntu-latest
     outputs:
       status: ${{ steps.job-status.outputs.status }}
 
     steps:
-      - name: Update files
+      - name: Update files Production
+        if: needs.check-branch-build.outputs.branch == 'main'
         uses: appleboy/ssh-action@master
         with:
           host: ${{ secrets.SERVER_ADDRESS }}
           username: ${{ secrets.SERVER_USER }}
           password: ${{ secrets.SERVER_PASSWORD }}
           script: cd /opt/bedrock_tweaks/files && git reset --hard && git clean -fd && git pull ${{ secrets.REPOSITORY_URL }}
 
+      - name: Update files Development
+        if: needs.check-branch-build.outputs.branch == 'devel'
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SERVER_ADDRESS }}
+          username: ${{ secrets.SERVER_USER }}
+          password: ${{ secrets.SERVER_PASSWORD }}
+          script: cd /opt/bedrock_tweaks/files_dev && git reset --hard && git clean -fd && git pull ${{ secrets.REPOSITORY_DEV_URL }}
+
       - name: Output job status
         id: job-status
         if: ${{ always() }}

CONTRIBUTING.md

@@ -79,13 +79,20 @@ JSON UI must follow [Bedrock Wiki JSON UI Best Practices](https://wiki.bedrock.d
 
 ### Pack Priority
 
-Packs in the packs.json are ordered by priority, the higher the pack the higher the priority.
+Packs in the packs.json are ordered by priority, the higher in the json object the pack is, the higher the priority it has.
 
 `alternate_block_destruction >>> black_nether_bricks >>> lush_grass_all_round`
 
+We can override this priority by adding a priority key in the pack.
+Ex: colorful_slimes packs should have more priority than sticky_piston_sides so the sticky piston side texture from the colored slimes 
+packs is used instead of texture from the sticky piston sides pack.
+
 The pack generator will add the packs to the generated file by priority order. If a file already exists, the generator will skip it to not
 add the same file again.
 
+Default priority is 0
+
+
 ### pack_icon.png
 
 You can find in /templates a template with just the border to override on top of the vanilla tweaks icon, and a full template for new packs
@@ -277,9 +284,10 @@ export interface Pack {
   description: string;
   message?: Message;
   version?: string; // * only Addons and CT
+  priority?: number; // Higher number, higher priority
 }
 
-/*
+/**
  * Pack Version is a string as follows: "<minecraft_version> - <pack_version>"
  * minecraft_version is the minimum major version of the game the pack is compatible with
  * pack_version is the version of the pack for that minecraft update, each mc update it resets
@@ -305,6 +313,11 @@ export interface DeepMergeFile {
 }
 ```
 
+## Development Environment
+
+There is a development environment pointing to the devel branch in https://dev.bedrocktweaks.net/api/docs
+You can test there the packs, combinations and backend changes before they are published to the main site
+
 ## Reporting Issues
 
 Before opening a new issue, please check if there is already an existing issue that addresses your problem in

crafting_tweaks/packs.json

@@ -13,73 +13,73 @@
 				{
 					"id": "back_to_blocks",
 					"name": "Back to Blocks",
-					"description": "Allows you to craft full blocks from stairs and slabs.",
+					"description": "Allows you to craft full blocks from stairs and slabs",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "double_slabs",
 					"name": "Double Slabs",
-					"description": "Allows you to craft 2 slabs from a single block.",
-					"version": "1.20 - 1.0.0"
+					"description": "Allows you to craft 2 slabs from a single block",
+					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "dropper_to_dispenser",
 					"name": "Dropper to Dispenser",
-					"description": "Allows you to convert a Dropper to a Dispenser using a Bow, or by using String and Sticks.",
+					"description": "Allows you to convert a Dropper to a Dispenser using a Bow, or by using String and Sticks",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "rotten_flesh_to_leather",
 					"name": "Rotten Flesh to Leather",
-					"description": "Allows you to smelt Rotten Flesh into Leather in Furnaces, Smokers or Campfires.",
+					"description": "Allows you to smelt Rotten Flesh into Leather",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "copper_powered_rails",
 					"name": "Copper Powered Rails",
-					"description": "Lets you craft powered rails from copper. (But you can still craft them from gold!)",
+					"description": "Lets you craft powered rails from copper (But you can still craft them from gold!)",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "charcoal_to_black_dye",
 					"name": "Charcoal to Black Dye",
-					"description": "Allows you to craft Charcoal into Black Dye.",
+					"description": "Allows you to craft Charcoal into Black Dye",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "coal_to_black_dye",
 					"name": "Coal to Black Dye",
-					"description": "Allows you to craft Coal into Black Dye.",
+					"description": "Allows you to craft Coal into Black Dye",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "sandstone_dyeing",
 					"name": "Sandstone Dyeing",
-					"description": "Allows you to craft Sandstone with Red Dye to get Red Sandstone.",
+					"description": "Allows you to craft Sandstone with Red Dye to get Red Sandstone",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "universal_dyeing",
 					"name": "Universal Dyeing",
-					"description": "Allows you to dye any dyeable block to another color, no matter what color it is (does not include, Concrete, Candles or Glazed Terracotta).",
+					"description": "Allows you to dye any dyeable block to another color, no matter what color it is (does not include, Concrete, Candles or Glazed Terracotta)",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "straight_to_shapeless",
 					"name": "Straight to Shapeless",
-					"description": "Craft items such as Paper, Bread and Shulker Boxes directly in your 2x2.",
+					"description": "Craft items such as Paper, Bread and Shulker Boxes directly in your 2x2",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "alternate_cobblestone",
 					"name": "Alternate Cobblestone",
-					"description": "Craft all items that require Cobblestone, using Blackstone or Cobbled Deepslate.",
+					"description": "Craft all items that require Cobblestone, using Blackstone or Cobbled Deepslate",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "powder_to_glass",
 					"name": "Powder to Glass",
-					"description": "Smelt all colors of Concrete Powder into their respective Stained Glass color.",
+					"description": "Smelt all colors of Concrete Powder into their respective Stained Glass color",
 					"version": "1.21 - 1.0.0"
 				}
 			]
@@ -91,25 +91,25 @@
 				{
 					"id": "more_trapdoors",
 					"name": "More Trapdoors",
-					"description": "Creates 12 Trapdoors instead of 2.",
+					"description": "Creates 12 Trapdoors instead of 2",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "more_bark",
 					"name": "More Bark",
-					"description": "Creates 4 Bark instead of 3.",
+					"description": "Creates 4 Bark instead of 3",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "more_stairs",
 					"name": "More Stairs",
-					"description": "Creates 8 Stairs instead of 4.",
+					"description": "Creates 8 Stairs instead of 4",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "more_bricks",
 					"name": "More Bricks",
-					"description": "Creates 4 Bricks, Nether Bricks and Red Nether Bricks instead of 1.",
+					"description": "Creates 4 Bricks, Nether Bricks and Red Nether Bricks instead of 1",
 					"version": "1.21 - 1.0.0"
 				}
 			]
@@ -121,43 +121,43 @@
 				{
 					"id": "craftable_gravel",
 					"name": "Craftable Gravel",
-					"description": "Allows you to craft Gravel from Flint.",
+					"description": "Allows you to craft Gravel from Flint",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_horse_armor",
 					"name": "Craftable Horse Armor",
-					"description": "Allows you to craft Horse Armor.",
+					"description": "Allows you to craft Horse Armor",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_coral_blocks_2x2",
 					"name": "Craftable Coral Blocks 2x2",
-					"description": "Allows you to craft Coral Blocks and their dead variants from their Coral Plant or Coral Tube in a 2x2. Tubes and Fans are not interchangeable.",
+					"description": "Allows you to craft Coral Blocks and their dead variants from their Coral Plant or Coral Tube in a 2x2. Tubes and Fans are not interchangeable",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_coral_blocks_3x3",
 					"name": "Craftable Coral Blocks 3x3",
-					"description": "Allows you to craft Coral Blocks and their dead variants from their Coral Plant or Coral Tube in a 3x3. Tubes and Fans are not interchangeable.",
+					"description": "Allows you to craft Coral Blocks and their dead variants from their Coral Plant or Coral Tube in a 3x3. Tubes and Fans are not interchangeable",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_enchanted_golden_apple",
 					"name": "Craftable Enchanted Golden Apple",
-					"description": "Allows you to craft Enchanted Golden Apples.",
+					"description": "Allows you to craft Enchanted Golden Apples",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_name_tags",
 					"name": "Craftable Name Tags",
-					"description": "Allows you to craft Name Tags.",
+					"description": "Allows you to craft Name Tags",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "craftable_blackstone",
 					"name": "Craftable Blackstone",
-					"description": "Allows you to craft Blackstone or Polished Blackstone, using Basalt & Coal/Charcoal.",
+					"description": "Allows you to craft Blackstone or Polished Blackstone, using Basalt & Coal/Charcoal",
 					"version": "1.21 - 1.0.0"
 				}
 			]
@@ -169,30 +169,30 @@
 				{
 					"id": "unpackable_ice",
 					"name": "Unpackable Ice",
-					"description": "Allows you to break down Ice into 9 pieces. 1 Blue Ice to 9 Packed Ice to 81 Ice.",
+					"description": "Allows you to break down Ice into 9 pieces. 1 Blue Ice to 9 Packed Ice to 81 Ice",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "unpackable_nether_wart",
 					"name": "Unpackable Nether Wart",
-					"description": "Allows you to break down Nether Wart Blocks into 9 Nether Wart.",
+					"description": "Allows you to break down Nether Wart Blocks into 9 Nether Wart",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "unpackable_wool",
 					"name": "Unpackable Wool",
-					"description": "Allows you to break down Wool into 4 String.",
+					"description": "Allows you to break down Wool into 4 String",
 					"version": "1.21 - 1.0.0"
 				},
 				{
 					"id": "unpackable_magma",
 					"name": "Unpackable Magma",
-					"description": "Allows you to break down Magma Blocks into 4 Magma Creams.",
+					"description": "Allows you to break down Magma Blocks into 4 Magma Creams",
 					"version": "1.21 - 1.0.0"
 				}
 			]
 		}
 	],
 	"combinations": [],
 	"deepMergeFiles": []
-}
+}

resource_packs/extras/dirt/golden_savanna_grass_sides/textures/terrain_texture.json

@@ -1,7 +1,8 @@
 {
-	"num_mip_levels": 4,
-	"padding": 8,
 	"resource_pack_name": "vanilla",
+	"texture_name": "atlas.terrain",
+	"padding": 8,
+	"num_mip_levels": 4,
 	"texture_data": {
 		"grass_side_bt": {
 			"textures": [
@@ -72,6 +73,5 @@
 				"textures/blocks/grass_side_snowed"
 			]
 		}
-	},
-	"texture_name": "atlas.terrain"
-}
+	}
+}

resource_packs/extras/dirt/golden_savanna_lush_grass/textures/terrain_texture.json

@@ -74,4 +74,4 @@
 			]
 		}
 	}
-}
+}