Create/Update assets for version 16w36a

assets/minecraft/blockstates/observer.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "facing=down": { "model": "observer", "x": 90 },
-        "facing=up": { "model": "observer", "x": 270 },
-        "facing=north": { "model": "observer" },
-        "facing=south": { "model": "observer", "y": 180 },
-        "facing=west": { "model": "observer", "y": 270 },
-        "facing=east": { "model": "observer", "y": 90 }
-    }
-}

assets/minecraft/lang/en_us.lang

@@ -23,7 +23,7 @@ translation.test.invalid2=hi %  s
 translation.test.args=%s %s
 translation.test.world=world
 
-menu.game=Game Menu
+menu.game=Game menu
 menu.singleplayer=Singleplayer
 menu.multiplayer=Multiplayer
 menu.online=Minecraft Realms
@@ -60,7 +60,7 @@ selectWorld.newWorld=New World
 selectWorld.newWorld.copyOf=Copy of %s
 selectWorld.enterName=World Name
 selectWorld.resultFolder=Will be saved in:
-selectWorld.enterSeed=Seed for the world generator
+selectWorld.enterSeed=Seed for the World Generator
 selectWorld.seedInfo=Leave blank for a random seed
 selectWorld.cheats=Cheats
 selectWorld.customizeType=Customize
@@ -91,6 +91,7 @@ createWorld.customize.flat.removeLayer=Remove Layer
 createWorld.customize.flat.layer.top=Top - %s
 createWorld.customize.flat.layer=%s
 createWorld.customize.flat.layer.bottom=Bottom - %s
+createWorld.customize.flat.air=Air
 
 createWorld.customize.preset.classic_flat=Classic Flat
 createWorld.customize.preset.tunnelers_dream=Tunnelers' Dream
@@ -136,7 +137,6 @@ createWorld.customize.custom.useVillages=Villages
 createWorld.customize.custom.useMineShafts=Mineshafts
 createWorld.customize.custom.useTemples=Temples
 createWorld.customize.custom.useMonuments=Ocean Monuments
-createWorld.customize.custom.useMansions=Woodland Mansions
 createWorld.customize.custom.useRavines=Ravines
 createWorld.customize.custom.useDungeons=Dungeons
 createWorld.customize.custom.dungeonChance=Dungeon Count
@@ -175,10 +175,10 @@ gameMode.changed=Your game mode has been updated to %s
 
 spectatorMenu.previous_page=Previous Page
 spectatorMenu.next_page=Next Page
-spectatorMenu.close=Close Menu
+spectatorMenu.close=Close menu
-spectatorMenu.teleport=Teleport to Player
+spectatorMenu.teleport=Teleport to player
 spectatorMenu.teleport.prompt=Select a player to teleport to
-spectatorMenu.team_teleport=Teleport to Team Member
+spectatorMenu.team_teleport=Teleport to team member
 spectatorMenu.team_teleport.prompt=Select a team to teleport to
 spectatorMenu.root.prompt=Press a key to select a command, and again to use it.
 
@@ -224,7 +224,7 @@ selectServer.select=Join Server
 selectServer.direct=Direct Connect
 selectServer.edit=Edit
 selectServer.delete=Delete
-selectServer.add=Add Server
+selectServer.add=Add server
 selectServer.defaultName=Minecraft Server
 selectServer.deleteQuestion=Are you sure you want to remove this server?
 selectServer.deleteWarning=will be lost forever! (A long time!)
@@ -429,7 +429,7 @@ options.attack.crosshair=Crosshair
 options.attack.hotbar=Hotbar
 options.showSubtitles=Show Subtitles
 options.realmsNotifications=Realms Notifications
-options.autoJump=Auto-Jump
+options.autoJump=Auto-jump
 
 options.mipmapLevels=Mipmap Levels
 options.forceUnicodeFont=Force Unicode Font
@@ -483,7 +483,7 @@ key.categories.gameplay=Gameplay
 key.categories.ui=Game Interface
 key.categories.inventory=Inventory
 
-resourcePack.openFolder=Open Resource Pack Folder
+resourcePack.openFolder=Open resource pack folder
 resourcePack.title=Select Resource Packs
 resourcePack.available.title=Available Resource Packs
 resourcePack.selected.title=Selected Resource Packs
