Updated to 10.5.6

PalaceInteractiveArchive · Mar 18, 2017 · 204317f · 204317f
1 parent 9978da9
commit 204317f
Show file tree

Hide file tree

Showing 129 changed files with 2,178 additions and 354 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,11 @@
-# USOResourcePack
-Palace Network Resource Pack - Universal Studios Orlando
+# Palace Network Universal Studios Resource Pack
+The official resource pack for Universal Studios Orlando on Palace Network
+
+# How to upload this pack
+1. Clone the repo to any folder on your desktop
+2. Compress the folder and make sure the name remains `USOResourcePack.zip`
+3. Upload the pack to `/var/www/html`
+4. Login to multicraft and open the control panel for USO
+5. Go to the section "Config Files" and open the `config.yml` with the location `plugins/MCMagicCore/config.yml`
+6. Edit the line `rpdl` to reflect the current path of the file on the server. Example: `/var/www/html/` => `https://palace.network/USOResourcePack`
+7. If logged you are currently logged into to USO, you will have to redownload the pack to see updated textures.
diff --git a/assets/minecraft/models/block/cobblestone.json b/assets/minecraft/models/block/cobblestone.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/cube_all",
+    "textures": {
+        "all": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_inventory.json b/assets/minecraft/models/block/cobblestone_wall_inventory.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_inventory",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_mossy_inventory.json b/assets/minecraft/models/block/cobblestone_wall_mossy_inventory.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_inventory",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_n.json b/assets/minecraft/models/block/cobblestone_wall_n.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_n",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_ne.json b/assets/minecraft/models/block/cobblestone_wall_ne.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ne",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_ns.json b/assets/minecraft/models/block/cobblestone_wall_ns.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_ns_above.json b/assets/minecraft/models/block/cobblestone_wall_ns_above.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns_above",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_nse.json b/assets/minecraft/models/block/cobblestone_wall_nse.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nse",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_nsew.json b/assets/minecraft/models/block/cobblestone_wall_nsew.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nsew",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_post.json b/assets/minecraft/models/block/cobblestone_wall_post.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_post",
+    "textures": {
+        "wall": "blocks/wool_colored_black"
+    }
+}
diff --git a/assets/minecraft/models/block/cobblestone_wall_postold.json b/assets/minecraft/models/block/cobblestone_wall_postold.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_post",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_n.json b/assets/minecraft/models/block/mossy_wall_n.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_n",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_ne.json b/assets/minecraft/models/block/mossy_wall_ne.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ne",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_ns.json b/assets/minecraft/models/block/mossy_wall_ns.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_ns_above.json b/assets/minecraft/models/block/mossy_wall_ns_above.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns_above",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_nse.json b/assets/minecraft/models/block/mossy_wall_nse.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nse",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_nsew.json b/assets/minecraft/models/block/mossy_wall_nsew.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nsew",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/block/mossy_wall_post.json b/assets/minecraft/models/block/mossy_wall_post.json
@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_post",
+    "textures": {
+        "wall": "blocks/cobblestone_mossy"
+    }
+}
diff --git a/assets/minecraft/models/item/arrow.json b/assets/minecraft/models/item/arrow.json
@@ -1,18 +1,6 @@
 {
-    "parent": "builtin/generated",
+    "parent": "item/generated",
     "textures": {
         "layer0": "items/arrow"
-    },
-    "display": {
-        "thirdperson": {
-            "rotation": [ -90, 0, 0 ],
-            "translation": [ 0, 1, -3 ],
-            "scale": [ 0.55, 0.55, 0.55 ]
-        },
-        "firstperson": {
-            "rotation": [ 0, -135, 25 ],
-            "translation": [ 0, 4, 2 ],
-            "scale": [ 1.7, 1.7, 1.7 ]
-        }
     }
 }
