Compare commits

..

No commits in common. "main" and "1.0.2" have entirely different histories.
main ... 1.0.2

16 changed files with 209 additions and 120 deletions

View file

@ -45,6 +45,5 @@
"tetra.material.feature.rose_gold.tooltip": "Rose Gold", "tetra.material.feature.rose_gold.tooltip": "Rose Gold",
"tetra.material.rose_gold": "Rose Gold", "tetra.material.rose_gold": "Rose Gold",
"tetra.material.rose_gold.prefix": "Rose Gold", "tetra.material.rose_gold.prefix": "Rose Gold",
"tetra.material.hide": "Leather Strip", "tetra.material.hide": "Leather Strip"
"tetra.stats.janking.tooltip": "Breaking a block or killing an entity will teleport the loot to the wielder, affects items and experience orbs within a §e%s§r block radius of the target."
} }

View file

@ -1,36 +1,56 @@
{ {
"type": "minecraft:block", "type": "minecraft:block",
"pools": [{ "pools": [{
"rolls": 1, "bonus_rolls": 0,
"entries": [{ "entries": [
"type": "minecraft:alternatives", {
"children": [ "type": "minecraft:alternatives",
{ "children": [
"type": "minecraft:item", {
"name": "minecraft:gravel", "type": "minecraft:item",
"conditions": [{ "conditions": [
"condition": "minecraft:match_tool", {
"predicate": {"enchantments": [{"enchantment": "minecraft:silk_touch", "levels": {"min": 1}}]} "condition": "minecraft:match_tool",
}] "predicate": {
}, "enchantments": [{
{ "enchantment": "minecraft:silk_touch",
"type": "minecraft:item", "levels": {"min": 1}
"name": "minecraft:gravel", }]
"conditions": [ }
{ }
"condition": "minecraft:any_of", ],
"terms": [ "name": "minecraft:gravel"
{"condition": "minecraft:match_tool", "predicate": {"tag": "minecraft:shovels"}}, },
{"condition": "minecraft:match_tool", "predicate": {"tag": "forge:tools/paxels"}} {
] "type": "minecraft:alternatives",
}, "children": [
{"condition": "minecraft:random_chance", "chance": 0.5} {
] "type": "minecraft:item",
}, "conditions": [
{"type": "minecraft:item", "name": "minecraft:flint"} {
], "chances": [
"conditions": [{"condition": "minecraft:survives_explosion"}] 0.1,
}] 0.14285715,
0.25,
1
],
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune"
}
],
"name": "minecraft:flint"
},
{
"type": "minecraft:item",
"name": "minecraft:flint"
}
],
"conditions": [{"condition": "minecraft:survives_explosion"}]
}
]
}
],
"rolls": 1
}], }],
"random_sequence": "minecraft:blocks/gravel" "random_sequence": "minecraft:blocks/gravel"
} }

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
" 11",
" 21",
" 3 "
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"},
"3":{"item":"minecraft:stick"}
},
"result": {
"item":"minecraft:diamond_axe"
},
"show_notification":true
}

View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"1 1",
"121"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"}
},
"result": {
"item":"minecraft:diamond_boots"
},
"show_notification":true
}

View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"121",
"111",
"111"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"}
},
"result": {
"item":"minecraft:diamond_chestplate"
},
"show_notification":true
}

View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"111",
"121"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"}
},
"result": {
"item":"minecraft:diamond_helmet"
},
"show_notification":true
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"11",
"23",
" 3"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"},
"3":{"item":"minecraft:stick"}
},
"result": {
"item":"minecraft:diamond_hoe"
},
"show_notification":true
}

View file

@ -0,0 +1,17 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"111",
"121",
"1 1"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"}
},
"result": {
"item":"minecraft:diamond_leggings"
},
"show_notification":true
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"121",
" 3 ",
" 3 "
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"},
"3":{"item":"minecraft:stick"}
},
"result": {
"item":"minecraft:diamond_pickaxe"
},
"show_notification":true
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"1",
"2",
"3"
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"},
"3":{"item":"minecraft:stick"}
},
"result": {
"item":"minecraft:diamond_shovel"
},
"show_notification":true
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:crafting_shaped",
"category":"equipment",
"pattern": [
"12",
"1 ",
"3 "
],
"key": {
"1":{"item":"minecraft:diamond"},
"2":{"item":"minecraft:magma_cream"},
"3":{"item":"minecraft:stick"}
},
"result": {
"item":"minecraft:diamond_sword"
},
"show_notification":true
}

View file

@ -1,28 +0,0 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
" S ",
"HXH",
" H "
],
"key": {
"S": {
"tag": "forge:string"
},
"X": {
"tag": "quark:seed_pouch_holdable"
},
"H": {
"item": "minecraft:rabbit_hide"
}
},
"result": {
"item": "quark:seed_pouch"
},
"conditions": [
{
"type": "quark:flag",
"flag": "seed_pouch"
}
]
}

View file

@ -1,32 +0,0 @@
[
{
"key": "break_geode_action",
"requirement": {"items": ["tetra:geode"]},
"requiredTools": {"hammer_dig": 4},
"lootTable": "tetra:actions/geode"
},
{
"key": "shatter_diamond_action",
"requirement": {"items": ["tetra:pristine_diamond"]},
"requiredTools": {"hammer_dig": 4},
"lootTable": "tetra:actions/shatter_diamond"
},
{
"key": "shatter_emerald_action",
"requirement": {"items": ["tetra:pristine_emerald"]},
"requiredTools": {"hammer_dig": 4},
"lootTable": "tetra:actions/shatter_emerald"
},
{
"key": "shatter_lapis_action",
"requirement": {"items": ["tetra:pristine_lapis"]},
"requiredTools": {"hammer_dig": 4},
"lootTable": "tetra:actions/shatter_lapis"
},
{
"key": "shatter_amethyst_action",
"requirement": {"items": ["tetra:pristine_amethyst"]},
"requiredTools": {"hammer_dig": 4},
"lootTable": "tetra:actions/shatter_amethyst"
}
]

View file

@ -9,7 +9,7 @@
"integrityCost": 1, "integrityCost": 1,
"integrityGain": 5, "integrityGain": 5,
"magicCapacity": 78, "magicCapacity": 78,
"toolLevel": 3, "toolLevel": 2,
"toolEfficiency": 5, "toolEfficiency": 5,
"tints": { "tints": {
"glyph": "copper_glyph", "glyph": "copper_glyph",

View file

@ -10,7 +10,7 @@
"integrityGain": 4, "integrityGain": 4,
"magicCapacity": 132, "magicCapacity": 132,
"toolLevel": 5, "toolLevel": 5,
"toolEfficiency": 8, "toolEfficiency": 12,
"tints": { "tints": {
"glyph": "gold_glyph", "glyph": "gold_glyph",
"texture": "gold" "texture": "gold"

View file

@ -1,26 +0,0 @@
{
"key": "socket_ender_pearl",
"hidden": true,
"category": "socket",
"primary": 0,
"secondary": 0,
"tertiary": 0,
"durability": 48,
"integrityCost": 1,
"integrityGain": 0,
"magicCapacity": 0,
"toolLevel": 0,
"toolEfficiency": 0,
"effects": {
"janking": [2, 0]
},
"tints": {
"glyph": "63eec9",
"texture": "63eec9"
},
"textures": ["default"],
"experienceCost": 2,
"material": {
"items": ["minecraft:ender_pearl"]
}
}