@@ -510,7 +510,6 @@ book.generation.3=Tattered
 
 merchant.deprecated=Trade something else to unlock!
 
-tile.air.name=Air
 tile.barrier.name=Barrier
 tile.stone.stone.name=Stone
 tile.stone.granite.name=Granite
@@ -870,23 +869,6 @@ tile.magma.name=Magma Block
 tile.netherWartBlock.name=Nether Wart Block
 tile.redNetherBrick.name=Red Nether Brick
 tile.boneBlock.name=Bone Block
-tile.observer.name=Observer
-tile.shulkerBoxWhite.name=White Shulker Box
-tile.shulkerBoxOrange.name=Orange Shulker Box
-tile.shulkerBoxMagenta.name=Magenta Shulker Box
-tile.shulkerBoxLightBlue.name=Light Blue Shulker Box
-tile.shulkerBoxYellow.name=Yellow Shulker Box
-tile.shulkerBoxLime.name=Lime Shulker Box
-tile.shulkerBoxPink.name=Pink Shulker Box
-tile.shulkerBoxGray.name=Gray Shulker Box
-tile.shulkerBoxSilver.name=Light Gray Shulker Box
-tile.shulkerBoxCyan.name=Cyan Shulker Box
-tile.shulkerBoxPurple.name=Purple Shulker Box
-tile.shulkerBoxBlue.name=Blue Shulker Box
-tile.shulkerBoxBrown.name=Brown Shulker Box
-tile.shulkerBoxGreen.name=Green Shulker Box
-tile.shulkerBoxRed.name=Red Shulker Box
-tile.shulkerBoxBlack.name=Black Shulker Box
 
 tile.structureVoid.name=Structure Void
 tile.structureBlock.name=Structure Block
@@ -1147,8 +1129,6 @@ item.beetroot_seeds.name=Beetroot Seeds
 item.beetroot_soup.name=Beetroot Soup
 item.dragon_breath.name=Dragon's Breath
 item.elytra.name=Elytra
-item.totem.name=Totem of Undying
-item.shulkerShell.name=Shulker Shell
 
 container.inventory=Inventory
 container.hopper=Item Hopper
@@ -1171,8 +1151,6 @@ container.chest=Chest
 container.chestDouble=Large Chest
 container.enderchest=Ender Chest
 container.beacon=Beacon
-container.shulkerBox=Shulker Box
-container.shulkerBox.more=and %d more...
 
 container.spectatorCantOpen=Unable to open. Loot not generated yet.
 container.isLocked=%s is locked!
@@ -1218,9 +1196,6 @@ item.color=Color: %s
 item.nbt_tags=NBT: %s tag(s)
 item.durability=Durability: %s / %s
 
-filled_map.mansion=Woodland Explorer Map
-filled_map.monument=Ocean Explorer Map
-
 entity.Item.name=Item
 entity.XPOrb.name=Experience Orb
 entity.SmallFireball.name=Small Fireball
@@ -1265,9 +1240,6 @@ entity.Guardian.name=Guardian
 entity.ElderGuardian.name=Elder Guardian
 entity.Shulker.name=Shulker
 entity.PolarBear.name=Polar Bear
-entity.EvocationIllager.name=Evoker
-entity.Vex.name=Vex
-entity.VindicationIllager.name=Vindicator
 
 entity.Villager.farmer=Farmer
 entity.Villager.fisherman=Fisherman
@@ -1281,7 +1253,6 @@ entity.Villager.tool=Tool Smith
 entity.Villager.butcher=Butcher
 entity.Villager.leather=Leatherworker
 entity.Villager.nitwit=Nitwit
-entity.Villager.cartographer=Cartographer
 
 entity.Pig.name=Pig
 entity.Sheep.name=Sheep
@@ -1299,7 +1270,6 @@ entity.SkeletonHorse.name=Skeleton Horse
 entity.ZombieHorse.name=Zombie Horse
 entity.Rabbit.name=Rabbit
 entity.KillerBunny.name=The Killer Bunny
-entity.Llama.name=Llama
 
 entity.PrimedTnt.name=Block of TNT
 entity.FallingSand.name=Falling Block
@@ -1399,7 +1369,7 @@ effect.luck=Luck
 effect.unluck=Bad Luck
 effect.levitation=Levitation
 