diff --git a/assets/minecraft/models/item/bow.json b/assets/minecraft/models/item/bow.json
@@ -1,18 +1,50 @@
 {
-    "parent": "builtin/generated",
+    "parent": "item/generated",
     "textures": {
         "layer0": "items/bow_standby"
     },
     "display": {
-        "thirdperson": {
-            "rotation": [ 5, -100, -45 ],
-            "translation": [ 0.75, 0, 0.25 ],
-            "scale": [ 1, 1, 1 ]
+        "thirdperson_righthand": {
+            "rotation": [ -80, 260, -40 ],
+            "translation": [ -1, -2, 2.5 ],
+            "scale": [ 0.9, 0.9, 0.9 ]
         },
-        "firstperson": {
-            "rotation": [ 0, -135, 25 ],
-            "translation": [ 0, 4, 2 ],
-            "scale": [ 1.7, 1.7, 1.7 ]
+        "thirdperson_lefthand": {
+            "rotation": [ -80, -280, 40 ],
+            "translation": [ -1, -2, 2.5 ],
+            "scale": [ 0.9, 0.9, 0.9 ]
+        },
+        "firstperson_righthand": {
+            "rotation": [ 0, -90, 25 ],
+            "translation": [ 1.13, 3.2, 1.13],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        },
+        "firstperson_lefthand": {
+            "rotation": [ 0, 90, -25 ],
+            "translation": [ 1.13, 3.2, 1.13],
+            "scale": [ 0.68, 0.68, 0.68 ]
+        }
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "pulling": 1
+            },
+            "model": "item/bow_pulling_0"
+        },
+        {
+            "predicate": {
+                "pulling": 1,
+                "pull": 0.65
+            },
+            "model": "item/bow_pulling_1"
+        },
+        {
+            "predicate": {
+                "pulling": 1,
+                "pull": 0.9
+            },
+            "model": "item/bow_pulling_2"
         }
-    }
+    ]
 }
