Update ender_dragon.json

.gitlab-ci.yml

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/blue_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/brown_wool_improved.json

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

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_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_blue_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/light_gray_wool_improved.json

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

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_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/white_wool_improved.json

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

dodsorfas_colors/data/dodsorfas_recolor/recipes/yellow_wool_improved.json

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

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

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

dodsorfas_custom_loot/data/minecraft/loot_tables/empty.json

@@ -1 +1 @@
-{}
+{}

dodsorfas_custom_loot/data/minecraft/loot_tables/entities/dodsloot/ender_dragon.json

@@ -0,0 +1,14 @@
+{
+  "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "item",
+                    "name": "minecraft:elytra",
+                    "weight": 1
+                }
+            ]
+        }
+    ]
+}

dodsorfas_custom_loot/data/minecraft/loot_tables/entities/ender_dragon.json

@@ -0,0 +1,13 @@
+{
+    "pools": [
+        {
+            "rolls": 1,
+            "entries": [
+                {
+                    "type": "loot_table",
+                    "name": "minecraft:entities/dodsloot/ender_dragon"
+                }
+            ]
+        }
+    ]
+}

dodsorfas_custom_loot/data/minecraft/loot_tables/entities/shulker.json

@@ -1,37 +0,0 @@
-{
-    "pools": [
-        {
-            "rolls": 1,
-            "conditions": [
-                {
-                    "condition": "random_chance_with_looting",
-                    "chance": 0.5,
-                    "looting_multiplier": 0.0625
-                }
-            ],
-            "entries": [
-                {
-                    "type": "item",
-                    "weight": 1,
-                    "name": "minecraft:shulker_shell"
-                }
-            ]
-        },
-        {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "item",
-                    "weight": 1,
-                    "name": "minecraft:shulker_shell",
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": 1
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

dodsorfas_custom_loot/pack.mcmeta

@@ -1,6 +1,6 @@
 {
 	"pack": {
 		"pack_format": 1,
-		"description": "Dodsorfas Data Pack for custom loot"
+		"description": "Dodsorfas Data Pack for custom mob loot"
 	}
-}
+}