fix light variation in gray and blue dodsorfas recolor

MC-011: 1.14 beta textures 3.3

Closes #11

See merge request dodsorfas/minecraft-datapacks!7

.gitlab-ci.yml

@@ -2,19 +2,50 @@
 # 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: alpine:latest
+image: bash:latest
 
-build:
+stages:
+  - build
+  - test
+  - deploy
+  - restart
+
+build:datapacks:
   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:
-      - ./out
+      - ./datapacks/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:
+deploy:datapacks:
   stage: deploy
   script:
     - 'which ssh-agent || ( apk add --no-cache openssh-client )'
@@ -27,9 +58,90 @@ deploy:
     - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
     
-    - rsync --dry-run -avz out/ "$SERVER_HOST":"$WPD_FOLDER" --delete --exclude bukkit
-    
+    - 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:
-    - master
-  when: manual
+    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/loop.mcfunction

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

datapacks/1ps-1556049967/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 if entity @a[nbt={SleepTimer:99s}] run weather clear 0
+execute as @a[nbt={SleepTimer:99s}] run function 1ps:skipday
+execute if entity @a[nbt={SleepTimer:100s}] run weather clear 0

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

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

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

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

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

@@ -0,0 +1,34 @@
+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

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

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

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

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

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

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

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

datapacks/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:ink_sac"
+            "item": "minecraft:black_dye"
         }
     },
     "result": {

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

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

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

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

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

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

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

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

datapacks/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:lapis_lazuli"
+            "item": "minecraft:blue_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:lapis_lazuli"
+            "item": "minecraft:blue_dye"
         }
     ],
     "result": {

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

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

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

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

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

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

datapacks/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:cocoa_beans"
+            "item": "minecraft:brown_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:cocoa_beans"
+            "item": "minecraft:brown_dye"
         }
     ],
     "result": {

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

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

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

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

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

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

datapacks/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:cactus_green"
+            "item": "minecraft:green_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:cactus_green"
+            "item": "minecraft:green_dye"
         }
     ],
     "result": {

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

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

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

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

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

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

datapacks/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:lapis_lazuli"
+            "item": "minecraft:light_blue_dye"
         }
     },
     "result": {
-        "item": "minecraft:blue_stained_glass_pane",
+        "item": "minecraft:light_blue_stained_glass_pane",
         "count": 8
     }
-}
+}

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

@@ -5,11 +5,11 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:lapis_lazuli"
+            "item": "minecraft:light_blue_dye"
         }
     ],
     "result": {
-        "item": "minecraft:blue_wool",
+        "item": "minecraft:light_blue_wool",
         "count": 1
     }
-}
+}

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

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

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

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

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

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

datapacks/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:gray_dye"
+            "item": "minecraft:light_gray_dye"
         }
     },
     "result": {
-        "item": "minecraft:gray_stained_glass_pane",
+        "item": "minecraft:light_gray_stained_glass_pane",
         "count": 8
     }
-}
+}

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

@@ -5,11 +5,11 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:gray_dye"
+            "item": "minecraft:light_gray_dye"
         }
     ],
     "result": {
-        "item": "minecraft:gray_wool",
+        "item": "minecraft:light_gray_wool",
         "count": 1
     }
-}
+}

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

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

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

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

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

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

datapacks/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:rose_red"
+            "item": "minecraft:red_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:rose_red"
+            "item": "minecraft:red_dye"
         }
     ],
     "result": {

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

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

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

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

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

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

datapacks/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:bone_meal"
+            "item": "minecraft:white_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:bone_meal"
+            "item": "minecraft:white_dye"
         }
     ],
     "result": {

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

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

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

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

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

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

datapacks/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:dandelion_yellow"
+            "item": "minecraft:yellow_dye"
         }
     },
     "result": {

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

@@ -5,7 +5,7 @@
             "tag": "minecraft:wool"
         },
         {
-            "item": "minecraft:dandelion_yellow"
+            "item": "minecraft:yellow_dye"
         }
     ],
     "result": {