Skip to content

Commit

Permalink
Merge pull request #17 from ChristianSilvermoon/1.16.x-snapshots
Browse files Browse the repository at this point in the history 
1.16.x snapshots
  • Loading branch information
@ChristianSilvermoon
ChristianSilvermoon authored Jun 29, 2020
2 parents 19b18a5 + 89fc9a5 commit a0ea96d
Show file tree
Hide file tree
Showing 33 changed files with 360 additions and 104 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
# Change Log
This is the Changelog for all [Releases of The Strawberry Pack](https://github.com/ChristianSilvermoon/StrawberryPack/releases)

## v20.06.28 For Minecraft 1.16.x
Time to get the ball rolling for a new version!

#### Added
- Added support for 1.16.x Blocks
- Netherite Gear can be smelted for Netherite Scrap
- Lightning Griefing
- Fulgurite Structures
- Game rules to control new Lightning effects

#### Changed
- Weapons Master Advancement accounts for Netherite

### Fixed
- Spacing in Load Message
- Typo in Coordinate Saver Fail Message
- Sky Warp Effects playing in incorrect locations


## v20.02.19 For Minecraft 1.15.x
A little preformance boost alone warranted this release.
#### Added
Expand Down
65 changes: 65 additions & 0 deletions data/minecraft/loot_tables/blocks/nether_bricks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "minecraft:nether_bricks"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:golden_pickaxe"
}
}
]
}
],
"name": "minecraft:cracked_nether_bricks"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "minecraft:nether_bricks"
}
]
}
]
}
]
}
65 changes: 65 additions & 0 deletions data/minecraft/loot_tables/blocks/polished_blackstone_bricks.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "minecraft:polished_blackstone_bricks"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:golden_pickaxe"
}
}
]
}
],
"name": "minecraft:cracked_polished_blackstone_bricks"
},
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"name": "minecraft:polished_blackstone_bricks"
}
]
}
]
}
]
}
17 changes: 17 additions & 0 deletions data/minecraft/recipes/blackstone_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "crafting_shaped",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "minecraft:blackstone"
}
},
"result": {
"item": "minecraft:blackstone_stairs",
"count": 8
}
}
18 changes: 18 additions & 0 deletions data/minecraft/recipes/crimson_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_stairs",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "minecraft:crimson_planks"
}
},
"result": {
"item": "minecraft:crimson_stairs",
"count": 8
}
}
10 changes: 10 additions & 0 deletions data/minecraft/recipes/netherite_scrap.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"group": "netherite_scrap",
"ingredient": {
"tag": "strawberry:netherite_scrappable"
},
"result": "minecraft:netherite_scrap",
"experience": 2,
"cookingtime": 200
}
10 changes: 10 additions & 0 deletions data/minecraft/recipes/netherite_scrap_from_blasting.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"group": "netherite_scrap",
"ingredient": {
"tag": "strawberry:netherite_scrappable"
},
"result": "minecraft:netherite_scrap",
"experience": 2,
"cookingtime": 100
}
17 changes: 17 additions & 0 deletions data/minecraft/recipes/polished_blackstone_brick_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "crafting_shaped",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "minecraft:polished_blackstone_bricks"
}
},
"result": {
"item": "minecraft:polished_blackstone_brick_stairs",
"count": 8
}
}
17 changes: 17 additions & 0 deletions data/minecraft/recipes/polished_blackstone_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"type": "crafting_shaped",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "minecraft:polished_blackstone"
}
},
"result": {
"item": "minecraft:polished_blackstone_stairs",
"count": 8
}
}
19 changes: 0 additions & 19 deletions data/minecraft/recipes/stone_axe.json
View file

This file was deleted.

19 changes: 0 additions & 19 deletions data/minecraft/recipes/stone_hoe.json
View file

This file was deleted.

19 changes: 0 additions & 19 deletions data/minecraft/recipes/stone_pickaxe.json
View file

This file was deleted.

19 changes: 0 additions & 19 deletions data/minecraft/recipes/stone_shovel.json
View file

This file was deleted.

19 changes: 0 additions & 19 deletions data/minecraft/recipes/stone_sword.json
View file

This file was deleted.

18 changes: 18 additions & 0 deletions data/minecraft/recipes/warped_stairs.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"group": "wooden_stairs",
"pattern": [
"# ",
"## ",
"###"
],
"key": {
"#": {
"item": "minecraft:warped_planks"
}
},
"result": {
"item": "minecraft:warped_stairs",
"count": 8
}
}
4 changes: 1 addition & 3 deletions .../items/cobblestone_recipe_substitute.json → ...raft/tags/items/stone_tool_materials.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
"minecraft:granite",
"minecraft:andesite",
"minecraft:diorite",
"minecraft:polished_granite",
"minecraft:polished_andesite",
"minecraft:polished_diorite"
"minecraft:blackstone"
]
}
Loading

0 comments on commit a0ea96d

Please sign in to comment.