Update ender_dragon.json

.gitlab-ci.yml

@@ -2,146 +2,19 @@
 # see https://docs.gitlab.com/ce/ci/yaml/README.html for all available options
 
 # you can delete this line if you're not using Docker
-image: bash:latest
+image: alpine:latest
 
-stages:
+before_script:
-  - build
+  - apk add --no-cache zip
-  - test
-  - deploy
-  - restart
 
-build:datapacks:
+after_script:
+  - ls
+
+build:
   stage: build
   script:
-    - apk add --no-cache zip
-    - cd datapacks
     - mkdir out
     - find -maxdepth 1 -type d -not -name ".git" -not -name "out" -not -name "." | xargs -I '{}' sh -c 'cd {} && zip -r ../out/{} .'
-
   artifacts:
     paths:
-      - ./datapacks/out
+      - ./out
-  only:
-    changes:
-      - datapacks/**/*
-      - datapacks/*
-      - .gitlab-ci.yml
-
-build:resourcepack:
-  stage: build
-  script:
-    - apk add --no-cache zip
-
-    - cd resourcepack
-    - mkdir -p ../resourcepack-out
-    - zip -r ../resourcepack-out/resourcepack .
-
-  artifacts:
-    paths:
-      - ./resourcepack-out
-  only:
-    changes:
-      - resourcepack/**/*
-      - resourcepack/*
-      - .gitlab-ci.yml
-      
-deploy:datapacks:
-  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
-    
-    - cd datapacks
-    - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER/world/datapacks" --delete --exclude bukkit
-
-    - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload"
-  needs:
-    - build:datapacks
-    
-  only:
-    refs:
-      - master
-    changes:
-      - datapacks/**/*
-      - datapacks/*
-      - .gitlab-ci.yml
-      
-deploy:resourcepack:
-  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
-    
-    - cd resourcepack-out
-    - SHASUM=$(sha1sum resourcepack.zip | awk '{ print $1 }')
-    - ssh "$SERVER_HOST" sed -i "s/resource-pack-sha1=.*/resource-pack-sha1=$SHASUM/" "$WPD_FOLDER/server.properties"
-  needs:
-    - build:resourcepack
-  only:
-    refs:
-      - master
-    changes:
-      - resourcepack/**/*
-      - resourcepack/*
-      - .gitlab-ci.yml
-      
-pages:
-  stage: deploy
-  script:
-  - mkdir public
-  - mv resourcepack-out/resourcepack.zip public/dodsorfas_resources.zip
-  artifacts:
-    paths:
-    - public
-  only:
-    refs:
-      - master
-    changes:
-      - resourcepack/**/*
-      - resourcepack/*
-      - .gitlab-ci.yml
-  needs:
-    - build:resourcepack
-
-
-
-restart:
-  stage: restart
-  
-  script:
-    - echo RESTARTING
-    - 'which ssh-agent || ( apk add --no-cache openssh-client )'
-    
-    - 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
-
-    - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "save-all restart"
-    
-  only:
-    refs:
-      - master
-    changes:
-      - resourcepack/**/*
-      - resourcepack/*
-      - .gitlab-ci.yml
-  needs:
-    - deploy:resourcepack
-    - deploy:datapacks

1ps-1516729816-1/data/1ps/functions/internal_loop.mcfunction

@@ -1,3 +1,3 @@
+time add 125
 execute as @a[nbt={SleepTimer:1s}] run tellraw @a [{"selector":"@s","color":"yellow"},{"text":" is now sleeping ","color":"yellow"}]
-execute as @a[nbt={SleepTimer:99s}] run function 1ps:skipday
+execute if entity @a[nbt={SleepTimer:99s}] run weather clear 0
-execute if entity @a[nbt={SleepTimer:100s}] run weather clear 0

1ps-1516729816-1/data/1ps/functions/loop.mcfunction

@@ -0,0 +1 @@
+execute if entity @a[nbt={Sleeping:1b}] run function 1ps:internal_loop

datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction

@@ -1 +0,0 @@
-scoreboard objectives add 1ps.dayTimer dummy

datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction

@@ -1 +0,0 @@
-execute if entity @a[nbt=!{SleepTimer:0s}] run function 1ps:internal_loop

datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction

@@ -1,34 +0,0 @@
-execute store result score @s 1ps.dayTimer run time query daytime
-
-scoreboard players remove @s 1ps.dayTimer 24000
-
-execute if entity @s[scores={1ps.dayTimer=..-16384}] run time add 16384
-execute if entity @s[scores={1ps.dayTimer=..-16384}] run scoreboard players add @s 1ps.dayTimer 16384
-execute if entity @s[scores={1ps.dayTimer=..-8192}] run time add 8192
-execute if entity @s[scores={1ps.dayTimer=..-8192}] run scoreboard players add @s 1ps.dayTimer 8192
-execute if entity @s[scores={1ps.dayTimer=..-4096}] run time add 4096
-execute if entity @s[scores={1ps.dayTimer=..-4096}] run scoreboard players add @s 1ps.dayTimer 4096
-execute if entity @s[scores={1ps.dayTimer=..-2048}] run time add 2048
-execute if entity @s[scores={1ps.dayTimer=..-2048}] run scoreboard players add @s 1ps.dayTimer 2048
-execute if entity @s[scores={1ps.dayTimer=..-1024}] run time add 1024
-execute if entity @s[scores={1ps.dayTimer=..-1024}] run scoreboard players add @s 1ps.dayTimer 1024
-execute if entity @s[scores={1ps.dayTimer=..-512}] run time add 512
-execute if entity @s[scores={1ps.dayTimer=..-512}] run scoreboard players add @s 1ps.dayTimer 512
-execute if entity @s[scores={1ps.dayTimer=..-256}] run time add 256
-execute if entity @s[scores={1ps.dayTimer=..-256}] run scoreboard players add @s 1ps.dayTimer 256
-execute if entity @s[scores={1ps.dayTimer=..-128}] run time add 128
-execute if entity @s[scores={1ps.dayTimer=..-128}] run scoreboard players add @s 1ps.dayTimer 128
-execute if entity @s[scores={1ps.dayTimer=..-64}] run time add 64
-execute if entity @s[scores={1ps.dayTimer=..-64}] run scoreboard players add @s 1ps.dayTimer 64
-execute if entity @s[scores={1ps.dayTimer=..-32}] run time add 32
-execute if entity @s[scores={1ps.dayTimer=..-32}] run scoreboard players add @s 1ps.dayTimer 32
-execute if entity @s[scores={1ps.dayTimer=..-16}] run time add 16
-execute if entity @s[scores={1ps.dayTimer=..-16}] run scoreboard players add @s 1ps.dayTimer 16
-execute if entity @s[scores={1ps.dayTimer=..-8}] run time add 8
-execute if entity @s[scores={1ps.dayTimer=..-8}] run scoreboard players add @s 1ps.dayTimer 8
-execute if entity @s[scores={1ps.dayTimer=..-4}] run time add 4
-execute if entity @s[scores={1ps.dayTimer=..-4}] run scoreboard players add @s 1ps.dayTimer 4
-execute if entity @s[scores={1ps.dayTimer=..-2}] run time add 2
-execute if entity @s[scores={1ps.dayTimer=..-2}] run scoreboard players add @s 1ps.dayTimer 2
-execute if entity @s[scores={1ps.dayTimer=..-1}] run time add 1
-execute if entity @s[scores={1ps.dayTimer=..-1}] run scoreboard players add @s 1ps.dayTimer 1

datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json

@@ -1,4 +0,0 @@
-{
-	"replace": false,
-	"values": ["1ps:load"]
-}

datapacks/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shapeless",
-    "ingredients": [
-        {
-            "tag": "minecraft:wool"
-        },
-        {
-            "item": "minecraft:light_blue_dye"
-        }
-    ],
-    "result": {
-        "item": "minecraft:light_blue_wool",
-        "count": 1
-    }
-}

datapacks/dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json

@@ -1,15 +0,0 @@
-{
-    "type": "crafting_shapeless",
-    "ingredients": [
-        {
-            "tag": "minecraft:wool"
-        },
-        {
-            "item": "minecraft:light_gray_dye"
-        }
-    ],
-    "result": {
-        "item": "minecraft:light_gray_wool",
-        "count": 1
-    }
-}

datapacks/dodsorfas_uncrafting/pack.mcmeta

@@ -1,6 +0,0 @@
-{
-	"pack": {
-		"pack_format": 1,
-		"description": "Dodsorfas Data Pack for uncrafting"
-	}
-}

dodsorfas_colors/data/dodsorfas_recolor/recipes/black_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:black_dye"
+            "item": "minecraft:ink_sac"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/black_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:black_dye"
+            "item": "minecraft:ink_sac"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/black_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:black_dye"
+            "item": "minecraft:ink_sac"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/black_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:black_dye"
+            "item": "minecraft:ink_sac"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/black_wool_improved.json

@@ -2,10 +2,10 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:black_dye"
+            "item": "minecraft:ink_sac"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:blue_dye"
+            "item": "minecraft:lapis_lazuli"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:brown_dye"
+            "item": "minecraft:cocoa_beans"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:brown_dye"
+            "item": "minecraft:cocoa_beans"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:brown_dye"
+            "item": "minecraft:cocoa_beans"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:brown_dye"
+            "item": "minecraft:cocoa_beans"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:brown_dye"
+            "item": "minecraft:cocoa_beans"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/cyan_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/gray_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:green_dye"
+            "item": "minecraft:cactus_green"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:green_dye"
+            "item": "minecraft:cactus_green"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:green_dye"
+            "item": "minecraft:cactus_green"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:green_dye"
+            "item": "minecraft:cactus_green"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/green_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:green_dye"
+            "item": "minecraft:cactus_green"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:light_blue_dye"
+            "item": "minecraft:lapis_lazuli"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"
@@ -30,7 +30,7 @@
         }
     ],
     "result": {
-        "item": "minecraft:light_blue_concrete_powder",
+        "item": "minecraft:blue_concrete_powder",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_stained_clay_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:light_blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {
-        "item": "minecraft:light_blue_terracotta",
+        "item": "minecraft:blue_terracotta",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_stained_glass_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:light_blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {
-        "item": "minecraft:light_blue_stained_glass",
+        "item": "minecraft:blue_stained_glass",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_stained_glass_pane_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:light_blue_dye"
+            "item": "minecraft:lapis_lazuli"
         }
     },
     "result": {
-        "item": "minecraft:light_blue_stained_glass_pane",
+        "item": "minecraft:blue_stained_glass_pane",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json

@@ -0,0 +1,15 @@
+{
+    "type": "crafting_shapeless",
+    "ingredients": [
+        {
+            "tag": "dodsorfas_recolor:wool"
+        },
+        {
+            "item": "minecraft:lapis_lazuli"
+        }
+    ],
+    "result": {
+        "item": "minecraft:blue_wool",
+        "count": 1
+    }
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:light_gray_dye"
+            "item": "minecraft:gray_dye"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"
@@ -30,7 +30,7 @@
         }
     ],
     "result": {
-        "item": "minecraft:light_gray_concrete_powder",
+        "item": "minecraft:gray_concrete_powder",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_stained_clay_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:light_gray_dye"
+            "item": "minecraft:gray_dye"
         }
     },
     "result": {
-        "item": "minecraft:light_gray_terracotta",
+        "item": "minecraft:gray_terracotta",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_stained_glass_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:light_gray_dye"
+            "item": "minecraft:gray_dye"
         }
     },
     "result": {
-        "item": "minecraft:light_gray_stained_glass",
+        "item": "minecraft:gray_stained_glass",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_stained_glass_pane_improved.json

@@ -10,11 +10,11 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:light_gray_dye"
+            "item": "minecraft:gray_dye"
         }
     },
     "result": {
-        "item": "minecraft:light_gray_stained_glass_pane",
+        "item": "minecraft:gray_stained_glass_pane",
         "count": 8
     }
-}
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json

@@ -0,0 +1,15 @@
+{
+    "type": "crafting_shapeless",
+    "ingredients": [
+        {
+            "tag": "dodsorfas_recolor:wool"
+        },
+        {
+            "item": "minecraft:gray_dye"
+        }
+    ],
+    "result": {
+        "item": "minecraft:gray_wool",
+        "count": 1
+    }
+}

dodsorfas_colors/data/dodsorfas_recolor/recipes/lime_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/magenta_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/orange_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/pink_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/purple_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:red_dye"
+            "item": "minecraft:rose_red"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:red_dye"
+            "item": "minecraft:rose_red"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:red_dye"
+            "item": "minecraft:rose_red"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:red_dye"
+            "item": "minecraft:rose_red"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/red_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:red_dye"
+            "item": "minecraft:rose_red"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:white_dye"
+            "item": "minecraft:bone_meal"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:white_dye"
+            "item": "minecraft:bone_meal"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:white_dye"
+            "item": "minecraft:bone_meal"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:white_dye"
+            "item": "minecraft:bone_meal"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:white_dye"
+            "item": "minecraft:bone_meal"
         }
     ],
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_concrete_powder_improved.json

@@ -2,7 +2,7 @@
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "item": "minecraft:yellow_dye"
+            "item": "minecraft:dandelion_yellow"
         },
         {
             "tag": "dodsorfas_recolor:any_concrete_powder"

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_stained_clay_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_terracotta"
         },
         "P": {
-            "item": "minecraft:yellow_dye"
+            "item": "minecraft:dandelion_yellow"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_stained_glass_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass"
         },
         "P": {
-            "item": "minecraft:yellow_dye"
+            "item": "minecraft:dandelion_yellow"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_stained_glass_pane_improved.json

@@ -10,7 +10,7 @@
             "tag": "dodsorfas_recolor:any_glass_pane"
         },
         "P": {
-            "item": "minecraft:yellow_dye"
+            "item": "minecraft:dandelion_yellow"
         }
     },
     "result": {

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json

@@ -1,11 +1,11 @@
-{
+{
     "type": "crafting_shapeless",
     "ingredients": [
         {
-            "tag": "minecraft:wool"
+            "tag": "dodsorfas_recolor:wool"
         },
         {
-            "item": "minecraft:yellow_dye"
+            "item": "minecraft:dandelion_yellow"
         }
     ],
     "result": {