Merge branch 'master' into 'MC-005'

Master to MC-005

See merge request Dandellion/minecraft-datapacks!3

.gitlab-ci.yml

@@ -4,17 +4,32 @@
 # you can delete this line if you're not using Docker
 image: alpine:latest
 
-before_script:
-  - apk add --no-cache zip
-
-after_script:
-  - ls
-
 build:
   stage: build
   script:
+    - apk add --no-cache zip
     - mkdir out
-    - find . -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I {} zip -r out/{} {}
+    - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .'
   artifacts:
     paths:
       - ./out
+      
+deploy:
+  stage: deploy
+  script:
+    - 'which ssh-agent || ( apk add --no-cache openssh-client )'
+    - apk add --no-cache rsync
+    
+    - eval $(ssh-agent -s)
+    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
+    
+    - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit
+    
+    - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload"
+  only:
+    - master
+  when: manual

MC-001_disable_vanilla/data/minecraft/recipes/stone_slab.json

@@ -1 +0,0 @@
-{}

MC-001_disable_vanilla/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-	"pack": {
-		"pack_format": 1,
-		"description": "MC-001, disables vanilla stone to smooth stone slabs"
-	}
-}

README.md

@@ -1,3 +1,14 @@
 # Minecraft Datapacks
 
 Datapacks for minecraft
+
+## Steps to change datapacks
+
+Fixes can go straight to master, all other changes are to be done like the following:
+
+1. Write up a proposal for what to change as an issue
+2. Get feedback
+3. Branch from master and add/change datapacks needed to fix in that branch.
+4. TEST
+5. Enter final comment period for the MC, no major changes unless its a really good idea
+6. merge to master

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:lapis_lazuli"

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:cocoa_beans"

dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:cyan_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:gray_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:cactus_green"

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:lapis_lazuli"

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:gray_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:lime_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:magenta_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:orange_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:pink_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:purple_dye"

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:rose_red"

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:bone_meal"

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json

@@ -1,8 +1,8 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "dodsorfas_recolor:wool"
+            "tag": "minecraft:wool"
         },
         {
             "item": "minecraft:dandelion_yellow"

dodsorfas_colors/data/dodsorfas_recolor/tags/items/wool.json

@@ -1,21 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "minecraft:white_wool",
-    "minecraft:orange_wool",
-    "minecraft:magenta_wool",
-    "minecraft:light_blue_wool",
-    "minecraft:yellow_wool",
-    "minecraft:lime_wool",
-    "minecraft:pink_wool",
-    "minecraft:gray_wool",
-    "minecraft:light_gray_wool",
-    "minecraft:cyan_wool",
-    "minecraft:purple_wool",
-    "minecraft:blue_wool",
-    "minecraft:brown_wool",
-    "minecraft:green_wool",
-    "minecraft:red_wool",
-    "minecraft:black_wool"
-  ]
-}