diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..9dd2010 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,9 @@ +# How to Contribute + +1. You can open a feature request or bug report on the issues page. + 1a. For a Bug Report, please include as many details and steps to reproduce the bug as possible. + 1b. For a feature request, please try to be as detailed as possible in how you want the feature to function. You don't need to go into detail on the technical side if this only affects UX. + +2. You can always submit a pull request with your own code submissions. + +Please understand though that by contributing in any way you agree that the resulting included code has its license changed to that of this project, as is then owned by Aria's Creations. diff --git a/CakeBuild/CakeBuild.csproj b/CakeBuild/CakeBuild.csproj index f65b99f..5346f21 100644 --- a/CakeBuild/CakeBuild.csproj +++ b/CakeBuild/CakeBuild.csproj @@ -13,7 +13,7 @@ - ../game/VintagestoryAPI.dll + ../.game/VintagestoryAPI.dll diff --git a/README.md b/README.md index 828280e..42ae560 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,9 @@ This is the mod for Vintage Storage # Roadmap - Cobalt Ore (COMPLETE) +- Bigger and better inventory space + - ?? Hardened Leather + - ?? Leather frames? - Drawers - Digitized Storage diff --git a/VintageStorage/assets/game/itemtypes/ingot-cobalt.json b/VintageStorage/assets/game/itemtypes/ingot-cobalt.json new file mode 100644 index 0000000..8682cde --- /dev/null +++ b/VintageStorage/assets/game/itemtypes/ingot-cobalt.json @@ -0,0 +1,149 @@ +{ + "code": "ingot", + "class": "ItemIngot", + "maxstacksize": 16, + "variantgroups": [ + { + "code": "prop", + "states": ["cobalt"] + } + ], + "behaviors": [ + { + "name": "GroundStorable", + "properties": { + "layout": "Stacking", + "placeRemoveSound": "game:sounds/block/ingot", + "stackingModelByType": { + "*": "block/metal/ingotpileshiny" + }, + "stackingTextures": { + "metal": "block/metal/ingot/{prop}" + }, + "modelItemsToStackSizeRatio": 1, + "stackingCapacity": 64, + "transferQuantity": 1, + "bulkTransferQuantity": 4, + "collisionBox": { + "x1": 0, + "y1": 0, + "z1": 0, + "x2": 1, + "y2": 0.125, + "z2": 1 + }, + "cbScaleYByLayer": 0.125 + } + } + ], + "attributes": { + "reinforcementStrengthByType": { + "*": 400 + }, + "workableTemperatureByType": { + "ingot-cobalt-*": 500 + }, + "requiresAnvilTierByType": { + "ingot-cobalt-": 2 + }, + "displaycaseable": true, + "shelvable": true + }, + "storageFlags": 5, + "shape": { + "base": "item/ingot/{prop}" + }, + "textures": { + "metal": { "base": "block/metal/ingot/{prop}" } + }, + "creativeinventory": { + "general": ["*"], + "items": ["*"] + }, + "materialDensityByType": { + "*-cobalt": 9000 + }, + "combustiblePropsByType": { + "ingot-cobalt": { + "meltingPoint": 1150, + "meltingDuration": 30, + "smeltedRatio": 1, + "smeltedStack": { + "type": "item", + "code": "ingot-cobalt-*" + } + } + }, + "guiTransform": { + "translation": { + "x": 2, + "y": 0, + "z": 0 + }, + "rotation": { + "x": 149, + "y": -36, + "z": 0 + }, + "origin": { + "x": 0.5, + "y": 0.1, + "z": 0.5 + }, + "scale": 3.5 + }, + "fpHandTransform": { + "translation": { + "x": 0, + "y": 0.1, + "z": 0 + }, + "rotation": { + "x": 65, + "y": 21, + "z": -6 + }, + "origin": { + "x": 0.5, + "y": 0.1, + "z": 0.5 + }, + "scale": 2.15 + }, + "tpHandTransform": { + "translation": { + "x": -0.77, + "y": -0.15, + "z": -0.64 + }, + "rotation": { + "x": 0, + "y": -71, + "z": 18 + }, + "origin": { + "x": 0.5, + "y": 0.1, + "z": 0.5 + }, + "scale": 0.75 + }, + "groundTransform": { + "translation": { + "x": 0, + "y": 0, + "z": 0 + }, + "rotation": { + "x": 0, + "y": 0, + "z": 0 + }, + "origin": { + "x": 0.5, + "y": 0, + "z": 0.5 + }, + "scale": 4.8 + } +} diff --git a/VintageStorage/assets/game/lang/en.json b/VintageStorage/assets/game/lang/en.json index 5ea306e..18e2059 100644 --- a/VintageStorage/assets/game/lang/en.json +++ b/VintageStorage/assets/game/lang/en.json @@ -3,5 +3,5 @@ "ore-cobalt": "Cobalt", "block-ore-*-cobalt-*": "Cobalt Ore", "item-nugget-cobalt": "Nugget of Cobalt", - "ingot-cobalt": "Cobalt Ingot" + "item-ingot-cobalt": "Cobalt Ingot" } \ No newline at end of file diff --git a/VintageStorage/assets/game/patches/cobalt.json b/VintageStorage/assets/game/patches/cobalt.json index 511f4b0..cc0861f 100644 --- a/VintageStorage/assets/game/patches/cobalt.json +++ b/VintageStorage/assets/game/patches/cobalt.json @@ -1,178 +1,366 @@ [ - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-poor-cobalt-limestone", - "file": "blocktypes/stone/ore-graded.json" + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-limestone", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-limestone", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-limestone", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-limestone", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-chalk", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-chalk", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-granite", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-granite", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-andesite", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-andesite", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-basalt", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-basalt", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-slate", + "file": "blocktypes/stone/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-slate", + "file": "blocktypes/stone/ore-graded.json" + }, + + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-poor-cobalt-limestone", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-medium-cobalt-limestone", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-rich-cobalt-limestone", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-bountiful-cobalt-limestone", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-poor-cobalt-chalk", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-medium-cobalt-chalk", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-rich-cobalt-granite", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-bountiful-cobalt-granite", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-medium-cobalt-andesite", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-rich-cobalt-andesite", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-rich-cobalt-basalt", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-bountiful-cobalt-basalt", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-poor-cobalt-slate", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "crystalizedore-medium-cobalt-slate", + "file": "itemtypes/resource/crystalizedore-graded.json" + }, + + { + "op": "add", + "path": "/requiredMiningTierByType/ore-*-cobalt-*", + "value": 4, + "file": "blocktypes/stone/ore-graded.json" + }, + + { + "op": "add", + "path": "/variants/-", + "value": { + "Code": "cobalt" }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-medium-cobalt-limestone", - "file": "blocktypes/stone/ore-graded.json" + "file": "worldproperties/block/ore-graded.json" + }, + { + "op": "add", + "path": "/variants/-", + "value": { + "Code": "cobalt" }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-rich-cobalt-limestone", - "file": "blocktypes/stone/ore-graded.json" + "file": "worldproperties/block/ore-nugget.json" + }, + + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-limestone", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-limestone", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-limestone", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-limestone", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-chalk", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-chalk", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-granite", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-granite", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-andesite", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-andesite", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-rich-cobalt-basalt", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-bountiful-cobalt-basalt", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-poor-cobalt-slate", + "file": "itemtypes/resource/ore-graded.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "ore-medium-cobalt-slate", + "file": "itemtypes/resource/ore-graded.json" + }, + + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-limestone-free", + "file": "blocktypes/stone/looseores.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-chalk-free", + "file": "blocktypes/stone/looseores.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-granite-free", + "file": "blocktypes/stone/looseores.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-andesite-free", + "file": "blocktypes/stone/looseores.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-basalt-free", + "file": "blocktypes/stone/looseores.json" + }, + { + "op": "add", + "path": "/allowedVariants/-", + "value": "looseores-cobalt-slate-free", + "file": "blocktypes/stone/looseores.json" + }, + + { + "op": "add", + "path": "combustiblePropsByType/*-cobalt", + "value": { + "meltingPoint": 1100, + "meltingDuration": 30, + "smeltedRatio": 20, + "smeltedStack": { + "type": "item", + "code": "ingot-cobalt" + } }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-bountiful-cobalt-limestone", - "file": "blocktypes/stone/ore-graded.json" + "file": "itemtypes/resource/nugget.json" + }, + { + "op": "add", + "path": "/attributes/pigmentByType/*-cobalt", + "value": { + "name": "Cobalt", + "color": { + "red": 0, + "green": 0, + "blue": 150 + } }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-poor-cobalt-chalk", - "file": "blocktypes/stone/ore-graded.json" + "file": "itemtypes/resource/nugget.json" + }, + + { + "op": "add", + "path": "/materialDensityByType/*-cobalt", + "value": 9000, + "file": "itemtypes/resource/ingot.json" + }, + { + "op": "add", + "path": "/combustiblePropsByType/ingot-cobalt", + "value": { + "meltingPoint": 1100, + "meltingDuration": 30, + "smeltedRatio": 20, + "smeltedStack": { + "type": "item", + "code": "ingot-cobalt" + } }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-medium-cobalt-chalk", - "file": "blocktypes/stone/ore-graded.json" - }, - - - - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-poor-cobalt-limestone", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-medium-cobalt-limestone", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-rich-cobalt-limestone", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-bountiful-cobalt-limestone", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-poor-cobalt-chalk", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - { - "op":"add", - "path": "/allowedVariants/-", - "value": "crystalizedore-medium-cobalt-chalk", - "file": "itemtypes/resource/crystalizedore-graded.json" - }, - - - - - - - - - - { - "op": "add", - "path": "/requiredMiningTierByType/ore-*-cobalt-*", - "value": 4, - "file": "blocktypes/stone/ore-graded.json" - }, - - - { - "op": "add", - "path": "/variants/-", - "value": { - "Code": "cobalt" - }, - "file": "worldproperties/block/ore-graded.json" - }, - { - "op": "add", - "path": "/variants/-", - "value": { - "Code": "cobalt" - }, - "file": "worldproperties/block/ore-nugget.json" - }, - - - - - - - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-poor-cobalt-limestone", - "file": "itemtypes/resource/ore-graded.json" - }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-medium-cobalt-limestone", - "file": "itemtypes/resource/ore-graded.json" - }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-rich-cobalt-limestone", - "file": "itemtypes/resource/ore-graded.json" - }, - { - "op": "add", - "path": "/allowedVariants/-", - "value": "ore-bountiful-cobalt-limestone", - "file": "itemtypes/resource/ore-graded.json" - }, - - - - { - "op": "add", - "path": "/allowedVariants/-", - "value": "looseores-cobalt-limestone-free", - "file": "blocktypes/stone/looseores.json" - }, - - - { - "op": "add", - "path": "combustiblePropsByType/*-cobalt", - "value": { - "meltingPoint": 1100, - "meltingDuration": 30, - "smeltedRatio": 20, - "smeltedStack": { - "type": "item", - "code": "ingot-cobalt" - } - }, - "file": "itemtypes/resource/nugget.json" - }, - { - "op": "add", - "path": "/attributes/pigmentByType/*-cobalt", - "value": { - "name": "Cobalt", - "color": { - "red": 0, - "green": 0, - "blue": 150 - } - }, - "file": "itemtypes/resource/nugget.json" - } -] \ No newline at end of file + "file": "itemtypes/resource/ingot.json" + } +] diff --git a/VintageStorage/assets/game/shapes/item/ingot/cobalt.json b/VintageStorage/assets/game/shapes/item/ingot/cobalt.json new file mode 100644 index 0000000..6807e61 --- /dev/null +++ b/VintageStorage/assets/game/shapes/item/ingot/cobalt.json @@ -0,0 +1,42 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "cobalt": "block/metal/ingot/cobalt" + }, + "elements": [ + { + "name": "ingot", + "from": [ 6.5, 0.0, 4.5 ], + "to": [ 6.5, 0.0, 4.5 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + "north": { "texture": "#cobalt", "uv": [ 0.0, 0.0, 0.0, 0.0 ], "autoUv": false }, + "south": { "texture": "#cobalt", "uv": [ 4.5, 9.0, 5.0, 9.5 ] }, + "west": { "texture": "#cobalt", "uv": [ 3.5, 2.0, 4.0, 2.5 ] }, + "up": { "texture": "#cobalt", "uv": [ 11.5, 0.5, 12.0, 1.0 ], "windMode": [-1,-1,-1,-1] }, + "down": { "texture": "#cobalt", "uv": [ 9.0, 7.0, 9.5, 7.5 ], "glow": 1 } + }, + "children": [ + { + "name": "Cube6", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 3.0, 2.0, 7.0 ], + "faces": { + "north": { "texture": "#cobalt", "uv": [ 1.0, 8.0, 4.0, 10.0 ] }, + "east": { "texture": "#cobalt", "uv": [ 7.5, 2.0, 14.5, 4.0 ] }, + "south": { "texture": "#cobalt", "uv": [ 9.0, 4.5, 12.0, 6.5 ] }, + "west": { "texture": "#cobalt", "uv": [ 4.5, 11.5, 11.5, 13.5 ] }, + "up": { "texture": "#cobalt", "uv": [ 1.5, 4.0, 4.5, 11.0 ] }, + "down": { "texture": "#cobalt", "uv": [ 9.5, 5.0, 12.5, 12.0 ] } + } + } + ] + } + ]} \ No newline at end of file diff --git a/VintageStorage/assets/game/shapes/item/ore/bountiful/cobalt.json b/VintageStorage/assets/game/shapes/item/ore/bountiful/cobalt.json new file mode 100644 index 0000000..dfd059e --- /dev/null +++ b/VintageStorage/assets/game/shapes/item/ore/bountiful/cobalt.json @@ -0,0 +1,103 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "cobalt3": "block/stone/ore/cobalt3" + }, + "elements": [ + { + "name": "origin", + "from": [ 6.3, -0.5, 6.0 ], + "to": [ 6.3, -0.5, 6.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + }, + "children": [ + { + "name": "native1", + "from": [ 0.5, 1.0, -0.5 ], + "to": [ 2.5, 3.0, 2.5 ], + "rotationOrigin": [ 0.0, 0.0, 0.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 13.0, 1.5, 15.0, 4.5 ], "autoUv": false, "windMode": [-1,-1,-1,-1] }, + "east": { "texture": "#cobalt3", "uv": [ 8.0, 1.5, 11.0, 3.5 ], "windMode": [-1,-1,-1,-1] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "west": { "texture": "#cobalt3", "uv": [ 4.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "up": { "texture": "#cobalt3", "uv": [ 12.5, 1.0, 14.5, 4.0 ], "windMode": [-1,-1,-1,-1] }, + "down": { "texture": "#cobalt3", "uv": [ 0.5, 7.0, 2.5, 10.0 ], "windMode": [-1,-1,-1,-1] } + } + }, + { + "name": "native2", + "from": [ -0.5, 1.5, 0.5 ], + "to": [ 2.0, 3.5, 2.0 ], + "rotationOrigin": [ -1.5, 0.0, 2.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 10.5, 4.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 6.5, 10.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 4.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 5.0, 0.0, 6.5, 2.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 4.5, 7.5, 7.0, 9.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 3.5 ] } + } + }, + { + "name": "native3", + "from": [ 2.5, 1.0, 0.5 ], + "to": [ 4.0, 2.5, 2.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 11.5, 9.5, 13.0, 11.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 8.5, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 4.0, 6.5, 5.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 5.0, 7.5, 6.5, 9.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 11.0, 9.0, 12.5, 11.0 ] } + } + }, + { + "name": "native4", + "from": [ 1.0, 2.0, 1.5 ], + "to": [ 3.5, 4.0, 3.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 9.0, 5.0, 11.5, 7.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 13.5, 2.5, 15.0, 4.5 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.5, 3.5, 7.0, 5.5 ] }, + "west": { "texture": "#cobalt3", "uv": [ 1.0, 3.0, 2.5, 5.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 7.5, 1.5, 10.0, 3.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 6.0, 13.0, 8.5, 14.5 ] } + } + }, + { + "name": "native5", + "from": [ 0.0, 0.5, 0.0 ], + "to": [ 3.0, 2.0, 3.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 5.0, 9.0, 8.0, 10.5 ] }, + "east": { "texture": "#cobalt3", "uv": [ 7.0, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.0, 4.5, 7.0, 6.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 12.0, 2.0, 15.5, 3.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 11.0, 5.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 4.5, 7.0, 7.5, 10.5 ] } + } + }, + { + "name": "native7", + "from": [ 1.0, 1.5, 3.0 ], + "to": [ 2.5, 3.0, 4.0 ], + "rotationOrigin": [ 1.0, 1.0, 2.0 ], + "faces": { + "east": { "texture": "#cobalt3", "uv": [ 13.5, 3.0, 14.5, 4.5 ] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 4.0, 6.5, 5.5 ] }, + "west": { "texture": "#cobalt3", "uv": [ 5.5, 8.0, 6.5, 9.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 13.5, 3.0, 15.0, 4.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 5.5, 4.5, 7.0, 5.5 ] } + } + } + ] + } + ]} \ No newline at end of file diff --git a/VintageStorage/assets/game/shapes/item/ore/medium/cobalt.json b/VintageStorage/assets/game/shapes/item/ore/medium/cobalt.json new file mode 100644 index 0000000..936be37 --- /dev/null +++ b/VintageStorage/assets/game/shapes/item/ore/medium/cobalt.json @@ -0,0 +1,77 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "cobalt3": "block/stone/ore/cobalt3" + }, + "elements": [ + { + "name": "origin", + "from": [ 6.3, -0.5, 6.0 ], + "to": [ 6.3, -0.5, 6.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + }, + "children": [ + { + "name": "native1", + "from": [ 0.5, 1.0, -0.5 ], + "to": [ 2.5, 3.0, 2.5 ], + "rotationOrigin": [ 0.0, 0.0, 0.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 13.0, 1.5, 15.0, 4.5 ], "autoUv": false, "windMode": [-1,-1,-1,-1] }, + "east": { "texture": "#cobalt3", "uv": [ 8.0, 1.5, 11.0, 3.5 ], "windMode": [-1,-1,-1,-1] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "west": { "texture": "#cobalt3", "uv": [ 4.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "up": { "texture": "#cobalt3", "uv": [ 12.5, 1.0, 14.5, 4.0 ], "windMode": [-1,-1,-1,-1] }, + "down": { "texture": "#cobalt3", "uv": [ 0.5, 7.0, 2.5, 10.0 ], "windMode": [-1,-1,-1,-1] } + } + }, + { + "name": "native2", + "from": [ -0.5, 1.5, 0.5 ], + "to": [ 2.0, 3.5, 2.0 ], + "rotationOrigin": [ -1.5, 0.0, 2.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 10.5, 4.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 6.5, 10.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 4.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 5.0, 0.0, 6.5, 2.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 4.5, 7.5, 7.0, 9.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 3.5 ] } + } + }, + { + "name": "native3", + "from": [ 2.5, 1.0, 0.5 ], + "to": [ 4.0, 2.5, 2.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 11.5, 9.5, 13.0, 11.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 8.5, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 4.0, 6.5, 5.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 5.0, 7.5, 6.5, 9.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 11.0, 9.0, 12.5, 11.0 ] } + } + }, + { + "name": "native5", + "from": [ 0.0, 0.5, 0.0 ], + "to": [ 3.0, 2.0, 3.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 5.0, 9.0, 8.0, 10.5 ] }, + "east": { "texture": "#cobalt3", "uv": [ 7.0, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.0, 4.5, 7.0, 6.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 12.0, 2.0, 15.5, 3.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 11.0, 5.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 4.5, 7.0, 7.5, 10.5 ] } + } + } + ] + } + ]} \ No newline at end of file diff --git a/VintageStorage/assets/game/shapes/item/ore/poor/cobalt.json b/VintageStorage/assets/game/shapes/item/ore/poor/cobalt.json new file mode 100644 index 0000000..3d77621 --- /dev/null +++ b/VintageStorage/assets/game/shapes/item/ore/poor/cobalt.json @@ -0,0 +1,65 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "cobalt3": "block/stone/ore/cobalt3" + }, + "elements": [ + { + "name": "origin", + "from": [ 6.3, -0.5, 6.0 ], + "to": [ 6.3, -0.5, 6.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + }, + "children": [ + { + "name": "native1", + "from": [ 0.5, 1.0, -0.5 ], + "to": [ 2.5, 3.0, 2.5 ], + "rotationOrigin": [ 0.0, 0.0, 0.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 13.0, 1.5, 15.0, 4.5 ], "autoUv": false, "windMode": [-1,-1,-1,-1] }, + "east": { "texture": "#cobalt3", "uv": [ 8.0, 1.5, 11.0, 3.5 ], "windMode": [-1,-1,-1,-1] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "west": { "texture": "#cobalt3", "uv": [ 4.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "up": { "texture": "#cobalt3", "uv": [ 12.5, 1.0, 14.5, 4.0 ], "windMode": [-1,-1,-1,-1] }, + "down": { "texture": "#cobalt3", "uv": [ 0.5, 7.0, 2.5, 10.0 ], "windMode": [-1,-1,-1,-1] } + } + }, + { + "name": "native2", + "from": [ -0.5, 1.5, 0.5 ], + "to": [ 2.0, 3.5, 2.0 ], + "rotationOrigin": [ -1.5, 0.0, 2.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 10.5, 4.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 6.5, 10.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 4.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 5.0, 0.0, 6.5, 2.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 4.5, 7.5, 7.0, 9.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 3.5 ] } + } + }, + { + "name": "native5", + "from": [ 0.0, 0.5, 0.0 ], + "to": [ 3.0, 2.0, 3.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 5.0, 9.0, 8.0, 10.5 ] }, + "east": { "texture": "#cobalt3", "uv": [ 7.0, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.0, 4.5, 7.0, 6.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 12.0, 2.0, 15.5, 3.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 11.0, 5.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 4.5, 7.0, 7.5, 10.5 ] } + } + } + ] + } + ]} \ No newline at end of file diff --git a/VintageStorage/assets/game/shapes/item/ore/rich/cobalt.json b/VintageStorage/assets/game/shapes/item/ore/rich/cobalt.json new file mode 100644 index 0000000..15749b0 --- /dev/null +++ b/VintageStorage/assets/game/shapes/item/ore/rich/cobalt.json @@ -0,0 +1,90 @@ +{ + "editor": { + "allAngles": false, + "entityTextureMode": false + }, + "textureWidth": 16, + "textureHeight": 16, + "textureSizes": { + }, + "textures": { + "cobalt3": "block/stone/ore/cobalt3" + }, + "elements": [ + { + "name": "origin", + "from": [ 6.3, -0.5, 6.0 ], + "to": [ 6.3, -0.5, 6.0 ], + "rotationOrigin": [ 8.0, 0.0, 8.0 ], + "faces": { + }, + "children": [ + { + "name": "native1", + "from": [ 0.5, 1.0, -0.5 ], + "to": [ 2.5, 3.0, 2.5 ], + "rotationOrigin": [ 0.0, 0.0, 0.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 13.0, 1.5, 15.0, 4.5 ], "autoUv": false, "windMode": [-1,-1,-1,-1] }, + "east": { "texture": "#cobalt3", "uv": [ 8.0, 1.5, 11.0, 3.5 ], "windMode": [-1,-1,-1,-1] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "west": { "texture": "#cobalt3", "uv": [ 4.0, 8.0, 7.0, 10.0 ], "windMode": [-1,-1,-1,-1] }, + "up": { "texture": "#cobalt3", "uv": [ 12.5, 1.0, 14.5, 4.0 ], "windMode": [-1,-1,-1,-1] }, + "down": { "texture": "#cobalt3", "uv": [ 0.5, 7.0, 2.5, 10.0 ], "windMode": [-1,-1,-1,-1] } + } + }, + { + "name": "native2", + "from": [ -0.5, 1.5, 0.5 ], + "to": [ 2.0, 3.5, 2.0 ], + "rotationOrigin": [ -1.5, 0.0, 2.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 10.5, 4.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 5.0, 8.0, 6.5, 10.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 4.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 5.0, 0.0, 6.5, 2.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 4.5, 7.5, 7.0, 9.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 12.5, 2.0, 15.0, 3.5 ] } + } + }, + { + "name": "native3", + "from": [ 2.5, 1.0, 0.5 ], + "to": [ 4.0, 2.5, 2.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 11.5, 9.5, 13.0, 11.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 8.5, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 5.0, 4.0, 6.5, 5.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 5.0, 7.5, 6.5, 9.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 11.0, 9.0, 12.5, 11.0 ] } + } + }, + { + "name": "native4", + "from": [ 1.0, 2.0, 1.5 ], + "to": [ 3.5, 4.0, 3.0 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 9.0, 5.0, 11.5, 7.0 ] }, + "east": { "texture": "#cobalt3", "uv": [ 13.5, 2.5, 15.0, 4.5 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.5, 3.5, 7.0, 5.5 ] }, + "west": { "texture": "#cobalt3", "uv": [ 1.0, 3.0, 2.5, 5.0 ] }, + "up": { "texture": "#cobalt3", "uv": [ 7.5, 1.5, 10.0, 3.0 ] }, + "down": { "texture": "#cobalt3", "uv": [ 6.0, 13.0, 8.5, 14.5 ] } + } + }, + { + "name": "native5", + "from": [ 0.0, 0.5, 0.0 ], + "to": [ 3.0, 2.0, 3.5 ], + "faces": { + "north": { "texture": "#cobalt3", "uv": [ 5.0, 9.0, 8.0, 10.5 ] }, + "east": { "texture": "#cobalt3", "uv": [ 7.0, 1.5, 10.5, 3.0 ] }, + "south": { "texture": "#cobalt3", "uv": [ 4.0, 4.5, 7.0, 6.0 ] }, + "west": { "texture": "#cobalt3", "uv": [ 12.0, 2.0, 15.5, 3.5 ] }, + "up": { "texture": "#cobalt3", "uv": [ 8.0, 2.0, 11.0, 5.5 ] }, + "down": { "texture": "#cobalt3", "uv": [ 4.5, 7.0, 7.5, 10.5 ] } + } + } + ] + } + ]} \ No newline at end of file diff --git a/VintageStorage/assets/game/textures/block/metal/ingot/cobalt.png b/VintageStorage/assets/game/textures/block/metal/ingot/cobalt.png new file mode 100644 index 0000000..f189cb2 Binary files /dev/null and b/VintageStorage/assets/game/textures/block/metal/ingot/cobalt.png differ diff --git a/runTest b/runTest index 206d354..5fbc6a8 100755 --- a/runTest +++ b/runTest @@ -4,4 +4,4 @@ rm -rf Releases ./build.sh vsleep 2 rm -rf Releases/vintagestorage -game/Vintagestory --tracelog --addModPath "$(pwd)/Releases" -o modtest +.game/Vintagestory --tracelog --addModPath "$(pwd)/Releases" -o modtest