Skip to content

Commit

Permalink
Fixes:
Browse files Browse the repository at this point in the history
- boreal log loot table
- stone wall lang
- full grass block given silk touch loot table
- all current mod items were given proper required tool

Additions:
- netherite horse armor item
  • Loading branch information
Jiingy committed Aug 23, 2021
1 parent 6f99ab6 commit a275a88
Show file tree
Hide file tree
Showing 11 changed files with 150 additions and 6 deletions.
1 change: 1 addition & 0 deletions src/main/java/jingy/jineric/items/JinericItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public class JinericItems {

//MISCELLANEOUS
public static final Item SALT = register("salt", new Item(JinericItemSettings.Misc().group(JinericItemGroups.MISCELLANEOUS)));
public static final Item NETHERITE_HORSE_ARMOR = register("netherite_horse_armor", new Item(JinericItemSettings.Misc().group(JinericItemGroups.MISCELLANEOUS)));

// FOODS

Expand Down
1 change: 1 addition & 0 deletions src/main/resources/assets/jineric/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
"block.jineric.obsidian_slab": "Obsidian Slab",
"block.jineric.obsidian_stairs": "Obsidian Stairs",
"block.jineric.obsidian_wall": "Obsidian Wall",
"block.jineric.stone_wall": "Stone Wall",
"block.jineric.soul_jack_o_lantern": "Soul Jack o'Lantern",
"block.jineric.salt_block": "Salt Block",
"block.jineric.sugar_block": "Sugar Block",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "jineric:item/netherite_horse_armor"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"entries": [
{
"type": "minecraft:item",
"name": "jineric:boreal_log_pillar"
"name": "jineric:boreal_log"
}
]
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,44 @@
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "jineric:full_grass_block"
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
],
"name": "jineric:full_grass_block"
},
{
"type": "minecraft:item",
"functions": [
{
"function": "minecraft:set_count",
"count": 1
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:dirt"
}
]
}
]
}
]
}

Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"replace": false,
"values": [
"jineric:bamboo_block"
"jineric:bamboo_block",
"jineric:soul_jack_o_lantern",

"jineric:boreal_log",
"jineric:boreal_planks",
"jineric:boreal_stairs",
"jineric:boreal_slab",
"jineric:boreal_fence"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"jineric:rotten_flesh_block"
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,86 @@
{
"replace": false,
"values": [
"jineric:charcoal_block",
"jineric:flint_block",
"jineric:packed_ice_stairs",
"jineric:packed_ice_slab",
"jineric:packed_ice_wall",

"jineric:siltstone",
"jineric:siltstone_stairs",
"jineric:siltstone_slab",
"jineric:siltstone_wall",
"jineric:polished_siltstone",
"jineric:polished_siltstone_stairs",
"jineric:polished_siltstone_slab",
"jineric:polished_siltstone_wall",
"jineric:slate",
"jineric:slate_stairs",
"jineric:slate_slab",
"jineric:slate_wall",
"jineric:borite",
"jineric:borite_stairs",
"jineric:borite_slab",
"jineric:borite_wall",
"jineric:obsidian_stairs",
"jineric:obsidian_slab",
"jineric:cracked_stone_brick_stairs",
"jineric:cracked_stone_brick_slab",
"jineric:smooth_stone_stairs",
"jineric:smooth_stone_wall",

"jineric:soul_sandstone",
"jineric:soul_sandstone_stairs",
"jineric:soul_sandstone_slab",
"jineric:soul_sandstone_wall",
"jineric:cut_soul_sandstone",
"jineric:cut_soul_sandstone_stairs",
"jineric:cut_soul_sandstone_slab",
"jineric:cut_soul_sandstone_wall",
"jineric:polished_soul_sandstone",
"jineric:polished_soul_sandstone_stairs",
"jineric:polished_soul_sandstone_slab",
"jineric:polished_soul_sandstone_wall",
"jineric:chiseled_soul_sandstone",
"jineric:chiseled_soul_sandstone_stairs",
"jineric:chiseled_soul_sandstone_slab",
"jineric:chiseled_soul_sandstone_wall",
"jineric:smooth_soul_sandstone",
"jineric:smooth_soul_sandstone_stairs",
"jineric:smooth_soul_sandstone_slab",
"jineric:smooth_soul_sandstone_wall",
"jineric:wavy_soul_sandstone",
"jineric:wavy_soul_sandstone_stairs",
"jineric:wavy_soul_sandstone_slab",
"jineric:wavy_soul_sandstone_wall",

"jineric:polished_sandstone",
"jineric:polished_sandstone_stairs",
"jineric:polished_sandstone_slab",
"jineric:polished_sandstone_wall",
"jineric:wavy_sandstone",
"jineric:wavy_sandstone_stairs",
"jineric:wavy_sandstone_slab",
"jineric:wavy_sandstone_wall",
"jineric:chiseled_sandstone_stairs",
"jineric:chiseled_sandstone_slab",
"jineric:chiseled_sandstone_wall",
"jineric:cut_sandstone_stairs",
"jineric:cut_sandstone_wall",

"jineric:polished_red_sandstone",
"jineric:polished_red_sandstone_stairs",
"jineric:polished_red_sandstone_slab",
"jineric:polished_red_sandstone_wall",
"jineric:wavy_red_sandstone",
"jineric:wavy_red_sandstone_stairs",
"jineric:wavy_red_sandstone_slab",
"jineric:wavy_red_sandstone_wall",
"jineric:chiseled_red_sandstone_stairs",
"jineric:chiseled_red_sandstone_slab",
"jineric:chiseled_red_sandstone_wall",
"jineric:cut_red_sandstone_stairs",
"jineric:cut_red_sandstone_wall"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"jineric:tumbleweed"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
"replace": false,
"values": [
"jineric:snow_wall",
"jineric:salt_block"
"jineric:salt_block",
"jineric:sugar_block",
"jineric:full_grass_block"
]
}

0 comments on commit a275a88

Please sign in to comment.