-tipped_arrow.effect.empty=Uncraftable Tipped Arrow
+tipped_arrow.effect.empty=Tipped Arrow
 tipped_arrow.effect.water=Tipped Arrow
 tipped_arrow.effect.mundane=Tipped Arrow
 tipped_arrow.effect.thick=Tipped Arrow
@@ -1516,8 +1486,6 @@ enchantment.arrowKnockback=Punch
 enchantment.arrowInfinite=Infinity
 enchantment.thorns=Thorns
 enchantment.mending=Mending
-enchantment.binding_curse=Curse of Binding
-enchantment.vanishing_curse=Curse of Vanishing
 
 enchantment.level.1=I
 enchantment.level.2=II
@@ -1549,11 +1517,11 @@ stat.entityKilledBy=%s killed you %s time(s)
 stat.entityKills.none=You have never killed %s
 stat.entityKilledBy.none=You have never been killed by %s
 
-stat.startGame=Times Played
+stat.startGame=Times played
-stat.createWorld=Worlds Created
+stat.createWorld=Worlds created
-stat.loadWorld=Saves Loaded
+stat.loadWorld=Saves loaded
-stat.joinMultiplayer=Multiplayer Joins
+stat.joinMultiplayer=Multiplayer joins
-stat.leaveGame=Games Quit
+stat.leaveGame=Games quit
 
 stat.playOneMinute=Minutes Played
 stat.timeSinceDeath=Since Last Death
@@ -1599,9 +1567,9 @@ stat.beaconInteraction=Interactions with Beacon
 stat.dropperInspected=Droppers Searched
 stat.hopperInspected=Hoppers Searched
 stat.dispenserInspected=Dispensers Searched
-stat.noteblockPlayed=Note Blocks Played
+stat.noteblockPlayed=Noteblocks played
-stat.noteblockTuned=Note Blocks Tuned
+stat.noteblockTuned=Noteblocks tuned
-stat.flowerPotted=Plants Potted
+stat.flowerPotted=Plants potted
 stat.trappedChestTriggered=Trapped Chests Triggered
 stat.enderchestOpened=Ender Chests Opened
 stat.itemEnchanted=Items Enchanted
@@ -1609,7 +1577,6 @@ stat.recordPlayed=Records Played
 stat.furnaceInteraction=Interactions with Furnace
 stat.workbenchInteraction=Interactions with Crafting Table
 stat.chestOpened=Chests Opened
-stat.shulkerBoxOpened=Shulker Boxes Opened
 stat.sleepInBed=Times Slept in a Bed
 
 stat.mineBlock=%1$s Mined
@@ -1695,10 +1662,9 @@ achievement.bookcase.desc=Build some bookshelves to improve your enchantment tab
 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
 commands.generic.syntax=Invalid command syntax
-commands.generic.player.notFound=Player '%s' cannot be found
+commands.generic.player.notFound=That player cannot be found
-commands.generic.entity.notFound=Entity '%s' cannot be found
+commands.generic.entity.notFound=That entity cannot be found
-commands.generic.selector.notFound=Selector '%s' found nothing
+commands.generic.entity.invalidUuid=The entity UUID provided is in an invalid format
-commands.generic.entity.invalidUuid=The entity UUID '%s' is in an invalid format
 commands.generic.entity.invalidType=Entity type '%s' is invalid
 commands.generic.notFound=Unknown command. Try /help for a list of commands
 commands.generic.parameter.invalid='%s' is not a valid parameter
@@ -1708,8 +1674,6 @@ commands.generic.num.tooSmall=The number you have entered (%s) is too small, it
 commands.generic.num.tooBig=The number you have entered (%s) is too big, it must be at most %s
 commands.generic.blockstate.invalid='%s' is not a state for block %s
 commands.generic.usage=Usage: %s
-commands.generic.selector_argument=Invalid selector argument: %s
-commands.generic.player.unspecified=You must specify which player you wish to perform this action on.
 
 commands.setidletimeout.usage=/setidletimeout <Minutes until kick>
 commands.setidletimeout.success=Successfully set the idle timeout to %s minutes.
@@ -1745,7 +1709,7 @@ commands.stats.noCompatibleBlock=Block at %s, %s, %s can not track stats
 commands.stats.failed=Invalid parameters
 commands.stats.cleared=Cleared %s stats
 commands.stats.success=Storing %s stats in %s on %s
