Skip to content

Commit

Permalink
Fixed missing metal tool recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
TonyLiberatto committed Jun 16, 2019
1 parent 9b87573 commit 98c2472
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 19 deletions.
18 changes: 10 additions & 8 deletions Neolithic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -390,12 +390,17 @@
<None Include="bin\TheNeolithicMod\assets\game\recipes\cooking\meatystew.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\cooking\soup.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\beenade.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\claybrickstairs.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\cobblestairs.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\oillampfire.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\oillampbrown.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\oillampblue.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\oillampred.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\plankstairs.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\poultice.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\axe-metal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\stonebrickstairs.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\stonepathstairs.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\axe.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone-primitive-arrowhead.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone\leatherstrip\primitive-adze-leatherstrip.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone\leatherstrip\primitive-arrow-leatherstrip.json" />
Expand Down Expand Up @@ -427,13 +432,10 @@
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone\sisal\primitive-shovel-sisal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone\sisal\primitive-sickle-sisal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\bone\sisal\primitive-spear-sisal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\knife-metal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\primitive-sword-blue.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\primitive-sword-brown.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\primitive-sword-fire.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\primitive-sword-red.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\shovel-metal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\spear-metal.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\knife.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\shovel.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\spear.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\sword.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\wood\leatherstrip\primitive-adze-andesite-wood-2.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\wood\leatherstrip\primitive-adze-basalt-wood-2.json" />
<None Include="bin\TheNeolithicMod\assets\game\recipes\grid\tool\wood\leatherstrip\primitive-adze-flint-wood-2.json" />
Expand Down
Binary file modified bin/TheNeolithicMod/Neolithic.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions bin/TheNeolithicMod/assets/game/itemtypes/tool/knife.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
}
},
variantgroups: [
{ code: "material", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ] },
{ code: "metal", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ] },
],
shape: { base: "game:item/tool/knife" },
heldTpHitAnimation: "breaktool",
textures: {
"metal": { base: "game:item/tool/material/{material}" },
"metal": { base: "game:item/tool/material/{metal}" },
"wood": { base: "game:item/tool/material/wood" }
},
durabilitybytype: {
Expand Down
4 changes: 2 additions & 2 deletions bin/TheNeolithicMod/assets/game/itemtypes/tool/shovel.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
}
},
variantgroups: [
{ code: "material", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ] },
{ code: "metal", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ] },
],
tool: "shovel",
damagedby: ["blockbreaking", "attacking"],
shape: { base: "game:item/tool/shovel" },
heldTpHitAnimation: "shoveldig",
textures: {
"metal": { base: "game:item/tool/material/{material}" },
"metal": { base: "game:item/tool/material/{metal}" },
"wood": { base: "game:item/tool/material/wood" }
},
miningspeedbytype: {
Expand Down
4 changes: 2 additions & 2 deletions bin/TheNeolithicMod/assets/game/itemtypes/tool/spear.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
damagedby: ["attacking"],
tool: "spear",
variantgroups: [
{ code: "material", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron"] },
{ code: "metal", states: ["copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron"] },
],
shape: { base: "item/tool/spear" },
heldTpHitAnimation: "spearhit",
textures: {
"metal": { base: "item/tool/material/{material}" },
"metal": { base: "item/tool/material/{metal}" },
"wood": { base: "item/tool/material/wood" }
},
attackRange: 3.5,
Expand Down
10 changes: 10 additions & 0 deletions bin/TheNeolithicMod/assets/game/recipes/grid/tool/axe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
ingredientPattern: "T S",
ingredients: {
"T": { type: "item", code: "axehead-*", allowedVariants: [ "copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ], name: "metal" },
"S": {type: "block", code: "neolithicmod:branch-very-thin-*-debarked-ud" },
},
width: 1,
height: 2,
output: { type: "item", code: "axe-{metal}", quantity: 1 }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
ingredientPattern: "K B",
ingredients: {
"K": { type: "item", code: "game:knife*", isTool: true },
"B": { type: "item", code: "neolithicmod:animal-large-bone" , quantity:1, isTool: false}
},
width: 1,
height: 2,
shapeless: false,
output: { type: "item", code: "primitive-arrowhead-bone", quantity: 8 }
}
10 changes: 10 additions & 0 deletions bin/TheNeolithicMod/assets/game/recipes/grid/tool/knife.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
ingredientPattern: "T S",
ingredients: {
"T": { type: "item", code: "knifeblade-*", allowedVariants: [ "copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ], name: "metal" },
"S": {type: "block", code: "neolithicmod:branch-very-thin-*-debarked-ud" },
},
width: 1,
height: 2,
output: { type: "item", code: "knife-{metal}", quantity: 1 }
}
10 changes: 10 additions & 0 deletions bin/TheNeolithicMod/assets/game/recipes/grid/tool/shovel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
ingredientPattern: "T S",
ingredients: {
"T": { type: "item", code: "shovelhead-*", allowedVariants: [ "copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ], name: "metal" },
"S": {type: "block", code: "neolithicmod:branch-very-thin-*-debarked-ud" },
},
width: 1,
height: 2,
output: { type: "item", code: "shovel-{metal}", quantity: 1 }
}
10 changes: 10 additions & 0 deletions bin/TheNeolithicMod/assets/game/recipes/grid/tool/spear.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
ingredientPattern: "T S",
ingredients: {
"T": { type: "item", code: "spearhead-*", allowedVariants: [ "copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ], name: "metal" },
"S": {type: "block", code: "neolithicmod:branch-very-thin-*-debarked-ud" },
},
width: 1,
height: 2,
output: { type: "item", code: "spear-{metal}", quantity: 1 }
}
10 changes: 10 additions & 0 deletions bin/TheNeolithicMod/assets/game/recipes/grid/tool/sword.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
ingredientPattern: "T S",
ingredients: {
"T": { type: "item", code: "swordblade-*", allowedVariants: [ "copper", "tinbronze", "bismuthbronze", "blackbronze", "gold", "silver", "iron" ], name: "metal" },
"S": {type: "block", code: "neolithicmod:branch-very-thin-*-debarked-ud" },
},
width: 1,
height: 2,
output: { type: "item", code: "sword-{metal}", quantity: 1 }
}
4 changes: 0 additions & 4 deletions bin/TheNeolithicMod/assets/neolithicmod/patches/recipes.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
[
{ file: "game:recipes/grid/oillamp", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/stackedbamboo", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/tool/spear", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/chest", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/chest-labeled", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/door", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/chair", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/table", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/tool/axe", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/tool/knife", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/tool/shovel", op: "add", path: "/enabled", value: "false" },
{ file: "game:recipes/grid/firewood", op: "add", path: "/0/enabled", value: "false" },
{ file: "game:recipes/grid/firewood", op: "add", path: "/1/enabled", value: "false" },
]
2 changes: 1 addition & 1 deletion bin/TheNeolithicMod/modinfo.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"website": "https://github.com/TonyLiberatto/The-Neolithic-Mod",
"authors": [ "Tony Liberatto","Novocain","Balduranne","BunnyViking" ],
"contributors": ["Tyron", "Milo", "Stroam","Elwood","copygirl", "MarcAFK"],
"version": "1.9.7",
"version": "2.0.1",
"dependencies": {
"carrycapacity": "0.4.3",
"game": "1.9.10",
Expand Down

0 comments on commit 98c2472

Please sign in to comment.