Skip to content

Commit 536e6be

Browse files
MrbyscoMrbysco
authored
Merge pull request #8 from Mrbysco/implement_replacement
Implement Replacement upgrade
2 parents cc0b078 + 007775a commit 536e6be

29 files changed

+753
-11
lines changed

‎src/generated/resources/assets/constructionstick/lang/en_us.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"constructionstick.description.template_angel": "The angel upgrade places a block on the opposite side of the block (or row of blocks) you are facing. Maximum distance depends on stick tier. Right click empty space to place a block in midair. To do that, you'll need to have the block you want to place in your offhand.",
77
"constructionstick.description.template_battery": "The battery upgrade allows you to use energy instead of durability. The stick will have the ability to store energy and use it to place blocks. Warning, you can only charge the stick if you have a mod that provides a way to do so.",
88
"constructionstick.description.template_destruction": "The destruction upgrade destroys blocks (no block entities) on the side facing you. Maximum number of blocks depends on stick tier. Destroyed blocks disappear into the void, you can use the undo feature if you've made a mistake.",
9+
"constructionstick.description.template_replacement": "The replacement upgrade allows you to exchange blocks with the block of the type you are holding in your offhand. This can be useful for replacing walls after placement.",
910
"constructionstick.description.template_unbreakable": "The unbreakable upgrade allows you to place blocks without using durability. The stick will never break.",
1011
"constructionstick.description.upgrade": "§5§nINSTALLATION§0§r\nPut your new upgrade template together with your stick and the required item in a Smithing Table to apply (Check the Smithing Table recipes to see the required item). To switch between upgrades, press the bound %s key while holding your stick or use the option screen.",
1112
"constructionstick.networking.query_undo.failed": "Failed to undo operation: %s",
@@ -53,6 +54,8 @@
5354
"constructionstick.option.upgrades.constructionstick:upgrade_battery.desc": "Use energy instead of durability",
5455
"constructionstick.option.upgrades.constructionstick:upgrade_destruction": "§cDestruction",
5556
"constructionstick.option.upgrades.constructionstick:upgrade_destruction.desc": "Destroys blocks on the side facing you",
57+
"constructionstick.option.upgrades.constructionstick:upgrade_replacement": "§5Replacemente",
58+
"constructionstick.option.upgrades.constructionstick:upgrade_replacement.desc": "Replaces blocks with the block in your offhand",
5659
"constructionstick.option.upgrades.constructionstick:upgrade_unbreakable": "§dUnbreakable",
5760
"constructionstick.option.upgrades.constructionstick:upgrade_unbreakable.desc": "Allows placing without using durability",
5861
"constructionstick.tooltip.blocks": "Max. %d blocks",
@@ -67,6 +70,7 @@
6770
"item.constructionstick.template_angel": "Angel Stick Template",
6871
"item.constructionstick.template_battery": "Battery Template",
6972
"item.constructionstick.template_destruction": "Destruction Stick Template",
73+
"item.constructionstick.template_replacement": "Replacement Stick Template",
7074
"item.constructionstick.template_unbreakable": "Unbreakable Template",
7175
"item.constructionstick.wooden_stick": "Stickiest Stick",
7276
"itemGroup.constructionstick.tab": "Construction Sticks",