-commands.summon.usage=/summon <entityname> [x] [y] [z] [dataTag]
+commands.summon.usage=/summon <EntityName> [x] [y] [z] [dataTag]
 commands.summon.success=Object successfully summoned
 commands.summon.failed=Unable to summon object
 commands.summon.tagError=Data tag parsing failed: %s
@@ -1850,7 +1814,7 @@ commands.banip.usage=/ban-ip <address|name> [reason ...]
 commands.unbanip.invalid=You have entered an invalid IP address
 commands.unbanip.success=Unbanned IP address %s
 commands.unbanip.usage=/pardon-ip <address>
-commands.save.usage=/save-all [flush]
+commands.save.usage=/save-all
 commands.save-on.alreadyOn=Saving is already turned on
 commands.save-on.usage=/save-on
 commands.save-off.alreadyOff=Saving is already turned off
@@ -2029,7 +1993,6 @@ commands.testfor.success=Found %s
 commands.testfor.tagError=Data tag parsing failed: %s
 commands.seed.usage=/seed
 commands.seed.success=Seed: %s
-commands.spreadplayers.noop=No players found to spread
 commands.spreadplayers.usage=/spreadplayers <x> <z> <spreadDistance> <maxRange> <respectTeams true|false> <player ...>
 commands.spreadplayers.spreading.teams=Spreading %s team(s) %s blocks around %s,%s (min %s blocks apart)
 commands.spreadplayers.spreading.players=Spreading %s player(s) %s blocks around %s,%s (min %s blocks apart)
@@ -2076,9 +2039,6 @@ commands.stopsound.unknownSoundSource=Source %s is unknown
 commands.stopsound.success.individualSound=Stopped sound '%s' with source '%s' for %s
 commands.stopsound.success.soundSource=Stopped source '%s' for %s
 commands.stopsound.success.all=Stopped all sounds for %s
-commands.locate.usage=/locate <feature>
-commands.locate.success=Located %s at %d (y?) %d
-commands.locate.failure=Unable to locate any %s feature
 
 itemGroup.buildingBlocks=Building Blocks
 itemGroup.decorations=Decoration Blocks
@@ -2864,8 +2824,6 @@ subtitles.block.piston.move=Piston moves
 subtitles.block.portal.ambient=Portal whooshes
 subtitles.block.pressure_plate.click=Pressure Plate clicks
 subtitles.block.redstone_torch.burnout=Torch fizzes
-subtitles.block.shulker_box.close=Shulker closes
-subtitles.block.shulker_box.open=Shulker opens
 subtitles.block.trapdoor.toggle=Trapdoor creaks
 subtitles.block.tripwire.attach=Tripwire attaches
 subtitles.block.tripwire.click=Tripwire clicks
@@ -2907,13 +2865,6 @@ subtitles.entity.donkey.chest=Donkey Chest equips
 subtitles.entity.donkey.death=Donkey dies
 subtitles.entity.donkey.hurt=Donkey hurts
 subtitles.entity.egg.throw=Egg flies
-subtitles.entity.elder_guardian.ambient.land=Elder Guardian flaps
-subtitles.entity.elder_guardian.ambient=Elder Guardian moans
-subtitles.entity.elder_guardian.attack=Elder Guardian shoots
-subtitles.entity.elder_guardian.curse=Elder Guardian curses
-subtitles.entity.elder_guardian.death=Elder Guardian dies
-subtitles.entity.elder_guardian.flop=Elder Guardian flops
-subtitles.entity.elder_guardian.hurt=Elder Guardian hurts
 subtitles.entity.enderdragon.ambient=Dragon roars
 subtitles.entity.enderdragon.death=Dragon dies
 subtitles.entity.enderdragon.flap=Dragon flaps
@@ -2930,14 +2881,6 @@ subtitles.entity.endermite.ambient=Endermite scuttles
 subtitles.entity.endermite.death=Endermite dies
 subtitles.entity.endermite.hurt=Endermite hurts
 subtitles.entity.enderpearl.throw=Ender Pearl flies
