Skip to content

Commit

Permalink
add tin tools
Browse files Browse the repository at this point in the history
  • Loading branch information
AlasDiablo committed Jul 19, 2020
1 parent 526a1e6 commit a158189
Show file tree
Hide file tree
Showing 38 changed files with 766 additions and 25 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ apply plugin: 'eclipse'
apply plugin: 'maven-publish'
apply plugin: "com.wynprice.cursemaven"

version = '4.2.0.43-experimental'
version = '4.2.1.44-experimental'
group = 'fr.alasdiablo.janoeo.arsenal'
archivesBaseName = 'Janoeo-Arsenal'

Expand Down
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 4.2.1.44-experimental
+ add tin tools

### 4.2.0.43-experimental
+ add compatibility with Janoeo 4.4.0.42-experimental
+ internal code rework
Expand Down
10 changes: 10 additions & 0 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ ce95be3bb4eab2b4ebc58eb21e40909ae11b3807 data/janoeo_arsenal/advancements/recipe
825d43f6fbd0fac0102e3ebaddc8cbec7f3840c2 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_pickaxe.json
037d7cb0cc079f6e6393e69f214821fdffde4e61 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_shovel.json
5e16d8cf1c0b79fda5b47fad1b17c3e08b738093 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/copper_sword.json
af1bb0e0622bcbed1ced85bd6932d88e8ddb898c data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_axe.json
a075e73361a373a498ba1143ae05c931e3d1b17a data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_hoe.json
43162436afa1326d81fc87e8764a8ebe82fdb88b data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_pickaxe.json
a55cadce6556c5d8b160d2bb235711cfdb5fc1c0 data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_shovel.json
f5a06fd38f2f8bbf86f7840795c6e24cbf200bfd data/janoeo_arsenal/advancements/recipes/janoeo.tool.group/tin_sword.json
fe4dd01e7204deb70a789274b9b41f4a76dcbee1 data/janoeo_arsenal/recipes/aluminium_axe.json
51e5e565863e2db621e63af5425974dbfc4292ae data/janoeo_arsenal/recipes/aluminium_boots.json
d0110ec2a336e596c7e9c3d6db03e5b1d4787d2c data/janoeo_arsenal/recipes/aluminium_chestplate.json
Expand Down Expand Up @@ -178,10 +183,15 @@ b588ca59242a963e4a6e7947e94f94fe55956aef data/janoeo_arsenal/recipes/silver_boot
08a5d1890fc080019c6841b8c9b35afc3bd6612f data/janoeo_arsenal/recipes/silver_chestplate.json
2a70519ea0424363a13cb44481b98f94c220df85 data/janoeo_arsenal/recipes/silver_helmet.json
7e208f2c9f23481eaeef444b30abbd831a3d1ae0 data/janoeo_arsenal/recipes/silver_leggings.json
9fc0884a6e1d28bdbe16890559e68528cf6fa3c4 data/janoeo_arsenal/recipes/tin_axe.json
d57dc5a2947e7d8ee7f8f48b619a1c424af744cd data/janoeo_arsenal/recipes/tin_boots.json
490fa8e1e51c6f208cc2ef3772649b2cae4b152a data/janoeo_arsenal/recipes/tin_chestplate.json
4bf5dcdcf8cbdafd4fe0b9d01b5e4dc6e321a407 data/janoeo_arsenal/recipes/tin_helmet.json
eeaf781036cfe0cea521e2bdc4981bbf4f5640c2 data/janoeo_arsenal/recipes/tin_hoe.json
0f8b765ed08676de22b5dfd24dd7c34bc986345c data/janoeo_arsenal/recipes/tin_leggings.json
308e9b7ea8da4aa37a8886332ba9a6d0854c451b data/janoeo_arsenal/recipes/tin_pickaxe.json
3dbd7a435ca5b7c56fe72dc010ccfb58e40c3226 data/janoeo_arsenal/recipes/tin_shovel.json
0f19b73abe0f02ca8a5d50891c1c00a8cf23ef47 data/janoeo_arsenal/recipes/tin_sword.json
63b1195881a3145257726f9730d46029e3309c9f data/janoeo_arsenal/recipes/uranium_boots.json
fa8c8682e181abe5329228bc0cc2a23f720f7fe5 data/janoeo_arsenal/recipes/uranium_chestplate.json
2dadc4ecc1eb6fdbc59f406ee5480380933794a1 data/janoeo_arsenal/recipes/uranium_helmet.json
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"janoeo_arsenal:tin_axe"
]
},
"criteria": {
"has_tin": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:ingots/tin"
}
]
}
},
"has_stick": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:rods/wooden"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "janoeo_arsenal:tin_axe"
}
}
},
"requirements": [
[
"has_tin",
"has_stick",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"janoeo_arsenal:tin_hoe"
]
},
"criteria": {
"has_tin": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:ingots/tin"
}
]
}
},
"has_stick": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:rods/wooden"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "janoeo_arsenal:tin_hoe"
}
}
},
"requirements": [
[
"has_tin",
"has_stick",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"janoeo_arsenal:tin_pickaxe"
]
},
"criteria": {
"has_tin": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:ingots/tin"
}
]
}
},
"has_stick": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:rods/wooden"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "janoeo_arsenal:tin_pickaxe"
}
}
},
"requirements": [
[
"has_tin",
"has_stick",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"janoeo_arsenal:tin_shovel"
]
},
"criteria": {
"has_tin": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:ingots/tin"
}
]
}
},
"has_stick": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:rods/wooden"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "janoeo_arsenal:tin_shovel"
}
}
},
"requirements": [
[
"has_tin",
"has_stick",
"has_the_recipe"
]
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"janoeo_arsenal:tin_sword"
]
},
"criteria": {
"has_tin": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:ingots/tin"
}
]
}
},
"has_stick": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "forge:rods/wooden"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "janoeo_arsenal:tin_sword"
}
}
},
"requirements": [
[
"has_tin",
"has_stick",
"has_the_recipe"
]
]
}
19 changes: 19 additions & 0 deletions src/generated/resources/data/janoeo_arsenal/recipes/tin_axe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AA",
"AS",
" S"
],
"key": {
"A": {
"tag": "forge:ingots/tin"
},
"S": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "janoeo_arsenal:tin_axe"
}
}
19 changes: 19 additions & 0 deletions src/generated/resources/data/janoeo_arsenal/recipes/tin_hoe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AA",
" S",
" S"
],
"key": {
"A": {
"tag": "forge:ingots/tin"
},
"S": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "janoeo_arsenal:tin_hoe"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"AAA",
" S ",
" S "
],
"key": {
"A": {
"tag": "forge:ingots/tin"
},
"S": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "janoeo_arsenal:tin_pickaxe"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"A",
"S",
"S"
],
"key": {
"A": {
"tag": "forge:ingots/tin"
},
"S": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "janoeo_arsenal:tin_shovel"
}
}
19 changes: 19 additions & 0 deletions src/generated/resources/data/janoeo_arsenal/recipes/tin_sword.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"C",
"C",
"S"
],
"key": {
"C": {
"tag": "forge:ingots/tin"
},
"S": {
"tag": "forge:rods/wooden"
}
},
"result": {
"item": "janoeo_arsenal:tin_sword"
}
}
Loading

0 comments on commit a158189

Please sign in to comment.