‎src/generated/resources/assets/constructionstick/models/item/template_replacement.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "constructionstick:item/template_replacement"
5+
}
6+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/misc/template_replacement.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_item": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "constructionstick:template_replacement"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_item"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"constructionstick:template_replacement"
30+
]
31+
}
32+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/tools/smithing_upgrade/copper_stick_with_template_replacement.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_addition": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_stick": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "constructionstick:template_replacement"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
24+
"has_template": {
25+
"conditions": {
26+
"items": [
27+
{
28+
"items": "constructionstick:template_replacement"
29+
}
30+
]
31+
},
32+
"trigger": "minecraft:inventory_changed"
33+
},
34+
"has_the_recipe": {
35+
"conditions": {
36+
"recipe": "constructionstick:smithing_upgrade/copper_stick_with_template_replacement"
37+
},
38+
"trigger": "minecraft:recipe_unlocked"
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"has_the_recipe",
44+
"has_template",
45+
"has_stick",
46+
"has_addition"
47+
]
48+
],
49+
"rewards": {
50+
"recipes": [
51+
"constructionstick:smithing_upgrade/copper_stick_with_template_replacement"
52+
]
53+
}
54+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/tools/smithing_upgrade/diamond_stick_with_template_replacement.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_addition": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_stick": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "constructionstick:template_replacement"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
24+
"has_template": {
25+
"conditions": {
26+
"items": [
27+
{
28+
"items": "constructionstick:template_replacement"
29+
}
30+
]
31+
},
32+
"trigger": "minecraft:inventory_changed"
33+
},
34+
"has_the_recipe": {
35+
"conditions": {
36+
"recipe": "constructionstick:smithing_upgrade/diamond_stick_with_template_replacement"
37+
},
38+
"trigger": "minecraft:recipe_unlocked"
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"has_the_recipe",
44+
"has_template",
45+
"has_stick",
46+
"has_addition"
47+
]
48+
],
49+
"rewards": {
50+
"recipes": [
51+
"constructionstick:smithing_upgrade/diamond_stick_with_template_replacement"
52+
]
53+
}
54+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/tools/smithing_upgrade/iron_stick_with_template_replacement.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_addition": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_stick": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "constructionstick:template_replacement"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
24+
"has_template": {
25+
"conditions": {
26+
"items": [
27+
{
28+
"items": "constructionstick:template_replacement"
29+
}
30+
]
31+
},
32+
"trigger": "minecraft:inventory_changed"
33+
},
34+
"has_the_recipe": {
35+
"conditions": {
36+
"recipe": "constructionstick:smithing_upgrade/iron_stick_with_template_replacement"
37+
},
38+
"trigger": "minecraft:recipe_unlocked"
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"has_the_recipe",
44+
"has_template",
45+
"has_stick",
46+
"has_addition"
47+
]
48+
],
49+
"rewards": {
50+
"recipes": [
51+
"constructionstick:smithing_upgrade/iron_stick_with_template_replacement"
52+
]
53+
}
54+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/tools/smithing_upgrade/netherite_stick_with_template_replacement.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_addition": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_stick": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "constructionstick:template_replacement"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
24+
"has_template": {
25+
"conditions": {
26+
"items": [
27+
{
28+
"items": "constructionstick:template_replacement"
29+
}
30+
]
31+
},
32+
"trigger": "minecraft:inventory_changed"
33+
},
34+
"has_the_recipe": {
35+
"conditions": {
36+
"recipe": "constructionstick:smithing_upgrade/netherite_stick_with_template_replacement"
37+
},
38+
"trigger": "minecraft:recipe_unlocked"
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"has_the_recipe",
44+
"has_template",
45+
"has_stick",
46+
"has_addition"
47+
]
48+
],
49+
"rewards": {
50+
"recipes": [
51+
"constructionstick:smithing_upgrade/netherite_stick_with_template_replacement"
52+
]
53+
}
54+
}

‎src/generated/resources/data/constructionstick/advancement/recipes/tools/smithing_upgrade/wooden_stick_with_template_replacement.json‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_addition": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "#c:ender_pearls"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_stick": {
15+
"conditions": {
16+
"items": [
17+
{
18+
"items": "constructionstick:template_replacement"
19+
}
20+
]
21+
},
22+
"trigger": "minecraft:inventory_changed"
23+
},
24+
"has_template": {
25+
"conditions": {
26+
"items": [
27+
{
28+
"items": "constructionstick:template_replacement"
29+
}
30+
]
31+
},
32+
"trigger": "minecraft:inventory_changed"
33+
},
34+
"has_the_recipe": {
35+
"conditions": {
36+
"recipe": "constructionstick:smithing_upgrade/wooden_stick_with_template_replacement"
37+
},
38+
"trigger": "minecraft:recipe_unlocked"
39+
}
40+
},
41+
"requirements": [
42+
[
43+
"has_the_recipe",
44+
"has_template",
45+
"has_stick",
46+
"has_addition"
47+
]
48+
],
49+
"rewards": {
50+
"recipes": [
51+
"constructionstick:smithing_upgrade/wooden_stick_with_template_replacement"
52+
]
53+
}
54+
}

‎src/generated/resources/data/constructionstick/recipe/smithing_upgrade/copper_stick_with_template_replacement.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "constructionstick:smithing_upgrade",
3+
"addition": {
4+
"tag": "c:ender_pearls"
5+
},
6+
"base": {
7+
"item": "constructionstick:copper_stick"
8+
},
9+
"result": {
10+
"components": {
11+
"constructionstick:replacement": true
12+
},
13+
"count": 1,
14+
"id": "constructionstick:copper_stick"
15+
},
16+
"template": {
17+
"item": "constructionstick:template_replacement"
18+
},
19+
"upgrade": "constructionstick:upgrade_replacement"
20+
}

‎src/generated/resources/data/constructionstick/recipe/smithing_upgrade/diamond_stick_with_template_replacement.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"type": "constructionstick:smithing_upgrade",
3+
"addition": {
4+
"tag": "c:ender_pearls"
5+
},
6+
"base": {
7+
"item": "constructionstick:diamond_stick"
8+
},
9+
"result": {
10+
"components": {
11+
"constructionstick:replacement": true
12+
},
13+
"count": 1,
14+
"id": "constructionstick:diamond_stick"
15+
},
16+
"template": {
17+
"item": "constructionstick:template_replacement"
18+
},
19+
"upgrade": "constructionstick:upgrade_replacement"
20+
}

0 commit comments

Comments
 (0)