-subtitles.entity.evocation_fangs.attack=Fangs snap
-subtitles.entity.evocation_illager.ambient=Evoker murmurs
-subtitles.entity.evocation_illager.cast_spell=Evoker casts spell
-subtitles.entity.evocation_illager.death=Evoker dies
-subtitles.entity.evocation_illager.hurt=Evoker hurts
-subtitles.entity.evocation_illager.prepare_attack=Evoker prepares attack
-subtitles.entity.evocation_illager.prepare_summon=Evoker prepares summoning
-subtitles.entity.evocation_illager.prepare_wololo=Evoker prepares charming
 subtitles.entity.experience_orb.pickup=Experience gained
 subtitles.entity.firework.blast=Firework blasts
 subtitles.entity.firework.launch=Firework launches
@@ -2957,6 +2900,13 @@ subtitles.entity.ghast.ambient=Ghast cries
 subtitles.entity.ghast.death=Ghast dies
 subtitles.entity.ghast.hurt=Ghast hurts
 subtitles.entity.ghast.shoot=Ghast shoots
+subtitles.entity.elder_guardian.ambient.land=Elder Guardian flaps
+subtitles.entity.elder_guardian.ambient=Elder Guardian moans
+subtitles.entity.elder_guardian.attack=Elder Guardian shoots
+subtitles.entity.elder_guardian.curse=Elder Guardian curses
+subtitles.entity.elder_guardian.death=Elder Guardian dies
+subtitles.entity.elder_guardian.flop=Elder Guardian flops
+subtitles.entity.elder_guardian.hurt=Elder Guardian hurts
 subtitles.entity.guardian.ambient.land=Guardian flaps
 subtitles.entity.guardian.ambient=Guardian moans
 subtitles.entity.guardian.attack=Guardian shoots
@@ -2991,21 +2941,11 @@ subtitles.entity.leashknot.break=Leash knot breaks
 subtitles.entity.leashknot.place=Leash knot tied
 subtitles.entity.lightning.impact=Lightning strikes
 subtitles.entity.lightning.thunder=Thunder roars
-subtitles.entity.llama.ambient=Llama bleats
-subtitles.entity.llama.angry=Llama bleats angry
-subtitles.entity.llama.chest=Llama Chest equips
-subtitles.entity.llama.death=Llama dies
-subtitles.entity.llama.eat=Llama eats
-subtitles.entity.llama.hurt=Llama hurts
-subtitles.entity.llama.spit=Llama spits
-subtitles.entity.llama.step=Llama steps
-subtitles.entity.llama.swag=Llama is decorated
 subtitles.entity.magmacube.death=Magma Cube dies
 subtitles.entity.magmacube.hurt=Magma Cube hurts
 subtitles.entity.magmacube.squish=Magma Cube squishes
 subtitles.entity.minecart.riding=Minecart rolls
 subtitles.entity.mule.ambient=Mule hee-haws
-subtitles.entity.mule.chest=Mule Chest equips
 subtitles.entity.mule.death=Mule dies
 subtitles.entity.mule.hurt=Mule hurts
 subtitles.entity.painting.break=Painting breaks
@@ -3069,19 +3009,12 @@ subtitles.entity.stray.ambient=Stray rattles
 subtitles.entity.stray.death=Stray dies
 subtitles.entity.stray.hurt=Stray hurts
 subtitles.entity.tnt.primed=TNT fizzes
-subtitles.entity.vex.ambient=Vex vexes
-subtitles.entity.vex.charge=Vex shrieks
-subtitles.entity.vex.death=Vex dies
-subtitles.entity.vex.hurt=Vex hurts
 subtitles.entity.villager.ambient=Villager mumbles
 subtitles.entity.villager.death=Villager dies
 subtitles.entity.villager.hurt=Villager hurts
 subtitles.entity.villager.no=Villager disagrees
 subtitles.entity.villager.trading=Villager trades
 subtitles.entity.villager.yes=Villager agrees
-subtitles.entity.vindication_illager.ambient=Vindicator mutters
-subtitles.entity.vindication_illager.death=Vindicator dies
-subtitles.entity.vindication_illager.hurt=Vindicator hurts
 subtitles.entity.witch.ambient=Witch giggles
 subtitles.entity.witch.death=Witch dies
 subtitles.entity.witch.drink=Witch drinks
