From 33ec51ba85f768acd14fb80a4638ffc043b6d499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20GIRAUD?= Date: Tue, 17 Sep 2024 16:31:32 +0200 Subject: [PATCH 1/2] added axinian mixer --- .gitignore | 1 + bundles/bundle.properties | 2 + content/blocks/production/axinian-mixer.json | 40 ++++++++++++++++++ mod.json | 2 +- .../production/axinian-mixer-bottom.png | Bin 0 -> 393 bytes .../production/axinian-mixer-liquid.png | Bin 0 -> 687 bytes sprites/blocks/production/axinian-mixer.png | Bin 0 -> 5124 bytes 7 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 content/blocks/production/axinian-mixer.json create mode 100644 sprites/blocks/production/axinian-mixer-bottom.png create mode 100644 sprites/blocks/production/axinian-mixer-liquid.png create mode 100644 sprites/blocks/production/axinian-mixer.png diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..9f11b755a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/bundles/bundle.properties b/bundles/bundle.properties index 8c2b39b42..a739baa03 100644 --- a/bundles/bundle.properties +++ b/bundles/bundle.properties @@ -153,6 +153,8 @@ block.exogenesis-b-hydrogenic-splitter.name = Cold Plasma Splitter block.exogenesis-b-hydrogenic-splitter.description = Splits cold plasma into hydrogen. block.exogenesis-b-cold-plasma-chamber.name = Cold Plasma Chamber block.exogenesis-b-cold-plasma-chamber.description = Uses water and Astrolite to create cold plasma. +block.exogenesis-axinian-mixer.name = Axinian Mixer +block.exogenesis-axinian-mixer.description = Makes Axinian out of cold plasma. ## Solran block.exogenesis-forge-of-annihilation.name = Forge of Annihilation diff --git a/content/blocks/production/axinian-mixer.json b/content/blocks/production/axinian-mixer.json new file mode 100644 index 000000000..fb2d40a8b --- /dev/null +++ b/content/blocks/production/axinian-mixer.json @@ -0,0 +1,40 @@ +{ + "type": "GenericCrafter", + "size": 2, + "craftTime": 10, + "hasPower": true, + "hasLiquids": true, + "liquidCapacity": 100, + "drawer": { + "type": "DrawMulti", + "drawers": [ + { + "type": "DrawRegion", + "suffix": "-bottom" + }, + { + "type": "DrawLiquidTile", + "drawLiquid": "axinian", + "suffix": "-liquid" + }, + { + "type": "DrawDefault" + } + ] + }, + "outputLiquid": "axinian/1", + "consumes": { + "power": 2, + "liquids": [ + "cold-plasma/1" + ] + }, + "requirements": [ + "lead/50", + "silicon/50", + "astrolite/60" + ], + "envRequired": 0, + "category": "crafting", + "research": "cryofluid-mixer" +} diff --git a/mod.json b/mod.json index 3b84b6289..b210b76a3 100644 --- a/mod.json +++ b/mod.json @@ -4,5 +4,5 @@ "author": "[blue]AureusStratus", "description": "A mod that adds in a butt load of content", "minGameVersion": "137", - "version": "[blue]1.9.1" + "version": "[blue]1.9.2" } diff --git a/sprites/blocks/production/axinian-mixer-bottom.png b/sprites/blocks/production/axinian-mixer-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..0cde833bd96b1a7d4876b78b39f39f00eeba3613 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U<~kdaSW+oe0$lEmq9_`h=YTO z{-4`TEW)2(N@iTTcW&=_Sy|%^5|$s#0~r2ruxc=vHGI@vz;J`%*!Bjd1ZIi*Ok54T k2{qiK5}+Vqka@u9catf7&&-L3fI-aQ>FVdQ&MBb@0QS0ovH$=8 literal 0 HcmV?d00001 diff --git a/sprites/blocks/production/axinian-mixer-liquid.png b/sprites/blocks/production/axinian-mixer-liquid.png new file mode 100644 index 0000000000000000000000000000000000000000..86c59adb8b480a3ecf1408facaa97b7276f01a9f GIT binary patch literal 687 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 Date: Tue, 17 Sep 2024 16:54:38 +0200 Subject: [PATCH 2/2] resize to 3 --- content/blocks/production/axinian-mixer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/blocks/production/axinian-mixer.json b/content/blocks/production/axinian-mixer.json index fb2d40a8b..403f5ec9a 100644 --- a/content/blocks/production/axinian-mixer.json +++ b/content/blocks/production/axinian-mixer.json @@ -1,6 +1,6 @@ { "type": "GenericCrafter", - "size": 2, + "size": 3, "craftTime": 10, "hasPower": true, "hasLiquids": true,