Compare commits

..

1 Commits

Author SHA1 Message Date
InventiveBot
56db4b8a40 Create/Update assets for version 17w13b 2017-03-31 14:50:17 +00:00
22 changed files with 34 additions and 531 deletions

View File

@@ -1,209 +0,0 @@
{
"display": {
"icon": "minecraft:iron_sword",
"title": "Kill a mob"
},
"parent": "adventure/root",
"criteria": {
"cave_spider": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "cave_spider"
}
}
},
"spider": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "spider"
}
}
},
"zombie_pigman": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie_pigman"
}
}
},
"enderman": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "enderman"
}
}
},
"polar_bear": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "polar_bear"
}
}
},
"blaze": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "blaze"
}
}
},
"creeper": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "creeper"
}
}
},
"evoker": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "evocation_illager"
}
}
},
"ghast": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "ghast"
}
}
},
"guardian": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "guardian"
}
}
},
"husk": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "husk"
}
}
},
"magma_cube": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "magma_cube"
}
}
},
"shulker": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "shulker"
}
}
},
"silverfish": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "silverfish"
}
}
},
"skeleton": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "skeleton"
}
}
},
"slime": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "slime"
}
}
},
"stray": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "stray"
}
}
},
"vindicator": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "vindication_illager"
}
}
},
"witch": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "witch"
}
}
},
"wither_skeleton": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "wither_skeleton"
}
}
},
"zombie": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie"
}
}
},
"zombie_villager": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie_villager"
}
}
}
},
"requirements": [
["cave_spider"],
["spider"],
["zombie_pigman"],
["enderman"],
["polar_bear"],
["blaze"],
["creeper"],
["evoker"],
["ghast"],
["guardian"],
["husk"],
["magma_cube"],
["shulker"],
["silverfish"],
["skeleton"],
["slime"],
["stray"],
["vindicator"],
["witch"],
["wither_skeleton"],
["zombie"],
["zombie_villager"]
]
}

View File

@@ -1,186 +0,0 @@
{
"display": {
"icon": "minecraft:diamond_sword",
"title": "Kill all the mobs",
"frame": "challenge"
},
"parent": "adventure/kill_a_mob",
"criteria": {
"cave_spider": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "cave_spider"
}
}
},
"spider": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "spider"
}
}
},
"zombie_pigman": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie_pigman"
}
}
},
"enderman": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "enderman"
}
}
},
"polar_bear": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "polar_bear"
}
}
},
"blaze": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "blaze"
}
}
},
"creeper": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "creeper"
}
}
},
"evoker": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "evocation_illager"
}
}
},
"ghast": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "ghast"
}
}
},
"guardian": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "guardian"
}
}
},
"husk": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "husk"
}
}
},
"magma_cube": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "magma_cube"
}
}
},
"shulker": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "shulker"
}
}
},
"silverfish": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "silverfish"
}
}
},
"skeleton": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "skeleton"
}
}
},
"slime": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "slime"
}
}
},
"stray": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "stray"
}
}
},
"vindicator": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "vindication_illager"
}
}
},
"witch": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "witch"
}
}
},
"wither_skeleton": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "wither_skeleton"
}
}
},
"zombie": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie"
}
}
},
"zombie_villager": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {
"type": "zombie_villager"
}
}
}
}
}

View File

@@ -1,16 +0,0 @@
{
"display": {
"icon": "minecraft:map",
"title": "Adventure",
"background": "minecraft:textures/gui/advancements/backgrounds/adventure.png"
},
"criteria": {
"killed_something": {
"trigger": "minecraft:player_killed_entity"
},
"killed_by_something": {
"trigger": "minecraft:entity_killed_player"
}
},
"requirements": [["killed_something"], ["killed_by_something"]]
}

View File

@@ -1,19 +0,0 @@
{
"display": {
"icon": "minecraft:bow",
"title": "Shoot something"
},
"parent": "adventure/kill_a_mob",
"criteria": {
"shot_arrow": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"damage": {
"type": {
"is_projectile": true
}
}
}
}
}
}

View File

@@ -1,12 +0,0 @@
{
"display": {
"icon": "minecraft:bed",
"title": "Change your spawn point"
},
"parent": "adventure/root",
"criteria": {
"slept_in_bed": {
"trigger": "minecraft:slept_in_bed"
}
}
}

View File

@@ -1,23 +0,0 @@
{
"display": {
"icon": "minecraft:arrow",
"title": "Sniper duel",
"frame": "challenge"
},
"parent": "adventure/shoot_arrow",
"criteria": {
"killed_skeleton": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"killing_blow": {
"is_projectile": true
},
"entity": {
"distance": {
"min": 50
}
}
}
}
}
}

View File

@@ -1,12 +0,0 @@
{
"display": {
"icon": "minecraft:emerald",
"title": "Complete a trade"
},
"parent": "adventure/root",
"criteria": {
"shot_arrow": {
"trigger": "minecraft:villager_trade"
}
}
}

View File