@@ -3119,7 +3052,6 @@ subtitles.entity.zombie_villager.hurt=Zombie Villager hurts
 subtitles.item.armor.equip=Gear equipped
 subtitles.item.armor.equip_chain=Chain armor jingles
 subtitles.item.armor.equip_diamond=Diamond armor clangs
-subtitles.item.armor.equip_elytra=Elytra rustles
 subtitles.item.armor.equip_gold=Gold armor clinks
 subtitles.item.armor.equip_iron=Iron armor clanks
 subtitles.item.armor.equip_leather=Leather armor rustles
@@ -3133,7 +3065,6 @@ subtitles.item.hoe.till=Hoe tills
 subtitles.item.shear=Shears click
 subtitles.item.shield.block=Shield blocks
 subtitles.item.shovel.flatten=Shovel flattens
-subtitles.item.totem.use=Totem activates
 subtitles.weather.rain=Rain falls
 
 debug.reload_chunks.help=F3 + A = Reload chunks

assets/minecraft/loot_tables/chests/woodland_mansion.json

@@ -1,264 +0,0 @@
-{
-    "pools": [
-        {
-            "rolls": {
-                "min": 1,
-                "max": 3
-            },
-            "entries": [
-                {
-                    "type": "item",
-                    "name": "minecraft:lead",
-                    "weight": 20
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:golden_apple",
-                    "weight": 15
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:golden_apple",
-                    "weight": 2,
-                    "functions": [
-                        {
-                            "function": "set_data",
-                            "data": 1
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:record_13",
-                    "weight": 15
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:record_cat",
-                    "weight": 15
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:name_tag",
-                    "weight": 20
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:chainmail_chestplate",
-                    "weight": 10
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:diamond_hoe",
-                    "weight": 15
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:diamond_chestplate",
-                    "weight": 5
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:book",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "enchant_randomly"
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            "rolls": {
-                "min": 1,
-                "max": 4
-            },
-            "entries": [
-                {
-                    "type": "item",
-                    "name": "minecraft:iron_ingot",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 4
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:gold_ingot",
-                    "weight": 5,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 4
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:bread",
-                    "weight": 20
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:wheat",
-                    "weight": 20,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 4
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:bucket",
-                    "weight": 10
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:redstone",
-                    "weight": 15,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 4
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:coal",
-                    "weight": 15,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 4
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:melon_seeds",
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 2,
-                                "max": 4
-                            }
-                        }
-                    ],
-                    "weight": 10
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:pumpkin_seeds",
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 2,
-                                "max": 4
-                            }
-                        }
-                    ],
-                    "weight": 10
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:beetroot_seeds",
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 2,
-                                "max": 4
-                            }
-                        }
-                    ],
-                    "weight": 10
-                }
-            ]
-        },
-        {
-            "rolls": 3,
-            "entries": [
-                {
-                    "type": "item",
-                    "name": "minecraft:bone",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 8
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:gunpowder",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 8
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:rotten_flesh",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 8
-                            }
-                        }
-                    ]
-                },
-                {
-                    "type": "item",
-                    "name": "minecraft:string",
-                    "weight": 10,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 1,
-                                "max": 8
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

assets/minecraft/loot_tables/entities/elder_guardian.json

@@ -40,18 +40,6 @@
                                 "min": 0,
                                 "max": 1
                             }
-                        },
-                        {
-                            "function": "furnace_smelt",
-                            "conditions": [
-                                {
-                                    "condition": "entity_properties",
-                                    "entity": "this",
-                                    "properties": {
-                                        "on_fire": true
-                                    }
-                                }
-                            ]
                         }
                     ]
                 },

assets/minecraft/loot_tables/entities/evocation_illager.json

@@ -1,44 +0,0 @@
-{
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "item",
-          "name": "minecraft:totem"
-        }
-      ]
-    },
-    {
-        "rolls": 1,
-        "entries": [
-            {
-                "type": "item",
-                "name": "minecraft:emerald",
-                "weight": 1,
-                "functions": [
-                    {
-                        "function": "set_count",
-                        "count": {
-                            "min": 0,
-                            "max": 1
-                        }
-                    },
-                    {
-                        "function": "looting_enchant",
-                        "count": {
-                            "min": 0,
-                            "max": 1
-                        }
-                    }
-                ]
-            }
-        ],
-        "conditions": [
-            {
-                "condition": "killed_by_player"
-            }
-        ]
-    }    
-  ]
-}

