Skip to content

Commit

Permalink
feat: add spindleweight mold
Browse files Browse the repository at this point in the history
  • Loading branch information
hoersamu committed Aug 30, 2023
1 parent 630a75e commit dbba6e1
Show file tree
Hide file tree
Showing 14 changed files with 1,211 additions and 117 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -666,4 +666,9 @@ fabric.properties
### VisualStudio Patch ###
# Additional files built by Visual Studio

# End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider
# End of https://www.toptal.com/developers/gitignore/api/csharp,visualstudio,visualstudiocode,rider

# User-specific files

# Missing translations file generated by the vintage story
collectiblelang.json
124 changes: 124 additions & 0 deletions tailorsstory/assets/tailorsstory/blocktypes/toolmold.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"code": "tailors-toolmold",
"classByType": {
"tailors-toolmold-raw-*": "Block",
"tailors-toolmold-burned-*": "BlockToolMold"
},
"behaviorsByType": {
"*-raw-*": [
{ "name": "GroundStorable", "properties": { "layout": "SingleCenter" } },
{
"name": "Unplaceable",
"__comment": "The ground storable obsoletes this being a block. Should be an item, but is kept a block for backwards compatibility"
},
{ "name": "RightClickPickup" }
],
"*": [{ "name": "UnstableFalling" }]
},
"variantgroups": [
{ "code": "materialtype", "states": ["raw", "burned"] },
{
"code": "tooltype",
"states": ["spindleweight"]
}
],
"attributesByType": {
"tailors-toolmold-burned-spindleweight": {
"requiredUnits": 100,
"fillHeight": 1,
"moldrackable": true,
"onmoldrackTransform": {
"rotation": { "z": 90 }
},
"drop": {
"type": "item",
"code": "spindleweight-{metal}-burned",
"quantity": 4
}
}
},
"entityClassByType": {
"tailors-toolmold-burned-*": "ToolMold"
},
"combustiblePropsByType": {
"tailors-toolmold-raw-*": {
"meltingPoint": 650,
"meltingDuration": 45,
"smeltedRatio": 1,
"smeltingType": "fire",
"smeltedStack": {
"type": "block",
"code": "tailors-toolmold-burned-{tooltype}"
},
"requiresContainer": false
}
},
"blockmaterial": "Ceramic",
"creativeinventory": {
"general": ["*"],
"construction": ["*"],
"tailorsstory": ["*"]
},
"replaceable": 700,
"resistance": 1.5,
"maxStackSize": 8,
"lightAbsorption": 0,
"texturesByType": {
"tailors-toolmold-raw-*": { "all": { "base": "game:block/clay/blueclay" } },
"tailors-toolmold-burned-*": {
"floor": { "base": "game:block/clay/ceramic-dark" },
"other": { "base": "game:block/clay/ceramic" }
}
},
"shape": {
"base": "block/molds/{tooltype}",
"rotateY": 90
},
"sounds": {
"walk": "walk/stone"
},
"collisionbox": {
"x1": 0,
"y1": 0,
"z1": 0,
"x2": 1,
"y2": 0.1875,
"z2": 1
},
"selectionbox": {
"x1": 0,
"y1": 0,
"z1": 0,
"x2": 1,
"y2": 0.1875,
"z2": 1
},
"sideopaque": {
"all": false
},
"sidesolid": {
"all": false
},
"guiTransform": {
"translation": { "x": 0, "y": 3, "z": 0 },
"origin": { "x": 0.5, "y": 0.0625, "z": 0.5 },
"scale": 1.33
},
"tpHandTransform": {
"translation": { "x": -1, "y": 0.2, "z": -0.9 },
"rotation": { "x": -87, "y": 9, "z": 4 },
"origin": { "x": 0.5, "y": 0.125, "z": 0.5 },
"scale": 0.5
},
"fpHandTransform": {
"translation": { "x": -0.3, "y": 0, "z": 0.5 },
"rotation": { "x": 16, "y": -51, "z": 91 },
"origin": { "x": 0.5, "y": 0.125, "z": 0.5 }
},
"groundTransform": {
"translation": { "x": 0, "y": 0, "z": 0 },
"rotation": { "x": 0, "y": -45, "z": 0 },
"origin": { "x": 0.5, "y": 0, "z": 0.5 },
"scale": 2.2
}
}
31 changes: 9 additions & 22 deletions tailorsstory/assets/tailorsstory/itemtypes/handspindle.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"code": "handspindle",
"damagedby": [
"blockbreaking",
"attacking"
],
"damagedby": ["blockbreaking", "attacking"],
"variantgroups": [
{
"code": "material",
Expand Down Expand Up @@ -38,10 +35,10 @@
"base": "item/spindleUse1"
},
{
"base": "item/spinldeUse2"
"base": "item/spindleUse2"
},
{
"base": "item/spinldeUse3"
"base": "item/spindleUse3"
}
]
},
Expand Down Expand Up @@ -91,9 +88,7 @@
"attributes": {
"rackable": true,
"handbook": {
"groupBy": [
"handspindle-*"
]
"groupBy": ["handspindle-*"]
},
"toolrackTransformByType": {
"*": {
Expand Down Expand Up @@ -156,18 +151,10 @@
"handspindle-*": 100
},
"creativeinventory": {
"general": [
"*"
],
"items": [
"*"
],
"tools": [
"*"
],
"tailorsstory": [
"*"
]
"general": ["*"],
"items": ["*"],
"tools": ["*"],
"tailorsstory": ["*"]
},
"combustiblePropsByType": {
"*-acacia": {
Expand Down Expand Up @@ -288,4 +275,4 @@
}
},
"class": "ItemHandspindle"
}
}
5 changes: 4 additions & 1 deletion tailorsstory/assets/tailorsstory/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,8 @@

