diff --git a/game-server/datapacks/original/assets/textures/materials/ore/wolfrinite.png b/game-server/datapacks/original/assets/textures/materials/ore/wolframite.png similarity index 100% rename from game-server/datapacks/original/assets/textures/materials/ore/wolfrinite.png rename to game-server/datapacks/original/assets/textures/materials/ore/wolframite.png diff --git a/game-server/datapacks/original/data/items/materials/circuits/advanced_circuit.json b/game-server/datapacks/original/data/items/materials/circuits/advanced_circuit.json new file mode 100644 index 0000000..2076724 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/circuits/advanced_circuit.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:circuit_advanced", + "texture": "test/assets/textures/materials/circuits/advanced_circuit.png", + "displayName": "items.materials.original.circuits.advanced", + "description": "items.materials.original.circuits.advanced.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/materials/circuits/ai_core.json b/game-server/datapacks/original/data/items/materials/circuits/ai_core.json new file mode 100644 index 0000000..cb903ec --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/circuits/ai_core.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:circuit_ai_core", + "texture": "test/assets/textures/materials/circuits/ai_core.png", + "displayName": "items.materials.original.circuits.ai_core", + "description": "items.materials.original.circuits.ai_core.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/materials/circuits/basic_circuit.json b/game-server/datapacks/original/data/items/materials/circuits/basic_circuit.json new file mode 100644 index 0000000..32754d4 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/circuits/basic_circuit.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:circuit_basic", + "texture": "test/assets/textures/materials/circuits/basic_circuit.png", + "displayName": "items.materials.original.circuits.basic", + "description": "items.materials.original.circuits.basic.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/materials/circuits/processing_circuit.json b/game-server/datapacks/original/data/items/materials/circuits/processing_circuit.json new file mode 100644 index 0000000..23e48ac --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/circuits/processing_circuit.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:circuit_processing_unit", + "texture": "test/assets/textures/materials/circuits/processing.png", + "displayName": "items.materials.original.circuits.processing_unit", + "description": "items.materials.original.circuits.processing_unit.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/materials/circuits/quantum_processor.json b/game-server/datapacks/original/data/items/materials/circuits/quantum_processor.json new file mode 100644 index 0000000..7b6ff90 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/circuits/quantum_processor.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:circuit_quantum_processor", + "texture": "test/assets/textures/materials/circuits/quantum_processor.png", + "displayName": "items.materials.original.circuits.quantum_processor", + "description": "items.materials.original.circuits.quantum_processor.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/items/materials/ores/wolframite.json b/game-server/datapacks/original/data/items/materials/ores/wolframite.json new file mode 100644 index 0000000..adb46e1 --- /dev/null +++ b/game-server/datapacks/original/data/items/materials/ores/wolframite.json @@ -0,0 +1,11 @@ +{ + "materials": { + "id": "original:ore_wolframite", + "texture": "test/assets/textures/materials/ore/wolframite.png", + "displayName": "items.materials.original.ores.wolframite", + "description": "items.materials.original.ores.wolframite.desc", + "meta": { + "storeCategory": "original:materials" + } + } +} diff --git a/game-server/datapacks/original/data/items/materials/ores/wolfrinite.json b/game-server/datapacks/original/data/items/materials/ores/wolfrinite.json deleted file mode 100644 index 3f5c659..0000000 --- a/game-server/datapacks/original/data/items/materials/ores/wolfrinite.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "materials": { - "id": "original:ore_wolfrinite", - "texture": "original/assets/textures/materials/ore/wolfrinite.png", - "displayName": "items.materials.original.ores.wolfrinite", - "description": "items.materials.original.ores.wolfrinite.desc", - "meta": { - "storeCategory": "original:materials" - } - } -} diff --git a/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json b/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json new file mode 100644 index 0000000..fcd76a2 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/circuits/advanced_circuit.json @@ -0,0 +1,21 @@ + +{ + "recipe": { + "inputs": [ + {"original:circuit_basic": 2}, + {"original:ingot_gold": 1}, + {"original:ore_coal": 2} + ], + "output": { + "original:circuit_advanced": 1 + }, + "time_seconds": 20, + "requires": { + "original:circuit_assembly": 0 + } + }, + "craft": { + "type": "original:circuits", + "id": "original:circuit_advanced" + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/recipes/circuits/ai_core.json b/game-server/datapacks/original/data/recipes/circuits/ai_core.json new file mode 100644 index 0000000..74780c3 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/circuits/ai_core.json @@ -0,0 +1,20 @@ + +{ + "recipe": { + "inputs": [ + {"original:circuit_quantum_processor": 2}, + {"original:dimentional_crystal": 1} + ], + "output": { + "original:circuit_ai_core": 1 + }, + "time_seconds": 20, + "requires": { + "original:circuit_assembly": 0 + } + }, + "craft": { + "type": "original:circuits", + "id": "original:circuit_ai_core" + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json b/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json new file mode 100644 index 0000000..17eb745 --- /dev/null +++ b/game-server/datapacks/original/data/recipes/circuits/basic_circuit.json @@ -0,0 +1,20 @@ + +{ + "recipe": { + "inputs": [ + {"original:ingot_copper": 1 }, + {"original:ingot_iron": 1 } + ], + "output": { + "original:circuit_basic": 1 + }, + "time_seconds": 10, + "requires": { + "original:circuit_assembly": 0 + } + }, + "craft": { + "type": "original:circuits", + "id": "original:circuit_basic" + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json b/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json new file mode 100644 index 0000000..963881d --- /dev/null +++ b/game-server/datapacks/original/data/recipes/circuits/processing_circuit.json @@ -0,0 +1,21 @@ + +{ + "recipe": { + "inputs": [ + {"original:circuit_advanced": 1}, + {"original:flux_crystal": 1}, + {"original:ingot_gold": 2} + ], + "output": { + "original:circuit_processing_unit": 1 + }, + "time_seconds": 20, + "requires": { + "original:circuit_assembly": 0 + } + }, + "craft": { + "type": "original:circuits", + "id": "original:circuit_processing_unit" + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json b/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json new file mode 100644 index 0000000..7e9c43a --- /dev/null +++ b/game-server/datapacks/original/data/recipes/circuits/quantum_processor.json @@ -0,0 +1,21 @@ + +{ + "recipe": { + "inputs": [ + {"original:circuit_processing_unit": 1}, + {"original:flux_core": 1}, + {"original:superconductor": 2} + ], + "output": { + "original:circuit_quantum_processor": 1 + }, + "time_seconds": 20, + "requires": { + "original:circuit_assembly": 0 + } + }, + "craft": { + "type": "original:circuits", + "id": "original:circuit_processing" + } +} \ No newline at end of file diff --git a/game-server/datapacks/original/data/recipes/ingots/gold.json b/game-server/datapacks/original/data/recipes/ingots/gold.json index 06748de..df0bebb 100644 --- a/game-server/datapacks/original/data/recipes/ingots/gold.json +++ b/game-server/datapacks/original/data/recipes/ingots/gold.json @@ -2,7 +2,7 @@ "recipe": { "inputs": [ { "original:ore_gold": 1 }, - { "original:ore_coal": 1 } + { "original:ore_coal": 2 } ], "output": { "original:ingot_gold": 1 diff --git a/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json b/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json new file mode 100644 index 0000000..991009b --- /dev/null +++ b/game-server/datapacks/original/data/skills/crafting/circuit_assembly.json @@ -0,0 +1,15 @@ +{ + "skills": { + "id": "original:circuit_assembly", + "displayName": "skills.category.original.crafting.circuit_assembly", + "description": "skills.category.original.crafting.circuit_assembly.desc", + "meta": { + "category": "crafting", + "topLevel": 10, + "math": { + "start": 500, + "input": 1.7 + } + } + } +}