assets/minecraft/loot_tables/entities/guardian.json

@@ -40,18 +40,6 @@
                                 "min": 0,
                                 "max": 1
                             }
-                        },
-                        {
-                            "function": "furnace_smelt",
-                            "conditions": [
-                                {
-                                    "condition": "entity_properties",
-                                    "entity": "this",
-                                    "properties": {
-                                        "on_fire": true
-                                    }
-                                }
-                            ]
                         }
                     ]
                 },

assets/minecraft/loot_tables/entities/llama.json

@@ -1,29 +0,0 @@
-{
-    "pools": [
-        {
-            "rolls": 1,
-            "entries": [
-                {
-                    "type": "item",
-                    "name": "minecraft:leather",
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 0,
-                                "max": 2
-                            }
-                        },
-                        {
-                            "function": "looting_enchant",
-                            "count": {
-                                "min": 0,
-                                "max": 1
-                            }
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}

assets/minecraft/loot_tables/entities/rabbit.json

@@ -52,13 +52,6 @@
                                     }
                                 }
                             ]
-                        },
-                        {
-                            "function": "looting_enchant",
-                            "count": {
-                                "min": 0,
-                                "max": 1
-                            }
                         }
                     ]
                 }

assets/minecraft/loot_tables/entities/shulker.json

@@ -1,20 +1 @@
-{
+{}
-  "pools": [
-    {
-      "conditions": [
-        {
-          "condition": "random_chance_with_looting",
-          "chance": 0.5,
-          "looting_multiplier": 0.0625
-        }
-      ],
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "item",
-          "name": "minecraft:shulker_shell"
-        }
-      ]
-    }
-  ]
-}

assets/minecraft/loot_tables/entities/skeleton_horse.json

@@ -5,24 +5,7 @@
             "entries": [
                 {
                     "type": "item",
-                    "name": "minecraft:bone",
+                    "name": "minecraft:bone"
-                    "weight": 1,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 0,
-                                "max": 2
-                            }
-                        },
-                        {
-                            "function": "looting_enchant",
-                            "count": {
-                                "min": 0,
-                                "max": 1
-                            }
-                        }
-                    ]
                 }
             ]
         }

assets/minecraft/loot_tables/entities/villager.json

@@ -1 +0,0 @@
-{}

assets/minecraft/loot_tables/entities/vindication_illager.json

@@ -1,35 +0,0 @@
-{
-  "pools": [
-    {
-        "rolls": 1,
-        "entries": [
-            {
-                "type": "item",
-                "name": "minecraft:emerald",
-                "weight": 1,
-                "functions": [
-                    {
-                        "function": "set_count",
-                        "count": {
-                            "min": 0,
-                            "max": 1
-                        }
-                    },
-                    {
-                        "function": "looting_enchant",
-                        "count": {
-                            "min": 0,
-                            "max": 1
-                        }
-                    }
-                ]
-            }
-        ],
-        "conditions": [
-            {
-                "condition": "killed_by_player"
-            }
-        ]
-    }
-  ]
-}

assets/minecraft/loot_tables/entities/zombie_horse.json

@@ -5,24 +5,7 @@
             "entries": [
                 {
                     "type": "item",
-                    "name": "minecraft:rotten_flesh",
+                    "name": "minecraft:rotten_flesh"
-                    "weight": 1,
-                    "functions": [
-                        {
-                            "function": "set_count",
-                            "count": {
-                                "min": 0,
-                                "max": 2
-                            }
-                        },
-                        {
-                            "function": "looting_enchant",
-                            "count": {
-                                "min": 0,
-                                "max": 1
-                            }
-                        }
-                    ]
                 }
             ]
         }

assets/minecraft/loot_tables/gameplay/fishing/junk.json

@@ -30,13 +30,7 @@
                 {
                     "type": "item",
                     "name": "minecraft:potion",
-                    "weight": 10,
+                    "weight": 10
-                    "functions": [
-                        {
-                            "function": "set_nbt",
-                            "tag": "{Potion:\"minecraft:water\"}"
-                        }
-                    ]
                 },
                 {
                     "type": "item",
@@ -70,15 +64,11 @@
                 {
                     "type": "item",
                     "name": "minecraft:dye",
-                    "weight": 1,
+                    "weight": 10,
                     "functions": [
                         {
                             "function": "set_data",
                             "data": 0
-                        },
-                        {
-                            "function": "set_count",
-                            "count": 10
                         }
                     ]
                 },
@@ -95,4 +85,4 @@
             ]
         }
     ]