"block-gravityloom": "Gravityloom",
"blockhelp-gravityloom-weave": "Weave",
"blockdesc-gravityloom-*": "O shuttle fly! Loom crank away! We weave unfailing, night and day-"
"blockdesc-gravityloom-*": "O shuttle fly! Loom crank away! We weave unfailing, night and day-",

"tailorsstory:block-tailors-toolmold-raw-spindleweight": "Spindleweight mold (unfired)",
"tailorsstory:block-tailors-toolmold-burned-spindleweight": "Spindleweight mold"
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
"type": "item",
"code": "game:clay-*",
"name": "type",
"allowedVariants": [
"blue",
"fire"
]
"allowedVariants": ["blue", "fire"]
},
"pattern": [
[
Expand All @@ -30,10 +27,10 @@
"________"
]
],
"name": "Spindleweight",
"name": "spindleweight",
"output": {
"type": "item",
"code": "spindleweight-clay-raw",
"stacksize": 1
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"ingredient": {
"type": "item",
"code": "game:clay-*",
"name": "type",
"allowedVariants": ["blue", "fire"]
},
"pattern": [
[
"______________",
"___#______#___",
"__###____###__",
"_##_##__##_##_",
"__###____###__",
"___#______#___",
"______________",
"______________",
"______________",
"___#______#___",
"__###____###__",
"_##_##__##_##_",
"__###____###__",
"___#______#___",
"______________",
"______________"
],
[
"______________",
"______________",
"__###____###__",
"__#_#____#_#__",
"__###____###__",
"______________",
"______________",
"______________",
"______________",
"______________",
"__###____###__",
"__#_#____#_#__",
"__###____###__",
"______________",
"______________",
"______________"
]
],
"name": "4spindleweights",
"output": {
"type": "item",
"code": "spindleweight-clay-raw",
"stacksize": 4
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"ingredient": {
"type": "item",
"code": "game:clay-*",
"name": "type",
"allowedVariants": ["blue", "fire"]
},
"pattern": [
[
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############",
"##############"
],
[
"##############",
"###_######_###",
"##___####___##",
"#__#__##__#__#",
"##___####___##",
"###_######_###",
"##############",
"##############",
"##############",
"###_######_###",
"##___####___##",
"#__#__##__#__#",
"##___####___##",
"###_######_###",
"##############",
"##############"
]
],
"name": "spindleweightmold",
"output": {
"type": "block",
"code": "tailors-toolmold-raw-spindleweight",
"stacksize": 4
}
}
Loading

0 comments on commit dbba6e1

Please sign in to comment.