diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 171d51f5..b98e5c44 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -24,7 +24,9 @@ block.betamindy-payload-catapult.description = Can launch bigger payloads in hig block.betamindy-block-workshop.name = Block Workshop block.block-forge.description = Forges block payloads. Use with the payload cannon to remotely place down blocks. block.block-forge.details = The forbidden block, revealed by BetaMindy(tm). -block.betamindy-block-workshop.description = Forges bigger blocks. Needs coolant to forge blocks. +block.betamindy-block-workshop.description = Forges bigger blocks. Needs water to process blocks. +block.betamindy-block-factory.name = Block Factory +block.betamindy-block-factory.description = Forges even bigger blocks. Can be configured to forge smaller blocks too, unlike the block workshop. Needs coolant to forge blocks. block.betamindy-block-packer.name = Block Packer block.block-loader.description = Loads the inventories of block payloads. block.betamindy-block-packer.description = Bigger version of the block loader. Loads the inventories of bigger blocks. diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index 58b9abbe..b55b7445 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -1,58 +1,60 @@ -mod.betamindy.name = [accent]Beta[][white]Mindy[] [lightgray]베타민디[] -mod.betamindy.short = [#b59e72]혼돈의 데모[] -mod.betamindy.description = 첫 [accent]Java[] 모드 신작! [cyan]sk7725/Commandblocks[]과 비견될 만한 혼돈!\n\n[green]기여자[]: 영감, 레이포스, GlennFolker, EyeofDarkness, Voz-Duh +mod.betamindy.name = [accent]Beta[][white]Mindy[] [lightgray]\uBCA0\uD0C0\uBBFC\uB514[] +mod.betamindy.short = [#b59e72]\uD63C\uB3C8\uC758 \uB370\uBAA8[] +mod.betamindy.description = \uCCAB [accent]Java[] \uBAA8\uB4DC \uC2E0\uC791! [cyan]sk7725/Commandblocks[]\uACFC \uBE44\uACAC\uB420 \uB9CC\uD55C \uD63C\uB3C8!\n\n[green]\uAE30\uC5EC\uC790[]: \uC601\uAC10, \uB808\uC774\uD3EC\uC2A4, GlennFolker, EyeofDarkness, Voz-Duh # Pistons -block.betamindy-piston.name = 피스톤 [scarlet](미완성)[] -block.betamindy-piston.description = 최대 16개의 블록을 밀 수 있습니다. 토륨 벽은 밀지 못합니다. -block.betamindy-piston-sticky.name = 끈끈이 피스톤 [scarlet](미완성)[] -block.betamindy-piston-sticky.description = 최대 16개의 블록을 밀거나 당길 수 있습니다. 토륨 벽은 밀지 못합니다. +block.betamindy-piston.name = \uD53C\uC2A4\uD1A4 [scarlet](\uBBF8\uC644\uC131)[] +block.betamindy-piston.description = \uCD5C\uB300 16\uAC1C\uC758 \uBE14\uB85D\uC744 \uBC00 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uD1A0\uB968 \uBCBD\uC740 \uBC00\uC9C0 \uBABB\uD569\uB2C8\uB2E4. +block.betamindy-piston-sticky.name = \uB048\uB048\uC774 \uD53C\uC2A4\uD1A4 [scarlet](\uBBF8\uC644\uC131)[] +block.betamindy-piston-sticky.description = \uCD5C\uB300 16\uAC1C\uC758 \uBE14\uB85D\uC744 \uBC00\uAC70\uB098 \uB2F9\uAE38 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uD1A0\uB968 \uBCBD\uC740 \uBC00\uC9C0 \uBABB\uD569\uB2C8\uB2E4. -block.betamindy-spore-slime.name = 포자 슬라임 -block.betamindy-spore-slime.description = 인접한 블록에 달라붙습니다. 메타 코팅에는 달라붙지 못합니다. -block.betamindy-spore-slime.details = 포도맛 마이쮸. -block.betamindy-spore-slime-sided.name = 방향성 포자 슬라임 -block.betamindy-spore-slime-sided.description = 한쪽 면만 끈적입니다. 인접한 블록에 달라붙습니다. 메타 코팅에는 달라붙지 못합니다. -block.betamindy-accel.name = 가속도계 -block.betamindy-accel.description = 움직이면 전력을 출력합니다. 주로 피스톤과 함께 사용됩니다. +block.betamindy-spore-slime.name = \uD3EC\uC790 \uC2AC\uB77C\uC784 +block.betamindy-spore-slime.description = \uC778\uC811\uD55C \uBE14\uB85D\uC5D0 \uB2EC\uB77C\uBD99\uC2B5\uB2C8\uB2E4. \uBA54\uD0C0 \uCF54\uD305\uC5D0\uB294 \uB2EC\uB77C\uBD99\uC9C0 \uBABB\uD569\uB2C8\uB2E4. +block.betamindy-spore-slime.details = \uD3EC\uB3C4\uB9DB \uB9C8\uC774\uCBB8. +block.betamindy-spore-slime-sided.name = \uBC29\uD5A5\uC131 \uD3EC\uC790 \uC2AC\uB77C\uC784 +block.betamindy-spore-slime-sided.description = \uD55C\uCABD \uBA74\uB9CC \uB048\uC801\uC785\uB2C8\uB2E4. \uC778\uC811\uD55C \uBE14\uB85D\uC5D0 \uB2EC\uB77C\uBD99\uC2B5\uB2C8\uB2E4. \uBA54\uD0C0 \uCF54\uD305\uC5D0\uB294 \uB2EC\uB77C\uBD99\uC9C0 \uBABB\uD569\uB2C8\uB2E4. +block.betamindy-accel.name = \uAC00\uC18D\uB3C4\uACC4 +block.betamindy-accel.description = \uC6C0\uC9C1\uC774\uBA74 \uC804\uB825\uC744 \uCD9C\uB825\uD569\uB2C8\uB2E4. \uC8FC\uB85C \uD53C\uC2A4\uD1A4\uACFC \uD568\uAED8 \uC0AC\uC6A9\uB429\uB2C8\uB2E4. # Payloads -block.betamindy-payload-cannon.name = 화물 대포 -block.betamindy-payload-cannon.description = 화물을 발사합니다. 화물의 체력이 높고 비거리가 멀수록 더 많은 피해를 입히지만, 동시에 더 많은 피해를 화물이 입습니다. [#98ffa9]내부 사거리[] 내에서는 화물이 피해를 입지 않습니다. -block.betamindy-payload-catapult.name = 화물 투석기 -block.betamindy-payload-catapult.description = 더 빠른 속력으로 더 큰 화물을 날릴 수 있습니다. 적들에게는 나쁜 소식입니다. -block.block-forge.name = 블록 제작대 -block.block-forge.description = 블록 화물을 제작합니다. 화물 대포를 활용해서 원격으로 블록을 설치하세요. -block.block-forge.details = 아누크의 금지된 블록, 개봉박두! -block.betamindy-block-workshop.name = 블록 공장 -block.betamindy-block-workshop.description = 더 큰 블록 화물을 제작합니다. 냉각수가 필요합니다. -block.betamindy-block-packer.name = 블록 패커 -block.block-loader.description = 블록 화물에 자원을 넣습니다. -block.betamindy-block-packer.description = 더 큰 블록 로더입니다. 큰 블록 화물에 자원을 넣습니다. -block.betamindy-block-unpacker.name = 블록 언패커 -block.block-unloader.description = 블록 화물에서 자원을 빼냅니다. -block.betamindy-block-unpacker.description = 더 큰 블록 언로더입니다. 큰 블록 화물에서 자원을 빼냅니다. -block.betamindy-payload-deconstructor.name = 화물 분해기 -block.betamindy-payload-deconstructor.description = 화물을 분해하여 제작 자원의 일부를 반환합니다. 건물을 직접 해체하는 것보다 효율적입니다. -block.betamindy-payload-destroyer.name = 화물 분쇄기 -block.betamindy-payload-destroyer.description = 더 큰 화물 분해기입니다. 화물을 분쇄하여 제작 자원의 일부를 반환합니다. 건물을 직접 해체하는 것보다 효율적입니다. -block.betamindy-payload-eradicator.name = 화물 박멸기 -block.betamindy-payload-eradicator.description = 훨씬 더 큰 화물 분해기입니다. 화물을 박멸하여 제작 자원의 일부를 반환합니다. 건물을 직접 해체하는 것보다 효율적입니다. +block.betamindy-payload-cannon.name = \uD654\uBB3C \uB300\uD3EC +block.betamindy-payload-cannon.description = \uD654\uBB3C\uC744 \uBC1C\uC0AC\uD569\uB2C8\uB2E4. \uD654\uBB3C\uC758 \uCCB4\uB825\uC774 \uB192\uACE0 \uBE44\uAC70\uB9AC\uAC00 \uBA40\uC218\uB85D \uB354 \uB9CE\uC740 \uD53C\uD574\uB97C \uC785\uD788\uC9C0\uB9CC, \uB3D9\uC2DC\uC5D0 \uB354 \uB9CE\uC740 \uD53C\uD574\uB97C \uD654\uBB3C\uC774 \uC785\uC2B5\uB2C8\uB2E4. [#98ffa9]\uB0B4\uBD80 \uC0AC\uAC70\uB9AC[] \uB0B4\uC5D0\uC11C\uB294 \uD654\uBB3C\uC774 \uD53C\uD574\uB97C \uC785\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4. +block.betamindy-payload-catapult.name = \uD654\uBB3C \uD22C\uC11D\uAE30 +block.betamindy-payload-catapult.description = \uB354 \uBE60\uB978 \uC18D\uB825\uC73C\uB85C \uB354 \uD070 \uD654\uBB3C\uC744 \uB0A0\uB9B4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uC801\uB4E4\uC5D0\uAC8C\uB294 \uB098\uC05C \uC18C\uC2DD\uC785\uB2C8\uB2E4. +block.block-forge.name = \uBE14\uB85D \uC81C\uC791\uB300 +block.block-forge.description = \uBE14\uB85D \uD654\uBB3C\uC744 \uC81C\uC791\uD569\uB2C8\uB2E4. \uD654\uBB3C \uB300\uD3EC\uB97C \uD65C\uC6A9\uD574\uC11C \uC6D0\uACA9\uC73C\uB85C \uBE14\uB85D\uC744 \uC124\uCE58\uD558\uC138\uC694. +block.block-forge.details = \uC544\uB204\uD06C\uC758 \uAE08\uC9C0\uB41C \uBE14\uB85D, \uAC1C\uBD09\uBC15\uB450! +block.betamindy-block-workshop.name = \uBE14\uB85D \uC81C\uC870\uAE30 +block.betamindy-block-workshop.description = \uB354 \uD070 \uBE14\uB85D \uD654\uBB3C\uC744 \uC81C\uC791\uD569\uB2C8\uB2E4. \uCC98\uB9AC\uC6A9 \uBB3C\uC774 \uD544\uC694\uD569\uB2C8\uB2E4. +block.betamindy-block-factory.name = \uBE14\uB85D \uACF5\uC7A5 +block.betamindy-block-factory.description = \uD6E8\uC52C \uB354 \uD070 \uBE14\uB85D \uD654\uBB3C\uC744 \uC81C\uC791\uD569\uB2C8\uB2E4. \uBE14\uB85D \uC81C\uC870\uAE30\uC640 \uB2EC\uB9AC \uC791\uC740 \uBE14\uB85D\uB4E4\uB3C4 \uC120\uD0DD\uD560 \uC218 \uC788\uC2B5\uB2C8\uB2E4. \uB0C9\uAC01\uC218\uAC00 \uD544\uC694\uD569\uB2C8\uB2E4. +block.betamindy-block-packer.name = \uBE14\uB85D \uD328\uCEE4 +block.block-loader.description = \uBE14\uB85D \uD654\uBB3C\uC5D0 \uC790\uC6D0\uC744 \uB123\uC2B5\uB2C8\uB2E4. +block.betamindy-block-packer.description = \uB354 \uD070 \uBE14\uB85D \uB85C\uB354\uC785\uB2C8\uB2E4. \uD070 \uBE14\uB85D \uD654\uBB3C\uC5D0 \uC790\uC6D0\uC744 \uB123\uC2B5\uB2C8\uB2E4. +block.betamindy-block-unpacker.name = \uBE14\uB85D \uC5B8\uD328\uCEE4 +block.block-unloader.description = \uBE14\uB85D \uD654\uBB3C\uC5D0\uC11C \uC790\uC6D0\uC744 \uBE7C\uB0C5\uB2C8\uB2E4. +block.betamindy-block-unpacker.description = \uB354 \uD070 \uBE14\uB85D \uC5B8\uB85C\uB354\uC785\uB2C8\uB2E4. \uD070 \uBE14\uB85D \uD654\uBB3C\uC5D0\uC11C \uC790\uC6D0\uC744 \uBE7C\uB0C5\uB2C8\uB2E4. +block.betamindy-payload-deconstructor.name = \uD654\uBB3C \uBD84\uD574\uAE30 +block.betamindy-payload-deconstructor.description = \uD654\uBB3C\uC744 \uBD84\uD574\uD558\uC5EC \uC81C\uC791 \uC790\uC6D0\uC758 \uC77C\uBD80\uB97C \uBC18\uD658\uD569\uB2C8\uB2E4. \uAC74\uBB3C\uC744 \uC9C1\uC811 \uD574\uCCB4\uD558\uB294 \uAC83\uBCF4\uB2E4 \uD6A8\uC728\uC801\uC785\uB2C8\uB2E4. +block.betamindy-payload-destroyer.name = \uD654\uBB3C \uBD84\uC1C4\uAE30 +block.betamindy-payload-destroyer.description = \uB354 \uD070 \uD654\uBB3C \uBD84\uD574\uAE30\uC785\uB2C8\uB2E4. \uD654\uBB3C\uC744 \uBD84\uC1C4\uD558\uC5EC \uC81C\uC791 \uC790\uC6D0\uC758 \uC77C\uBD80\uB97C \uBC18\uD658\uD569\uB2C8\uB2E4. \uAC74\uBB3C\uC744 \uC9C1\uC811 \uD574\uCCB4\uD558\uB294 \uAC83\uBCF4\uB2E4 \uD6A8\uC728\uC801\uC785\uB2C8\uB2E4. +block.betamindy-payload-eradicator.name = \uD654\uBB3C \uBC15\uBA78\uAE30 +block.betamindy-payload-eradicator.description = \uD6E8\uC52C \uB354 \uD070 \uD654\uBB3C \uBD84\uD574\uAE30\uC785\uB2C8\uB2E4. \uD654\uBB3C\uC744 \uBC15\uBA78\uD558\uC5EC \uC81C\uC791 \uC790\uC6D0\uC758 \uC77C\uBD80\uB97C \uBC18\uD658\uD569\uB2C8\uB2E4. \uAC74\uBB3C\uC744 \uC9C1\uC811 \uD574\uCCB4\uD558\uB294 \uAC83\uBCF4\uB2E4 \uD6A8\uC728\uC801\uC785\uB2C8\uB2E4. # Environment -block.betamindy-radiation.name = 방사능 -block.betamindy-exotic-matter.name = 외계 물질 -block.betamindy-present.name = 선물 상자 -block.betamindy-present.description = 매우 성탄절스러운 블록입니다. 눌러서 열 수 있습니다. -block.betamindy-present.details = [scarlet]메리[] [lime]크리스마스[][scarlet],[] [lime]해피[] [scarlet]뉴[][lime]이어[][scarlet]![] +block.betamindy-radiation.name = \uBC29\uC0AC\uB2A5 +block.betamindy-exotic-matter.name = \uC678\uACC4 \uBB3C\uC9C8 +block.betamindy-present.name = \uC120\uBB3C \uC0C1\uC790 +block.betamindy-present.description = \uB9E4\uC6B0 \uC131\uD0C4\uC808\uC2A4\uB7EC\uC6B4 \uBE14\uB85D\uC785\uB2C8\uB2E4. \uB20C\uB7EC\uC11C \uC5F4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. +block.betamindy-present.details = [scarlet]\uBA54\uB9AC[] [lime]\uD06C\uB9AC\uC2A4\uB9C8\uC2A4[][scarlet],[] [lime]\uD574\uD53C[] [scarlet]\uB274[][lime]\uC774\uC5B4[][scarlet]![] # Effect -block.betamindy-silo.name = 수납고 -block.betamindy-silo.description = 각 유형의 매우 많은 양의 자원을 저장합니다. 언로더 블록을 사용하여 창고에서 자원을 빼낼 수 있습니다. +block.betamindy-silo.name = \uC218\uB0A9\uACE0 +block.betamindy-silo.description = \uAC01 \uC720\uD615\uC758 \uB9E4\uC6B0 \uB9CE\uC740 \uC591\uC758 \uC790\uC6D0\uC744 \uC800\uC7A5\uD569\uB2C8\uB2E4. \uC5B8\uB85C\uB354 \uBE14\uB85D\uC744 \uC0AC\uC6A9\uD558\uC5EC \uCC3D\uACE0\uC5D0\uC11C \uC790\uC6D0\uC744 \uBE7C\uB0BC \uC218 \uC788\uC2B5\uB2C8\uB2E4. # Stats -stat.dphealth = {0}x화물 체력x비거리(블록) +stat.dphealth = {0}x\uD654\uBB3C \uCCB4\uB825x\uBE44\uAC70\uB9AC(\uBE14\uB85D) # Settings -setting.slimeeffect.name = 슬라임 애니메이션 효과 [lightgray](보호막 애니메이션 필요)[] -setting.correctview.name = 위에서 본 화물 \ No newline at end of file +setting.slimeeffect.name = \uC2AC\uB77C\uC784 \uC560\uB2C8\uBA54\uC774\uC158 \uD6A8\uACFC [lightgray](\uBCF4\uD638\uB9C9 \uC560\uB2C8\uBA54\uC774\uC158 \uD544\uC694)[] +setting.correctview.name = \uC704\uC5D0\uC11C \uBCF8 \uD654\uBB3C \ No newline at end of file diff --git a/assets/sprites/production/block-factory.png b/assets/sprites/production/block-factory.png new file mode 100644 index 00000000..b6e309b9 Binary files /dev/null and b/assets/sprites/production/block-factory.png differ diff --git a/assets/sprites/production/exponential-reconstructor-top.png b/assets/sprites/production/exponential-reconstructor-top.png deleted file mode 100644 index 1bd16c4c..00000000 Binary files a/assets/sprites/production/exponential-reconstructor-top.png and /dev/null differ diff --git a/assets/sprites/production/exponential-reconstructor.png b/assets/sprites/production/exponential-reconstructor.png deleted file mode 100644 index 729bd445..00000000 Binary files a/assets/sprites/production/exponential-reconstructor.png and /dev/null differ diff --git a/assets/sprites/production/payload-eradicator-top.png b/assets/sprites/production/payload-eradicator-top.png new file mode 100644 index 00000000..7da4f77a Binary files /dev/null and b/assets/sprites/production/payload-eradicator-top.png differ diff --git a/assets/sprites/production/payload-eradicator.png b/assets/sprites/production/payload-eradicator.png new file mode 100644 index 00000000..683849ec Binary files /dev/null and b/assets/sprites/production/payload-eradicator.png differ diff --git a/assets/sprites/production/tetrative-reconstructor-top.png b/assets/sprites/production/tetrative-reconstructor-top.png deleted file mode 100644 index bf92d01f..00000000 Binary files a/assets/sprites/production/tetrative-reconstructor-top.png and /dev/null differ diff --git a/assets/sprites/production/tetrative-reconstructor.png b/assets/sprites/production/tetrative-reconstructor.png deleted file mode 100644 index deba4e99..00000000 Binary files a/assets/sprites/production/tetrative-reconstructor.png and /dev/null differ diff --git a/assets/sprites/storage/silo-team.png b/assets/sprites/storage/silo-team.png index e62b0e7e..9e3703c6 100644 Binary files a/assets/sprites/storage/silo-team.png and b/assets/sprites/storage/silo-team.png differ diff --git a/src/betamindy/content/MindyBlocks.java b/src/betamindy/content/MindyBlocks.java index ab9d8bf5..7c3e3111 100644 --- a/src/betamindy/content/MindyBlocks.java +++ b/src/betamindy/content/MindyBlocks.java @@ -26,7 +26,7 @@ public class MindyBlocks implements ContentList { //environment public static Block radiation, exoticMatter, present, //payloads - payCannon, payCatapult, blockWorkshop, blockPacker, blockUnpacker, payDeconstructor, payDestroyer, payEradicator, + payCannon, payCatapult, blockWorkshop, blockFactory, blockPacker, blockUnpacker, payDeconstructor, payDestroyer, payEradicator, //pistons piston, stickyPiston, sporeSlime, sporeSlimeSided, accel, //effect @@ -97,11 +97,23 @@ public void load() { size = 5; minBlockSize = 3; maxBlockSize = 4; - buildSpeed = 0.2f; + buildSpeed = 0.4f; liquidCapacity = 120f; consumes.power(3.25f); - consumes.liquid(Liquids.cryofluid, 1f); - requirements(Category.crafting, with(Items.thorium, 160, Items.phaseFabric, 60, Items.surgeAlloy, 45)); + consumes.liquid(Liquids.water, 1f); + requirements(Category.crafting, with(Items.thorium, 360, Items.phaseFabric, 120, Items.surgeAlloy, 60)); + }}; + + blockFactory = new ConfigBlockForge("block-factory"){{ + health = 240; + size = 7; + minBlockSize = 1; + maxBlockSize = 6; + buildSpeed = 0.6f; + liquidCapacity = 180f; + consumes.power(4.75f); + consumes.liquid(Liquids.cryofluid, 1.5f); + requirements(Category.crafting, with(Items.thorium, 640, Items.silicon, 120, Items.plastanium, 320, Items.phaseFabric, 460, Items.surgeAlloy, 480)); }}; blockPacker = new BetterBlockLoader("block-packer"){{ @@ -109,7 +121,7 @@ public void load() { size = 5; maxBlockSize = 4; consumes.power(3.25f); - requirements(Category.distribution, with(Items.thorium, 160, Items.plastanium, 65, Items.phaseFabric, 30)); + requirements(Category.distribution, with(Items.thorium, 360, Items.plastanium, 100, Items.phaseFabric, 80)); }}; blockUnpacker = new BetterBlockUnloader("block-unpacker"){{ @@ -117,7 +129,7 @@ public void load() { size = 5; maxBlockSize = 4; consumes.power(3.25f); - requirements(Category.distribution, with(Items.thorium, 160, Items.plastanium, 30, Items.phaseFabric, 65)); + requirements(Category.distribution, with(Items.thorium, 360, Items.plastanium, 80, Items.phaseFabric, 100)); }}; payDeconstructor = new PayloadDeconstructor("payload-deconstructor"){{ @@ -125,7 +137,7 @@ public void load() { size = 3; itemCapacity = 400; consumes.power(1f); - requirements(Category.crafting, with(Items.copper, 50, Items.titanium, 25, Items.silicon, 25)); + requirements(Category.crafting, with(Items.copper, 100, Items.titanium, 50, Items.silicon, 25)); }}; payDestroyer = new PayloadDeconstructor("payload-destroyer"){{ @@ -136,7 +148,7 @@ public void load() { itemCapacity = 800; refundMultiplier = 1.75f; consumes.power(1.8f); - requirements(Category.crafting, with(Items.copper, 100, Items.titanium, 95, Items.silicon, 65)); + requirements(Category.crafting, with(Items.copper, 360, Items.titanium, 95, Items.silicon, 65)); }}; payEradicator = new PayloadDeconstructor("payload-eradicator"){{ @@ -148,7 +160,7 @@ public void load() { refundMultiplier = 2f; consumes.power(2.35f); consumes.liquid(Liquids.water, 0.8f); - requirements(Category.crafting, with(Items.copper, 200, Items.titanium, 130, Items.silicon, 115, Items.phaseFabric, 35)); + requirements(Category.crafting, with(Items.copper, 610, Items.titanium, 130, Items.silicon, 115, Items.phaseFabric, 35)); }}; piston = new Piston("piston"){{ diff --git a/src/betamindy/world/blocks/production/ConfigBlockForge.java b/src/betamindy/world/blocks/production/ConfigBlockForge.java new file mode 100644 index 00000000..af9f44b8 --- /dev/null +++ b/src/betamindy/world/blocks/production/ConfigBlockForge.java @@ -0,0 +1,67 @@ +package betamindy.world.blocks.production; + +import arc.scene.ui.layout.*; +import arc.struct.*; +import betamindy.world.blocks.temporary.*; +import mindustry.Vars; +import mindustry.ui.*; +import mindustry.world.*; +import mindustry.world.blocks.*; + +public class ConfigBlockForge extends BetterBlockForge { + protected int[] minSizes = {1, 3, 5}; + protected int[] maxSizes = {2, 4, 6}; + public ConfigBlockForge(String name){ + super(name); + minBlockSize = 1; + } + + @Override + public void init(){ + super.init(); + maxSizes[2] = maxBlockSize; + } + + public class ConfigForgeBuild extends BlockForgeBuild{ + private int selection = 0; + @Override + public void buildConfiguration(Table table){ + if(recipe != null) selection = recipe.size <= 2 ? 0 : (recipe.size <= 4 ? 1 : 2); + rebuild(table); + } + + public void rebuild(Table table){ + table.clearChildren(); + table.top(); + table.table(t -> { + //float w = 172f; + t.top(); + t.button("1~2", Styles.clearTogglet, () -> { + selection = 0; + rebuild(table); + }).update(b -> { + b.setChecked(selection == 0); + }).size(58f, 40f); + t.button("3~4", Styles.clearTogglet, () -> { + selection = 1; + rebuild(table); + }).update(b -> { + b.setChecked(selection == 1); + }).size(58f, 40f); + t.button("5+", Styles.clearTogglet, () -> { + selection = 2; + rebuild(table); + }).update(b -> { + b.setChecked(selection == 2); + }).size(56f, 40f); + }).top(); + table.row(); + table.table(t2 -> { + t2.top().left(); + Seq blocks = Vars.content.blocks().select(b -> b.isVisible() && b.size >= minSizes[selection] && b.size <= maxSizes[selection]); + + ItemSelection.buildTable(t2, blocks, () -> recipe, this::configure); + }).top().left().height(200f); + } + } +} diff --git a/src/betamindy/world/blocks/temporary/BetterBlockForge.java b/src/betamindy/world/blocks/temporary/BetterBlockForge.java index 3c53291d..fdaa9907 100644 --- a/src/betamindy/world/blocks/temporary/BetterBlockForge.java +++ b/src/betamindy/world/blocks/temporary/BetterBlockForge.java @@ -1,5 +1,6 @@ package betamindy.world.blocks.temporary; +import arc.Core; import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; @@ -18,6 +19,7 @@ import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.production.*; import mindustry.world.consumers.*; +import mindustry.world.meta.Stat; import static mindustry.Vars.*; @@ -50,6 +52,13 @@ public TextureRegion[] icons(){ return new TextureRegion[]{region, outRegion}; } + @Override + public void setStats(){ + super.setStats(); + + stats.add(Stat.output, "@x@ ~ @x@", minBlockSize, minBlockSize, maxBlockSize, maxBlockSize); + } + @Override public void setBars(){ super.setBars();