-}
+}

assets/minecraft/models/block/cobblestone_wall_ne.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ne",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}

assets/minecraft/models/block/cobblestone_wall_ns.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}

assets/minecraft/models/block/cobblestone_wall_ns_above.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_ns_above",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}

assets/minecraft/models/block/cobblestone_wall_nse.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nse",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}

assets/minecraft/models/block/cobblestone_wall_nsew.json

@@ -0,0 +1,6 @@
+{
+    "parent": "block/wall_nsew",
+    "textures": {
+        "wall": "blocks/cobblestone"
+    }
+}

assets/minecraft/models/block/column_side.json

@@ -1,22 +1,17 @@
 {
-    "parent": "block/block",
     "textures": {
-        "bottom": "blocks/observer_back",
+        "particle": "#side"
-        "side": "blocks/observer_side",
-        "top": "blocks/observer_top",
-        "front": "blocks/observer_front",
-        "particle": "blocks/observer_front"
     },
     "elements": [
         {   "from": [ 0, 0, 0 ],
             "to": [ 16, 16, 16 ],
             "faces": {
-                "down":  { "uv": [ 0, 16, 16, 0 ], "texture": "#top", "cullface": "down" },
+                "down":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "down" },
-                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
+                "up":    { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "up" },
-                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#front", "cullface": "north" },
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "north" },
-                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "south" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#end", "cullface": "south" },
-                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
+                "west":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west", "rotation": 270 },
-                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
+                "east":  { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east", "rotation": 90 }
             }
         }
     ]

assets/minecraft/models/item/black_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/blue_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/brown_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/cyan_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/filled_map.json

@@ -1,7 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "items/map_filled",
+        "layer0": "items/map_filled"
-        "layer1": "items/map_filled_markings"
     }
 }

assets/minecraft/models/item/gray_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/green_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/light_blue_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/lime_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/lit_furnace.json

@@ -0,0 +1,3 @@
+{
+    "parent": "block/lit_furnace"
+}

assets/minecraft/models/item/magenta_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/observer.json

@@ -1,3 +0,0 @@
-{
-    "parent": "block/observer"
-}

assets/minecraft/models/item/old_wood_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "block/half_slab_oak"
+}

assets/minecraft/models/item/orange_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/pink_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/purple_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/red_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/shulker_box.json

@@ -1,35 +0,0 @@
-{
-    "parent": "builtin/entity",
-    "display": {
-        "gui": {
-            "rotation": [ 30, 45, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.625, 0.625, 0.625 ]
-        },
-        "ground": {
-            "rotation": [ 0, 0, 0 ],
-            "translation": [ 0, 3, 0],
-            "scale":[ 0.25, 0.25, 0.25 ]
-        },
-        "head": {
-            "rotation": [ 0, 180, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 1, 1, 1]
-        },
-        "fixed": {
-            "rotation": [ 0, 180, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale":[ 0.5, 0.5, 0.5 ]
-        },
-        "thirdperson_righthand": {
-            "rotation": [ 75, 315, 0 ],
-            "translation": [ 0, 2.5, 0],
-            "scale": [ 0.375, 0.375, 0.375 ]
-        },
-        "firstperson_righthand": {
-            "rotation": [ 0, 315, 0 ],
-            "translation": [ 0, 0, 0],
-            "scale": [ 0.4, 0.4, 0.4 ]
-        }
-    }
-}

assets/minecraft/models/item/shulker_shell.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "items/shulker_shell"
-    }
-}

assets/minecraft/models/item/silver_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/totem.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "items/totem"
-    }
-}

assets/minecraft/models/item/white_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}

assets/minecraft/models/item/wood_old_slab.json

@@ -0,0 +1,3 @@
+{
+    "parent": "block/half_slab_oak"
+}

assets/minecraft/models/item/yellow_shulker_box.json

@@ -1,3 +0,0 @@
-{
-    "parent": "item/shulker_box"
-}