diff --git a/assets/minecraft/textures/blocks/cobblestone.png b/assets/minecraft/textures/blocks/cobblestone.png
diff --git a/assets/minecraft/textures/blocks/cobblestone_mossy.png b/assets/minecraft/textures/blocks/cobblestone_mossy.png
diff --git a/assets/minecraft/textures/blocks/diamond_block.png b/assets/minecraft/textures/blocks/diamond_block.png
diff --git a/assets/minecraft/textures/entity/skeleton/skeleton.png b/assets/minecraft/textures/entity/skeleton/skeleton.png
diff --git a/assets/minecraft/textures/entity/skeleton/wither_skeleton.png b/assets/minecraft/textures/entity/skeleton/wither_skeleton.png
diff --git a/assets/minecraft/textures/gui/container/inventory.png b/assets/minecraft/textures/gui/container/inventory.png
diff --git a/assets/minecraft/textures/items/apple.png b/assets/minecraft/textures/items/apple.png
diff --git a/assets/minecraft/textures/items/apple_golden.png b/assets/minecraft/textures/items/apple_golden.png
diff --git a/assets/minecraft/textures/items/arrow.png b/assets/minecraft/textures/items/arrow.png
diff --git a/assets/minecraft/textures/items/beef_cooked.png b/assets/minecraft/textures/items/beef_cooked.png
diff --git a/assets/minecraft/textures/items/beef_raw.png b/assets/minecraft/textures/items/beef_raw.png
diff --git a/assets/minecraft/textures/items/bow_pulling_0.png b/assets/minecraft/textures/items/bow_pulling_0.png
diff --git a/assets/minecraft/textures/items/bow_pulling_1.png b/assets/minecraft/textures/items/bow_pulling_1.png
diff --git a/assets/minecraft/textures/items/bow_pulling_2.png b/assets/minecraft/textures/items/bow_pulling_2.png
diff --git a/assets/minecraft/textures/items/bow_standby.png b/assets/minecraft/textures/items/bow_standby.png
diff --git a/assets/minecraft/textures/items/carrot.png b/assets/minecraft/textures/items/carrot.png
diff --git a/assets/minecraft/textures/items/carrot_golden.png b/assets/minecraft/textures/items/carrot_golden.png
diff --git a/assets/minecraft/textures/items/chainmail_boots.png b/assets/minecraft/textures/items/chainmail_boots.png
diff --git a/assets/minecraft/textures/items/chainmail_chestplate.png b/assets/minecraft/textures/items/chainmail_chestplate.png
diff --git a/assets/minecraft/textures/items/chainmail_helmet.png b/assets/minecraft/textures/items/chainmail_helmet.png
diff --git a/assets/minecraft/textures/items/chainmail_leggings.png b/assets/minecraft/textures/items/chainmail_leggings.png
diff --git a/assets/minecraft/textures/items/charcoal.png b/assets/minecraft/textures/items/charcoal.png
diff --git a/assets/minecraft/textures/items/chicken_cooked.png b/assets/minecraft/textures/items/chicken_cooked.png
diff --git a/assets/minecraft/textures/items/chicken_raw.png b/assets/minecraft/textures/items/chicken_raw.png
diff --git a/assets/minecraft/textures/items/diamond.png b/assets/minecraft/textures/items/diamond.png
diff --git a/assets/minecraft/textures/items/diamond_axe.png b/assets/minecraft/textures/items/diamond_axe.png
diff --git a/assets/minecraft/textures/items/diamond_boots.png b/assets/minecraft/textures/items/diamond_boots.png
diff --git a/assets/minecraft/textures/items/diamond_chestplate.png b/assets/minecraft/textures/items/diamond_chestplate.png
diff --git a/assets/minecraft/textures/items/diamond_helmet.png b/assets/minecraft/textures/items/diamond_helmet.png
diff --git a/assets/minecraft/textures/items/diamond_hoe.png b/assets/minecraft/textures/items/diamond_hoe.png
diff --git a/assets/minecraft/textures/items/diamond_horse_armor.png b/assets/minecraft/textures/items/diamond_horse_armor.png
diff --git a/assets/minecraft/textures/items/diamond_leggings.png b/assets/minecraft/textures/items/diamond_leggings.png
diff --git a/assets/minecraft/textures/items/diamond_pickaxe.png b/assets/minecraft/textures/items/diamond_pickaxe.png
diff --git a/assets/minecraft/textures/items/diamond_shovel.png b/assets/minecraft/textures/items/diamond_shovel.png
diff --git a/assets/minecraft/textures/items/dye_powder_black.png b/assets/minecraft/textures/items/dye_powder_black.png
diff --git a/assets/minecraft/textures/items/dye_powder_brown.png b/assets/minecraft/textures/items/dye_powder_brown.png
diff --git a/assets/minecraft/textures/items/dye_powder_cyan.png b/assets/minecraft/textures/items/dye_powder_cyan.png
diff --git a/assets/minecraft/textures/items/dye_powder_gray.png b/assets/minecraft/textures/items/dye_powder_gray.png
diff --git a/assets/minecraft/textures/items/dye_powder_green.png b/assets/minecraft/textures/items/dye_powder_green.png
diff --git a/assets/minecraft/textures/items/dye_powder_light_blue.png b/assets/minecraft/textures/items/dye_powder_light_blue.png
diff --git a/assets/minecraft/textures/items/dye_powder_lime.png b/assets/minecraft/textures/items/dye_powder_lime.png
diff --git a/assets/minecraft/textures/items/dye_powder_magenta.png b/assets/minecraft/textures/items/dye_powder_magenta.png
diff --git a/assets/minecraft/textures/items/dye_powder_orange.png b/assets/minecraft/textures/items/dye_powder_orange.png
diff --git a/assets/minecraft/textures/items/dye_powder_pink.png b/assets/minecraft/textures/items/dye_powder_pink.png
diff --git a/assets/minecraft/textures/items/dye_powder_purple.png b/assets/minecraft/textures/items/dye_powder_purple.png
diff --git a/assets/minecraft/textures/items/dye_powder_red.png b/assets/minecraft/textures/items/dye_powder_red.png
diff --git a/assets/minecraft/textures/items/dye_powder_silver.png b/assets/minecraft/textures/items/dye_powder_silver.png
diff --git a/assets/minecraft/textures/items/dye_powder_yellow.png b/assets/minecraft/textures/items/dye_powder_yellow.png
diff --git a/assets/minecraft/textures/items/emerald.png b/assets/minecraft/textures/items/emerald.png
diff --git a/assets/minecraft/textures/items/fish_clownfish_raw.png b/assets/minecraft/textures/items/fish_clownfish_raw.png
diff --git a/assets/minecraft/textures/items/fish_cod_cooked.png b/assets/minecraft/textures/items/fish_cod_cooked.png
diff --git a/assets/minecraft/textures/items/fish_cod_raw.png b/assets/minecraft/textures/items/fish_cod_raw.png
diff --git a/assets/minecraft/textures/items/fish_pufferfish_raw.png b/assets/minecraft/textures/items/fish_pufferfish_raw.png
diff --git a/assets/minecraft/textures/items/fish_salmon_cooked.png b/assets/minecraft/textures/items/fish_salmon_cooked.png
diff --git a/assets/minecraft/textures/items/fish_salmon_raw.png b/assets/minecraft/textures/items/fish_salmon_raw.png
diff --git a/assets/minecraft/textures/items/ghast_tear.png b/assets/minecraft/textures/items/ghast_tear.png
diff --git a/assets/minecraft/textures/items/glowstone_dust.png b/assets/minecraft/textures/items/glowstone_dust.png
diff --git a/assets/minecraft/textures/items/gold_boots.png b/assets/minecraft/textures/items/gold_boots.png
diff --git a/assets/minecraft/textures/items/gold_chestplate.png b/assets/minecraft/textures/items/gold_chestplate.png
diff --git a/assets/minecraft/textures/items/gold_helmet.png b/assets/minecraft/textures/items/gold_helmet.png
diff --git a/assets/minecraft/textures/items/gold_hoe.png b/assets/minecraft/textures/items/gold_hoe.png
diff --git a/assets/minecraft/textures/items/gold_horse_armor.png b/assets/minecraft/textures/items/gold_horse_armor.png
diff --git a/assets/minecraft/textures/items/gold_leggings.png b/assets/minecraft/textures/items/gold_leggings.png
diff --git a/assets/minecraft/textures/items/iron_axe.png b/assets/minecraft/textures/items/iron_axe.png
diff --git a/assets/minecraft/textures/items/iron_boots.png b/assets/minecraft/textures/items/iron_boots.png
diff --git a/assets/minecraft/textures/items/iron_chestplate.png b/assets/minecraft/textures/items/iron_chestplate.png
diff --git a/assets/minecraft/textures/items/iron_helmet.png b/assets/minecraft/textures/items/iron_helmet.png
diff --git a/assets/minecraft/textures/items/iron_hoe.png b/assets/minecraft/textures/items/iron_hoe.png
diff --git a/assets/minecraft/textures/items/iron_horse_armor.png b/assets/minecraft/textures/items/iron_horse_armor.png
diff --git a/assets/minecraft/textures/items/iron_leggings.png b/assets/minecraft/textures/items/iron_leggings.png
diff --git a/assets/minecraft/textures/items/iron_shovel.png b/assets/minecraft/textures/items/iron_shovel.png
diff --git a/assets/minecraft/textures/items/leather.png b/assets/minecraft/textures/items/leather.png
diff --git a/assets/minecraft/textures/items/magma_cream.png b/assets/minecraft/textures/items/magma_cream.png
diff --git a/assets/minecraft/textures/items/mushroom_stew.png b/assets/minecraft/textures/items/mushroom_stew.png
diff --git a/assets/minecraft/textures/items/paper.png b/assets/minecraft/textures/items/paper.png
diff --git a/assets/minecraft/textures/items/porkchop_cooked.png b/assets/minecraft/textures/items/porkchop_cooked.png
diff --git a/assets/minecraft/textures/items/porkchop_raw.png b/assets/minecraft/textures/items/porkchop_raw.png
diff --git a/assets/minecraft/textures/items/potato.png b/assets/minecraft/textures/items/potato.png
diff --git a/assets/minecraft/textures/items/potato_baked.png b/assets/minecraft/textures/items/potato_baked.png
diff --git a/assets/minecraft/textures/items/prismarine_crystals.png b/assets/minecraft/textures/items/prismarine_crystals.png
diff --git a/assets/minecraft/textures/items/prismarine_shard.png b/assets/minecraft/textures/items/prismarine_shard.png
diff --git a/assets/minecraft/textures/items/pumpkin_pie.png b/assets/minecraft/textures/items/pumpkin_pie.png
diff --git a/assets/minecraft/textures/items/quartz.png b/assets/minecraft/textures/items/quartz.png
diff --git a/assets/minecraft/textures/items/record_11.png b/assets/minecraft/textures/items/record_11.png
diff --git a/assets/minecraft/textures/items/record_13.png b/assets/minecraft/textures/items/record_13.png
diff --git a/assets/minecraft/textures/items/record_blocks.png b/assets/minecraft/textures/items/record_blocks.png
diff --git a/assets/minecraft/textures/items/record_cat.png b/assets/minecraft/textures/items/record_cat.png
diff --git a/assets/minecraft/textures/items/record_chirp.png b/assets/minecraft/textures/items/record_chirp.png
diff --git a/assets/minecraft/textures/items/record_far.png b/assets/minecraft/textures/items/record_far.png
diff --git a/assets/minecraft/textures/items/record_mall.png b/assets/minecraft/textures/items/record_mall.png
diff --git a/assets/minecraft/textures/items/record_mellohi.png b/assets/minecraft/textures/items/record_mellohi.png
diff --git a/assets/minecraft/textures/items/record_stal.png b/assets/minecraft/textures/items/record_stal.png
diff --git a/assets/minecraft/textures/items/record_strad.png b/assets/minecraft/textures/items/record_strad.png
diff --git a/assets/minecraft/textures/items/record_wait.png b/assets/minecraft/textures/items/record_wait.png
diff --git a/assets/minecraft/textures/items/record_ward.png b/assets/minecraft/textures/items/record_ward.png
diff --git a/assets/minecraft/textures/items/slimeball.png b/assets/minecraft/textures/items/slimeball.png
diff --git a/assets/minecraft/textures/items/stick.png b/assets/minecraft/textures/items/stick.png
diff --git a/assets/minecraft/textures/items/stone_axe.png b/assets/minecraft/textures/items/stone_axe.png
diff --git a/assets/minecraft/textures/items/stone_hoe.png b/assets/minecraft/textures/items/stone_hoe.png
diff --git a/assets/minecraft/textures/items/stone_shovel.png b/assets/minecraft/textures/items/stone_shovel.png
diff --git a/assets/minecraft/textures/items/stone_sword.png b/assets/minecraft/textures/items/stone_sword.png
diff --git a/assets/minecraft/textures/items/sugar.png b/assets/minecraft/textures/items/sugar.png
diff --git a/assets/minecraft/textures/items/wood_hoe.png b/assets/minecraft/textures/items/wood_hoe.png
diff --git a/assets/minecraft/textures/items/wood_shovel.png b/assets/minecraft/textures/items/wood_shovel.png
diff --git a/assets/minecraft/textures/items/wood_sword.png b/assets/minecraft/textures/items/wood_sword.png