add wandering_trader

MC-12A Bats

Closes #12

See merge request dodsorfas/minecraft-datapacks!11

.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 -avz out/ "$SERVER_HOST":"$WPD_FOLDER/world/datapacks" --delete --checksum --exclude bukkit
+
     - ssh "$SERVER_HOST" mcrcon -H localhost -p minecraft "minecraft:reload"
+  needs:
+    - build:datapacks
+    
   only:
-    - master
+    refs:
-  when: manual
+      - 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/bat_bembranes_1-0/data/minecraft/loot_tables/entities/bat.json

@@ -0,0 +1,43 @@
+{
+  "type": "minecraft:entity",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "min": 0.0,
+                "max": 1.0,
+                "type": "minecraft:uniform"
+              }
+            },
+            {
+              "function": "minecraft:looting_enchant",
+              "count": {
+                "min": 0.0,
+                "max": 1.0
+              }
+            },
+			{
+			  "function": "minecraft:set_name",
+			  "name": {
+				"text": "Bat Membrane",
+				"italic": "false"
+			  }
+			}			
+          ],
+          "name": "minecraft:phantom_membrane"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:killed_by_player"
+        }
+      ]
+    }
+  ]
+}

datapacks/bat_bembranes_1-0/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 3,
+    "description": "Bats drop membranes, they also have wings you know."
+  }
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/castle.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Storm The  Gates"
+        },
+        "description": {
+            "text": "Find Ricksters Castle at spawn"
+        },
+        "icon": {
+            "item": "minecraft:nether_brick_stairs"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "castle": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -65,
+                        "max": -3
+                    },
+                    "y": {
+                        "min": 68,
+                        "max": 115
+                    },
+                    "z": {
+                        "min": -97,
+                        "max": -25
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/csybr.json

@@ -0,0 +1,41 @@
+{
+    "display": {
+        "title": {
+            "text": "tz'apaja",
+            "obfuscated": true
+        },
+        "description": {
+            "text": "Find csybr's base (be sure to leave a sign!)"
+        },
+        "icon": {
+            "item": "minecraft:smooth_stone_slab"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -190,
+                        "max": 18
+                    },
+                    "y": {
+                        "min": 184,
+                        "max": 255
+                    },
+                    "z": {
+                        "min": -495,
+                        "max": -352
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/csybr_fall.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "A fall from grace"
+        },
+        "description": {
+            "text": "Commemorate the longest fall of cyber"
+        },
+        "icon": {
+            "item": "minecraft:elytra"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "fall_csybr": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -105,
+                        "max": -101
+                    },
+                    "y": {
+                        "min": 71,
+                        "max": 78
+                    },
+                    "z": {
+                        "min": -238,
+                        "max": -234
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:forskern"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/dan.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Gods Domain"
+        },
+        "description": {
+            "text": "Find Dans Base"
+        },
+        "icon": {
+            "item": "minecraft:redstone"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "dan": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 43,
+                        "max": 156
+                    },
+                    "y": {
+                        "min": 97,
+                        "max": 183
+                    },
+                    "z": {
+                        "min": -305,
+                        "max": -221
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/dansbrain.json

@@ -0,0 +1,39 @@
+{
+    "display": {
+        "title": {
+            "text": "What's on your mind?",
+            "color": "light_purple",
+            "italic": true,
+            "underlined": false,
+            "strikethrough": false,
+            "obfuscated": false
+        },
+        "description": {
+            "text": "Get the first piece of map art on the server"
+        },
+        "icon": {
+            "item": "minecraft:painting"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "criteria": {
+        "has_item": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "minecraft:filled_map",
+                        "nbt": "{\"map\": 208}",
+                        "count": {
+                            "min": 1,
+                            "max": 1
+                        }
+                    }
+                ]
+            }
+        }
+    }
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/donce_base.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Ruins of Dee"
+        },
+        "description": {
+            "text": "Find Donce's shortlived base"
+        },
+        "icon": {
+            "item": "minecraft:oak_fence"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "donce_old_base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -27,
+                        "max": 10
+                    },
+                    "y": {
+                        "min": 144,
+                        "max": 173
+                    },
+                    "z": {
+                        "min": -639,
+                        "max": -608
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/forskern.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Forskern"
+        },
+        "description": {
+            "text": "Find Forksernville"
+        },
+        "icon": {
+            "item": "minecraft:grass_path"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "forskern": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -216,
+                        "max": 62
+                    },
+                    "y": {
+                        "min": 60,
+                        "max": 255
+                    },
+                    "z": {
+                        "min": -299,
+                        "max": -165
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/henrikfort.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Fort Bastian"
+        },
+        "description": {
+            "text": "Find Rickster's base"
+        },
+        "icon": {
+            "item": "minecraft:stone_bricks"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 34,
+                        "max": 178
+                    },
+                    "y": {
+                        "min": 154,
+                        "max": 220
+                    },
+                    "z": {
+                        "min": -572,
+                        "max": -407
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/hobbit.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "The Shire"
+        },
+        "description": {
+            "text": "Find The Hobbithowl"
+        },
+        "icon": {
+            "item": "minecraft:stone"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "criteria": {
+        "hobbit": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 228,
+                        "max": 253
+                    },
+                    "y": {
+                        "min": 64,
+                        "max": 72
+                    },
+                    "z": {
+                        "min": 156,
+                        "max": 176
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/japan.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Ze Home of Anime"
+        },
+        "description": {
+            "text": "Find Japan and it's great wall"
+        },
+        "icon": {
+            "item": "minecraft:cobblestone_wall"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "japan": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -353,
+                        "max": -83
+                    },
+                    "y": {
+                        "min": 63,
+                        "max": 173
+                    },
+                    "z": {
+                        "min": -167,
+                        "max": -20
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/joa1.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "The Ruins of Pet"
+        },
+        "description": {
+            "text": "Find Joakim's first base, if you can call it that"
+        },
+        "icon": {
+            "item": "minecraft:dirt"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "place": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 163,
+                        "max": 180
+                    },
+                    "y": {
+                        "min": 75,
+                        "max": 105
+                    },
+                    "z": {
+                        "min": -366,
+                        "max": -305
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/littlenewgarden.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "LittleExGarden"
+        },
+        "description": {
+            "text": "</3"
+        },
+        "icon": {
+            "item": "minecraft:arrow"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "bae": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 16,
+                        "max": 35
+                    },
+                    "y": {
+                        "min": 62,
+                        "max": 69
+                    },
+                    "z": {
+                        "min": -386,
+                        "max": -344
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/marthine.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Hello Friend!"
+        },
+        "description": {
+            "text": "Find Marthines Base"
+        },
+        "icon": {
+            "item": "minecraft:red_wool"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "main": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -65,
+                        "max": 12
+                    },
+                    "y": {
+                        "min": 54,
+                        "max": 120
+                    },
+                    "z": {
+                        "min": -330,
+                        "max": -219
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/marthine_castle.json

@@ -0,0 +1,41 @@
+{
+    "display": {
+        "title": {
+            "text": "I Placed That Where?",
+            "italic": true
+        },
+        "description": {
+            "text": "Find Marthines Castle"
+        },
+        "icon": {
+            "item": "minecraft:diorite"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "marthine_castle": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 57,
+                        "max": 138
+                    },
+                    "y": {
+                        "min": 58,
+                        "max": 105
+                    },
+                    "z": {
+                        "min": -190,
+                        "max": -140
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/marthine_secret.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Safehouse"
+        },
+        "description": {
+            "text": "Find the safehouse"
+        },
+        "icon": {
+            "item": "minecraft:stone"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "criteria": {
+        "secret": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -60,
+                        "max": -8
+                    },
+                    "y": {
+                        "min": 38,
+                        "max": 55
+                    },
+                    "z": {
+                        "min": -257,
+                        "max": -241
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:marthine"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/marthine_tunnel.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "A Secret Tunnel"
+        },
+        "description": {
+            "text": "Description"
+        },
+        "icon": {
+            "item": "minecraft:water_bucket"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "criteria": {
+        "tunnel": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -17,
+                        "max": 285
+                    },
+                    "y": {
+                        "min": 30,
+                        "max": 34
+                    },
+                    "z": {
+                        "min": -250,
+                        "max": -248
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/mystery1.json

@@ -0,0 +1,60 @@
+{
+    "display": {
+        "title": {
+            "text": "Who Lives here?"
+        },
+        "description": {
+            "text": "Find a mystery building"
+        },
+        "icon": {
+            "item": "minecraft:stone"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": true
+    },
+    "criteria": {
+        "mystery1": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 174,
+                        "max": 190
+                    },
+                    "y": {
+                        "min": 60,
+                        "max": 68
+                    },
+                    "z": {
+                        "min": -11,
+                        "max": -2
+                    }
+                }
+            }
+        },
+        "mystery2": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 243,
+                        "max": 257
+                    },
+                    "y": {
+                        "min": 62,
+                        "max": 73
+                    },
+                    "z": {
+                        "min": 144,
+                        "max": 153
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/nanu.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Vanu Sovereignty"
+        },
+        "description": {
+            "text": "Wait wrong game (find nanus base)"
+        },
+        "icon": {
+            "item": "minecraft:cobblestone"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -227,
+                        "max": -146
+                    },
+                    "y": {
+                        "min": 111,
+                        "max": 130
+                    },
+                    "z": {
+                        "min": -226,
+                        "max": -153
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/root.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "Welcome"
+        },
+        "description": {
+            "text": "Find Blackbog"
+        },
+        "icon": {
+            "item": "minecraft:grass_block"
+        },
+        "frame": "challenge",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false,
+        "background": "minecraft:textures/gui/advancements/backgrounds/stone.png"
+    },
+    "criteria": {
+        "blackbog": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -18,
+                        "max": 28
+                    },
+                    "y": {
+                        "min": 63,
+                        "max": 63
+                    },
+                    "z": {
+                        "min": -37,
+                        "max": 16
+                    }
+                }
+            }
+        }
+    }
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/tilde.json

@@ -0,0 +1,41 @@
+{
+    "display": {
+        "title": {
+            "text": "Nether Lite",
+            "color": "dark_red"
+        },
+        "description": {
+            "text": "Find Tildes base"
+        },
+        "icon": {
+            "item": "minecraft:glass"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 79,
+                        "max": 129
+                    },
+                    "y": {
+                        "min": 76,
+                        "max": 104
+                    },
+                    "z": {
+                        "min": -423,
+                        "max": -336
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/vb_base.json

@@ -0,0 +1,41 @@
+{
+    "display": {
+        "title": {
+            "text": "Woodbear",
+            "color": "white"
+        },
+        "description": {
+            "text": "Find vebjørns wacky mansion"
+        },
+        "icon": {
+            "item": "minecraft:oak_wood"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "base": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": -146,
+                        "max": -118
+                    },
+                    "y": {
+                        "min": 84,
+                        "max": 166
+                    },
+                    "z": {
+                        "min": -298,
+                        "max": -265
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:forskern"
+}

datapacks/dodsorfas_advancements/data/adventure/advancements/william.json

@@ -0,0 +1,40 @@
+{
+    "display": {
+        "title": {
+            "text": "First!"
+        },
+        "description": {
+            "text": "Find Williams base"
+        },
+        "icon": {
+            "item": "minecraft:ladder"
+        },
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true,
+        "hidden": false
+    },
+    "criteria": {
+        "william": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "overworld",
+                "position": {
+                    "x": {
+                        "min": 343,
+                        "max": 372
+                    },
+                    "y": {
+                        "min": 78,
+                        "max": 164
+                    },
+                    "z": {
+                        "min": 146,
+                        "max": 188
+                    }
+                }
+            }
+        }
+    },
+    "parent": "adventure:root"
+}

datapacks/dodsorfas_advancements/pack.mcmeta

@@ -0,0 +1 @@
+{"pack":{"pack_format":1,"description":"Generated with TheDestruc7i0n's advancements generator: https://advancements.thedestruc7i0n.ca"}}

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
     }
-}
+}