@@ -0,0 +1,19 @@
{
"display": {
"icon": "minecraft:glass_bottle",
"title": "Brew a Potion"
},
"parent": "minecraft:story/obtain_blaze_rod",
"criteria": {
"potion": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "minecraft:potion"
}
]
}
}
}
}

View File

@@ -1,15 +0,0 @@
{
"display": {
"icon": "minecraft:potion",
"title": "Brew a Weakness Potion"
},
"parent": "minecraft:story/obtain_blaze_rod",
"criteria": {
"potion": {
"trigger": "minecraft:brewed_potion",
"conditions": {
"potion": "minecraft:weakness"
}
}
}
}

View File

@@ -2,7 +2,7 @@
"display": {
"icon": "minecraft:beacon",
"title": "Create a full beacon",
"frame": "goal"
"frame": "challenge"
},
"parent": "minecraft:story/create_beacon",
"criteria": {

View File

@@ -1,13 +0,0 @@
{
"display": {
"icon": "minecraft:golden_apple",
"title": "Cure a zombie villager",
"frame": "goal"
},
"parent": "minecraft:story/brew_weakness_potion",
"criteria": {
"cured_zombie": {
"trigger": "minecraft:cured_zombie_villager"
}
}
}

View File

@@ -6,13 +6,11 @@
"parent": "minecraft:story/obtain_armor",
"criteria": {
"deflected_projectile": {
"trigger": "minecraft:entity_hurt_player",
"trigger": "minecraft:player_damaged",
"conditions": {
"damage": {
"type": {
"is_projectile": true
},
"blocked": true
"blocked": true,
"is_projectile": true
}
}
}

View File

@@ -1596,9 +1596,6 @@ gui.advancements=Advancements
gui.stats=Statistics
advancements.empty=There doesn't seem to be anything here...
advancements.toast.task=Advancement Made!
advancements.toast.challenge=Challenge Complete!
advancements.toast.goal=Goal Reached!
stats.tooltip.type.statistic=Statistic
stat.generalButton=General
@@ -1683,8 +1680,7 @@ stat.craftItem=%1$s Crafted
stat.useItem=%1$s Used
stat.breakItem=%1$s Depleted
recipe.toast.title=New Recipes Unlocked!
recipe.toast.description=Check your recipe book
recipe.given=New recipe unlocked for %s
commands.generic.exception=An unknown error occurred while attempting to perform this command
commands.generic.permission=You do not have permission to use this command
@@ -2057,7 +2053,6 @@ commands.recipe.give.success.all=Successfully given all recipes to %s
commands.recipe.give.success.one=Successfully given %s the recipe for %s
commands.recipe.take.success.all=Successfully taken all recipes from %s
commands.recipe.take.success.one=Successfully removed the recipe for %s from %s
commands.recipe.unknownrecipe=%s is an unknown recipe
commands.worldborder.usage=/worldborder <set|center|damage|warning|get|add> ...
commands.worldborder.add.usage=/worldborder add <sizeInBlocks> [timeInSeconds]
commands.worldborder.set.usage=/worldborder set <sizeInBlocks> [timeInSeconds]

View File

@@ -2360,8 +2360,7 @@
"name": "mob/parrot/death4",
"pitch": 0.7
}
],
"subtitle": "subtitles.entity.parrot.death"
]
},
"entity.parrot.hurt": {
"sounds": [
@@ -2377,8 +2376,7 @@
"name": "mob/parrot/hurt1",
"pitch": 0.9
}
],
"subtitle": "subtitles.entity.parrot.hurts"
]
},
"entity.parrot.ambient": {
"sounds": [
@@ -2389,16 +2387,14 @@
"mob/parrot/idle5",
"mob/parrot/idle6",
"mob/parrot/idle7"
],
"subtitle": "subtitles.entity.parrot.ambient"
]
},
"entity.parrot.eat": {
"sounds": [
"mob/parrot/eat1",
"mob/parrot/eat2",
"mob/parrot/eat3"
],
"subtitle": "subtitles.entity.parrot.eats"
]
},
"entity.parrot.fly": {
"sounds": [

View File

@@ -313,7 +313,7 @@ Put that cookie down!
Pretty scary!
I have a suggestion.
Now with extra hugs!
Now Java 8!
Now Java 6!
Woah.
HURNERJSGER?
What's up, Doc?

Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 B

After

Width:  |  Height:  |  Size: 544 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 641 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 844 B

View File

@@ -1,8 +1,8 @@
{
"id": "17w14a",
"id": "17w13b",
"type": "snapshot",
"url": "https://launchermeta.mojang.com/mc/game/0536ebf96543b0a0212a89d2a97600c9f263c7bf/17w14a.json",
"time": "2017-04-05T14:35:21+00:00",
"releaseTime": "2017-04-05T13:58:01+00:00",
"downloadTimestamp": 1491504107494
"url": "https://launchermeta.mojang.com/mc/game/ba59e4831cfa0afc2fba4658f6d86d5599cfaa9c/17w13b.json",
"time": "2017-03-31T11:07:33+00:00",
"releaseTime": "2017-03-31T11:06:35+00:00",
"downloadTimestamp": 1490971801307
}