From ac830856419b5b37e54020f230d67eff2ea454ad Mon Sep 17 00:00:00 2001 From: lizelive Date: Sat, 14 Nov 2020 19:29:58 -0800 Subject: [PATCH 1/3] add a ci --- .github/workflows/gradle.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 000000000..6f3057225 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,26 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: [ mc1.15/dev ] + pull_request: + branches: [ mc1.15/dev ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From 7bd339e655664d9959734b3cc0a6b1a8db489e46 Mon Sep 17 00:00:00 2001 From: grimmauld Date: Tue, 17 Nov 2020 14:13:53 +0100 Subject: [PATCH 2/3] Fix typo and messed up key --- src/generated/resources/.cache/cache | 22 ++++++++--------- .../assets/create/blockstates/fluid_pipe.json | 24 +++++++++---------- .../resources/assets/create/lang/en_us.json | 4 ++-- .../assets/create/lang/unfinished/de_de.json | 4 ++-- .../assets/create/lang/unfinished/fr_fr.json | 4 ++-- .../assets/create/lang/unfinished/it_it.json | 4 ++-- .../assets/create/lang/unfinished/ja_jp.json | 4 ++-- .../assets/create/lang/unfinished/ko_kr.json | 4 ++-- .../assets/create/lang/unfinished/nl_nl.json | 4 ++-- .../assets/create/lang/unfinished/pt_br.json | 4 ++-- .../assets/create/lang/unfinished/ru_ru.json | 4 ++-- .../assets/create/lang/unfinished/zh_cn.json | 4 ++-- .../assets/create/lang/default/messages.json | 4 ++-- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 51784dd9e..d55a79ef2 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -137,7 +137,7 @@ de8a40b7daf1497d5aecee47a43b3e0b1d030b00 assets/create/blockstates/fancy_scoria_ fc9ac0a7e7191b93516719455a17177fa6524ecc assets/create/blockstates/fancy_weathered_limestone_bricks_slab.json b2a7c321b1795f20e7433f81a55ce4683de081b8 assets/create/blockstates/fancy_weathered_limestone_bricks_stairs.json 6372fe02ba0065acb0758121c45a15a1a8fdc5de assets/create/blockstates/fancy_weathered_limestone_bricks_wall.json -fe9169716dd21a81a3710a89f0a9b7ea4dcd4d51 assets/create/blockstates/fluid_pipe.json +3d97226b5e8d8f70ed08e45e78db1faf78d5e28b assets/create/blockstates/fluid_pipe.json f0eaab18e16c4f3f65ebf3b55b08f0dc445720fe assets/create/blockstates/fluid_tank.json 5408d92ab02af86539ac42971d4033545970bb3a assets/create/blockstates/fluid_valve.json e9da1794b6ece7f9aa8bcb43d42c23a55446133b assets/create/blockstates/flywheel.json @@ -393,16 +393,16 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json 69f3eb168fafdc42a2cba5c5821eeb87dbcdbce7 assets/create/lang/en_ud.json -9df5df60232a5e1dd3efaf4257184e39111ad624 assets/create/lang/en_us.json -159631af2da49792dea199c737fa6309464901fc assets/create/lang/unfinished/de_de.json -54443e7c1f9cba37472a60db1128640b731ab7c7 assets/create/lang/unfinished/fr_fr.json -de43b03026aa6fc7366a6ee256a589f98b1226d8 assets/create/lang/unfinished/it_it.json -2195ebd8b2132418656ae2590a6447162dec7d40 assets/create/lang/unfinished/ja_jp.json -c0e99d9607d749bf502b4727de59e2ce4e720a3d assets/create/lang/unfinished/ko_kr.json -5a11abea79add0bfb4446575758d9d161c371a44 assets/create/lang/unfinished/nl_nl.json -d6f614f2df962ba58437913ac087f47a9d3f7738 assets/create/lang/unfinished/pt_br.json -f34270ac1d4386282c05108b837f1b2cb4f95afc assets/create/lang/unfinished/ru_ru.json -b80b00116f876d54a2176bc08bf575e497863fea assets/create/lang/unfinished/zh_cn.json +abc5831efdfe57b30706266f99148a753038a875 assets/create/lang/en_us.json +6f9c96ce87206a49f85e34341d666b20bc028c3a assets/create/lang/unfinished/de_de.json +f174041d9eee734ff7dd78b412843627b4b06b27 assets/create/lang/unfinished/fr_fr.json +60bd5b28764875b424f114e885df26820cb57126 assets/create/lang/unfinished/it_it.json +9fad65c580adf3b96ea77578b30abbb05b7fa818 assets/create/lang/unfinished/ja_jp.json +c0bbd476bdef822e1c66923f071176311ede2be9 assets/create/lang/unfinished/ko_kr.json +232f70b11fbc22c06bd58af2e415f3d3571934d1 assets/create/lang/unfinished/nl_nl.json +1dcc841771d2def6f06ca67aa4d1e7728299fcec assets/create/lang/unfinished/pt_br.json +4aa03cba6a225a079a5270ce5c0d0b0570a3429a assets/create/lang/unfinished/ru_ru.json +b082722b88ba8a317fa3c7976628138e6f9d3448 assets/create/lang/unfinished/zh_cn.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/blockstates/fluid_pipe.json b/src/generated/resources/assets/create/blockstates/fluid_pipe.json index f6ea8ac45..a4cffcde7 100644 --- a/src/generated/resources/assets/create/blockstates/fluid_pipe.json +++ b/src/generated/resources/assets/create/blockstates/fluid_pipe.json @@ -303,8 +303,8 @@ { "when": { "west": "false", - "east": "true", "down": "false", + "east": "true", "up": "true" }, "apply": { @@ -314,8 +314,8 @@ { "when": { "west": "true", - "east": "false", "down": "false", + "east": "false", "up": "true" }, "apply": { @@ -325,8 +325,8 @@ { "when": { "west": "false", - "east": "true", "down": "true", + "east": "true", "up": "false" }, "apply": { @@ -336,8 +336,8 @@ { "when": { "west": "true", - "east": "false", "down": "true", + "east": "false", "up": "false" }, "apply": { @@ -347,8 +347,8 @@ { "when": { "west": "false", - "east": "false", "down": "true", + "east": "false", "up": "true" }, "apply": { @@ -358,8 +358,8 @@ { "when": { "west": "false", - "east": "false", "down": "false", + "east": "false", "up": "true" }, "apply": { @@ -369,8 +369,8 @@ { "when": { "west": "false", - "east": "false", "down": "true", + "east": "false", "up": "false" }, "apply": { @@ -380,8 +380,8 @@ { "when": { "west": "true", - "east": "true", "down": "false", + "east": "true", "up": "false" }, "apply": { @@ -391,8 +391,8 @@ { "when": { "west": "false", - "east": "true", "down": "false", + "east": "true", "up": "false" }, "apply": { @@ -402,8 +402,8 @@ { "when": { "west": "true", - "east": "false", "down": "false", + "east": "false", "up": "false" }, "apply": { @@ -413,8 +413,8 @@ { "when": { "west": "false", - "east": "false", "down": "false", + "east": "false", "up": "false" }, "apply": { @@ -422,4 +422,4 @@ } } ] -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index 24819a18f..e727a3aec 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -755,7 +755,7 @@ "create.schematicAndQuill.noTarget": "Hold [Ctrl] to select Air blocks.", "create.schematicAndQuill.abort": "Removed selection.", "create.schematicAndQuill.title": "Schematic Name:", - "create.schematicAndQuill.convetr": "Save and Deploy Immediately", + "create.schematicAndQuill.convert": "Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "My Schematic", "create.schematicAndQuill.saved": "Saved as %1$s", @@ -973,7 +973,7 @@ "create.tunnel.selection_mode.synchronize": "Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "No Targets", - "create.hint.mechanical_arm_no_targets": "It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "Horizontal Funnels", "create.hint.horizontal_funnel": "cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index 87d1d7a2c..d72c31dca 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Halte [Strg] zur Auswahl von Luft.", "create.schematicAndQuill.abort": "Auswahl zurückgesetzt.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "Mein Bauplan", "create.schematicAndQuill.saved": "Gespeichert als %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index d0a6609c2..833a838bb 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Enfoncez [Ctrl] pour sélectionner les blocs d'air.", "create.schematicAndQuill.abort": "Sélection supprimée.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "Mon schéma", "create.schematicAndQuill.saved": "Sauvegardé en tant que %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 3f64d9a28..524c04304 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Premi [Ctrl] per selezionare il Blocco d'Aria.", "create.schematicAndQuill.abort": "Selezione rimossa.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "La mia Schematica", "create.schematicAndQuill.saved": "Salvata come %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index fed5f62db..5a39629b3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "[Ctrl] を押したままで空気ブロックを選択します", "create.schematicAndQuill.abort": "選択を削除しました。", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "My Schematic", "create.schematicAndQuill.saved": "%1$s として保存しました", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 8b45e5d71..0332e4d02 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "[Ctrl]을 눌러 공기 블럭을 선택하기.", "create.schematicAndQuill.abort": "위치 제거됨.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "내 청사진", "create.schematicAndQuill.saved": "%1$s로 저장됨", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index caeeb53ef..228084eb9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Houd [Ctrl] ingedrukt om een Lucht block te kiezen.", "create.schematicAndQuill.abort": "Keuze verwijderd.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "Mijn Bouwtekening", "create.schematicAndQuill.saved": "Opgeslagen als %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index 2ef05594a..ae49231ef 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Seguro [Ctrl] para selecionar Blocos de Ar.", "create.schematicAndQuill.abort": "Seleção removida.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "Meu Esquema", "create.schematicAndQuill.saved": "Salvo como %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index c5e369236..8d555015e 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "Удерживайте [Ctrl], чтобы выбрать воздушные блоки.", "create.schematicAndQuill.abort": "Выделение убрано", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "Моя схематика", "create.schematicAndQuill.saved": "Сохранено как %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index 897dbedfc..d720c6a0a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -756,7 +756,7 @@ "create.schematicAndQuill.noTarget": "按住Ctrl选择空气方块.", "create.schematicAndQuill.abort": "删除选择.", "create.schematicAndQuill.title": "UNLOCALIZED: Schematic Name:", - "create.schematicAndQuill.convetr": "UNLOCALIZED: Save and Deploy Immediately", + "create.schematicAndQuill.convert": "UNLOCALIZED: Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "我的蓝图", "create.schematicAndQuill.saved": "另存为 %1$s", @@ -974,7 +974,7 @@ "create.tunnel.selection_mode.synchronize": "UNLOCALIZED: Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "UNLOCALIZED: No Targets", - "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "UNLOCALIZED: It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "UNLOCALIZED: Horizontal Funnels", "create.hint.horizontal_funnel": "UNLOCALIZED: cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "UNLOCALIZED: Funnels facing upward", diff --git a/src/main/resources/assets/create/lang/default/messages.json b/src/main/resources/assets/create/lang/default/messages.json index b891eb5ae..a070b1bc8 100644 --- a/src/main/resources/assets/create/lang/default/messages.json +++ b/src/main/resources/assets/create/lang/default/messages.json @@ -211,7 +211,7 @@ "create.schematicAndQuill.noTarget": "Hold [Ctrl] to select Air blocks.", "create.schematicAndQuill.abort": "Removed selection.", "create.schematicAndQuill.title": "Schematic Name:", - "create.schematicAndQuill.convetr": "Save and Deploy Immediately", + "create.schematicAndQuill.convert": "Save and Deploy Immediately", "create.schematicAndQuill.fallbackName": "My Schematic", "create.schematicAndQuill.saved": "Saved as %1$s", @@ -439,7 +439,7 @@ "create.tunnel.selection_mode.synchronize": "Synchronize Inputs", "create.hint.mechanical_arm_no_targets.title": "No Targets", - "create.hint.mechanical_arm_no_targets": "It appears this _Mechnanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", + "create.hint.mechanical_arm_no_targets": "It appears this _Mechanical_ _Arm_ has not been assigned any _targets._ Select belts, depots, funnels and other blocks by _right-clicking_ them while _holding_ the _Mechanical_ _Arm_ in your _hand_.", "create.hint.horizontal_funnel.title": "Horizontal Funnels", "create.hint.horizontal_funnel": "cannot transfer between inventories _directly_. Try running a _Mechanical_ _Belt_ or _Depot_ below your funnel to extract items from Inventories.", "create.hint.upward_funnel.title": "Funnels facing upward", From 8dff92e0bf76fb84b3ae4adef68706146be16202 Mon Sep 17 00:00:00 2001 From: grimmauld Date: Tue, 17 Nov 2020 14:35:07 +0100 Subject: [PATCH 3/3] Added chest minecart contraption item and wrenching of chest minecart contraptions --- src/generated/resources/.cache/cache | 23 +++++++++--------- .../resources/assets/create/lang/en_ud.json | 1 + .../resources/assets/create/lang/en_us.json | 1 + .../assets/create/lang/unfinished/de_de.json | 3 ++- .../assets/create/lang/unfinished/fr_fr.json | 3 ++- .../assets/create/lang/unfinished/it_it.json | 3 ++- .../assets/create/lang/unfinished/ja_jp.json | 3 ++- .../assets/create/lang/unfinished/ko_kr.json | 3 ++- .../assets/create/lang/unfinished/nl_nl.json | 3 ++- .../assets/create/lang/unfinished/pt_br.json | 3 ++- .../assets/create/lang/unfinished/ru_ru.json | 3 ++- .../assets/create/lang/unfinished/zh_cn.json | 3 ++- .../item/chest_minecart_contraption.json | 6 +++++ .../java/com/simibubi/create/AllItems.java | 4 +++ .../mounted/MinecartContraptionItem.java | 23 +++++++++++++++--- .../item/chest_minecart_contraption.png | Bin 0 -> 582 bytes 16 files changed, 61 insertions(+), 24 deletions(-) create mode 100644 src/generated/resources/assets/create/models/item/chest_minecart_contraption.json create mode 100644 src/main/resources/assets/create/textures/item/chest_minecart_contraption.png diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d55a79ef2..caa157bcd 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -392,17 +392,17 @@ a3a11524cd3515fc01d905767b4b7ea782adaf03 assets/create/blockstates/yellow_seat.j 6801fa1f466f172700e573e5b8ee8ee5f9ca4583 assets/create/blockstates/yellow_valve_handle.json 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json -69f3eb168fafdc42a2cba5c5821eeb87dbcdbce7 assets/create/lang/en_ud.json -abc5831efdfe57b30706266f99148a753038a875 assets/create/lang/en_us.json -6f9c96ce87206a49f85e34341d666b20bc028c3a assets/create/lang/unfinished/de_de.json -f174041d9eee734ff7dd78b412843627b4b06b27 assets/create/lang/unfinished/fr_fr.json -60bd5b28764875b424f114e885df26820cb57126 assets/create/lang/unfinished/it_it.json -9fad65c580adf3b96ea77578b30abbb05b7fa818 assets/create/lang/unfinished/ja_jp.json -c0bbd476bdef822e1c66923f071176311ede2be9 assets/create/lang/unfinished/ko_kr.json -232f70b11fbc22c06bd58af2e415f3d3571934d1 assets/create/lang/unfinished/nl_nl.json -1dcc841771d2def6f06ca67aa4d1e7728299fcec assets/create/lang/unfinished/pt_br.json -4aa03cba6a225a079a5270ce5c0d0b0570a3429a assets/create/lang/unfinished/ru_ru.json -b082722b88ba8a317fa3c7976628138e6f9d3448 assets/create/lang/unfinished/zh_cn.json +04f295b9cbe610bb3664e956437ae68d2a0776ad assets/create/lang/en_ud.json +3912eddc0fdb76afe08961c9d9ad9fe776fbbef5 assets/create/lang/en_us.json +66e50a9482f186f3b0b066bcc7a8d6194b5892b4 assets/create/lang/unfinished/de_de.json +d0adae002c2ca46ad24d4f08037308334c239c69 assets/create/lang/unfinished/fr_fr.json +98b6589d85a68eb4460a7d2da96816b026436c14 assets/create/lang/unfinished/it_it.json +9a9477f8257367993760fbc9e4b65a2d8190b868 assets/create/lang/unfinished/ja_jp.json +e9e466d962ccba589d6d14e37c82e98076a3e614 assets/create/lang/unfinished/ko_kr.json +9e8277f247b069bb45fd45b086a5138ec160847f assets/create/lang/unfinished/nl_nl.json +707ec25a7f45dd3dca8b96d4031b38d1be64f840 assets/create/lang/unfinished/pt_br.json +f645e781db3e254d64ea4b20a553e713bfca3610 assets/create/lang/unfinished/ru_ru.json +1e8a48a6ba2d7ec7947c312835c332e869757526 assets/create/lang/unfinished/zh_cn.json 846200eb548d3bfa2e77b41039de159b4b6cfb45 assets/create/models/block/acacia_window.json 1930fa3a3c98d53dd19e4ee7f55bc27fd47aa281 assets/create/models/block/acacia_window_pane_noside.json 1763ea2c9b981d187f5031ba608f3d5d3be3986a assets/create/models/block/acacia_window_pane_noside_alt.json @@ -1143,6 +1143,7 @@ a37be4a0ec9bf6c381527403c57ced4f81abd67c assets/create/models/item/brass_nugget. 24df6f8391d8ba09cef46e69d65d32ea770745cd assets/create/models/item/brown_seat.json 54211d3bdbeba2ea4dbaed43daa740ae3331640f assets/create/models/item/brown_valve_handle.json 3e232a103f7f916fc11edb4d541ca99fe7b44181 assets/create/models/item/cart_assembler.json +c9be9d3f8d01ed7e283fdcf347c88458af13460a assets/create/models/item/chest_minecart_contraption.json 99d64b76b3baa84c3bd4b96ccd3376ca12425950 assets/create/models/item/chiseled_dark_scoria.json 83d3571eacde52568786802b268f24c6578c1e5d assets/create/models/item/chiseled_dolomite.json afd697168c9786eb80e54eccdc6a23afa6c7fb0e assets/create/models/item/chiseled_gabbro.json diff --git a/src/generated/resources/assets/create/lang/en_ud.json b/src/generated/resources/assets/create/lang/en_ud.json index e376faec4..1e75bdd5e 100644 --- a/src/generated/resources/assets/create/lang/en_ud.json +++ b/src/generated/resources/assets/create/lang/en_ud.json @@ -406,6 +406,7 @@ "item.create.brass_ingot": "\u0287obuI ss\u0250\u0279\u15FA", "item.create.brass_nugget": "\u0287\u01DDbbnN ss\u0250\u0279\u15FA", "item.create.brass_sheet": "\u0287\u01DD\u01DD\u0265S ss\u0250\u0279\u15FA", + "item.create.chest_minecart_contraption": "uo\u0131\u0287d\u0250\u0279\u0287uo\u0186 \u0287\u0279\u0250\u0254\u01DDu\u0131W \u0287s\u01DD\u0265\u0186", "item.create.chromatic_compound": "punod\u026Fo\u0186 \u0254\u0131\u0287\u0250\u026Fo\u0279\u0265\u0186", "item.create.cinder_flour": "\u0279no\u05DF\u2132 \u0279\u01DDpu\u0131\u0186", "item.create.copper_ingot": "\u0287obuI \u0279\u01DDddo\u0186", diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index e727a3aec..1b4620c5e 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -412,6 +412,7 @@ "item.create.brass_ingot": "Brass Ingot", "item.create.brass_nugget": "Brass Nugget", "item.create.brass_sheet": "Brass Sheet", + "item.create.chest_minecart_contraption": "Chest Minecart Contraption", "item.create.chromatic_compound": "Chromatic Compound", "item.create.cinder_flour": "Cinder Flour", "item.create.copper_ingot": "Copper Ingot", diff --git a/src/generated/resources/assets/create/lang/unfinished/de_de.json b/src/generated/resources/assets/create/lang/unfinished/de_de.json index d72c31dca..31cd74c98 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1041", + "_": "Missing Localizations: 1042", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "UNLOCALIZED: Brass Ingot", "item.create.brass_nugget": "UNLOCALIZED: Brass Nugget", "item.create.brass_sheet": "UNLOCALIZED: Brass Sheet", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "UNLOCALIZED: Copper Ingot", diff --git a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json index 833a838bb..734ffd347 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 670", + "_": "Missing Localizations: 671", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "Lingot de laiton", "item.create.brass_nugget": "Pépite de laiton", "item.create.brass_sheet": "Plaques de laiton", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "Composé chromatique", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "Lingot de cuivre", diff --git a/src/generated/resources/assets/create/lang/unfinished/it_it.json b/src/generated/resources/assets/create/lang/unfinished/it_it.json index 524c04304..7b822c68d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 654", + "_": "Missing Localizations: 655", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "Lingotto di Ottone", "item.create.brass_nugget": "Pepita di Ottone", "item.create.brass_sheet": "Lamiera di Ottone", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "Composto Cromatico", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "Lingotto di Rame", diff --git a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json index 5a39629b3..b8dbdb671 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 653", + "_": "Missing Localizations: 654", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "真鍮インゴット", "item.create.brass_nugget": "真鍮ナゲット", "item.create.brass_sheet": "真鍮シート", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "色彩の化合物", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "銅インゴット", diff --git a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json index 0332e4d02..3a019fae3 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 654", + "_": "Missing Localizations: 655", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "황동 주괴", "item.create.brass_nugget": "황동 조각", "item.create.brass_sheet": "황동 판", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "색채 혼합물", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "구리 주괴", diff --git a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json index 228084eb9..f622b9656 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 982", + "_": "Missing Localizations: 983", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "UNLOCALIZED: Brass Ingot", "item.create.brass_nugget": "Brons klompje", "item.create.brass_sheet": "Brons Platen", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "Koperstaaf", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_br.json b/src/generated/resources/assets/create/lang/unfinished/pt_br.json index ae49231ef..80d89f6e0 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 1048", + "_": "Missing Localizations: 1049", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "UNLOCALIZED: Brass Ingot", "item.create.brass_nugget": "UNLOCALIZED: Brass Nugget", "item.create.brass_sheet": "UNLOCALIZED: Brass Sheet", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "UNLOCALIZED: Chromatic Compound", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "UNLOCALIZED: Copper Ingot", diff --git a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json index 8d555015e..76a352012 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ru_ru.json +++ b/src/generated/resources/assets/create/lang/unfinished/ru_ru.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 323", + "_": "Missing Localizations: 324", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "Латунный слиток", "item.create.brass_nugget": "Кусочек латуни", "item.create.brass_sheet": "Латунный лист", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "Хроматический компаунд", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "Медный слиток", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json index d720c6a0a..8c1ef7e62 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1,5 +1,5 @@ { - "_": "Missing Localizations: 336", + "_": "Missing Localizations: 337", "_": "->------------------------] Game Elements [------------------------<-", @@ -413,6 +413,7 @@ "item.create.brass_ingot": "黄铜锭", "item.create.brass_nugget": "黄铜粒", "item.create.brass_sheet": "黄铜板", + "item.create.chest_minecart_contraption": "UNLOCALIZED: Chest Minecart Contraption", "item.create.chromatic_compound": "异彩化合物", "item.create.cinder_flour": "UNLOCALIZED: Cinder Flour", "item.create.copper_ingot": "铜锭", diff --git a/src/generated/resources/assets/create/models/item/chest_minecart_contraption.json b/src/generated/resources/assets/create/models/item/chest_minecart_contraption.json new file mode 100644 index 000000000..f823cc640 --- /dev/null +++ b/src/generated/resources/assets/create/models/item/chest_minecart_contraption.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "create:item/chest_minecart_contraption" + } +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/AllItems.java b/src/main/java/com/simibubi/create/AllItems.java index d262aa925..a779c7aae 100644 --- a/src/main/java/com/simibubi/create/AllItems.java +++ b/src/main/java/com/simibubi/create/AllItems.java @@ -168,6 +168,10 @@ public class AllItems { REGISTRATE.item("furnace_minecart_contraption", MinecartContraptionItem::furnace) .register(); + public static final ItemEntry CHEST_MINECART_CONTRAPTION = + REGISTRATE.item("chest_minecart_contraption", MinecartContraptionItem::chest) + .register(); + // Logistics static { diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 6ed2b83c3..191de2638 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -50,6 +50,10 @@ public class MinecartContraptionItem extends Item { return new MinecartContraptionItem(Type.FURNACE, builder); } + public static MinecartContraptionItem chest(Properties builder) { + return new MinecartContraptionItem(Type.CHEST, builder); + } + private MinecartContraptionItem(Type minecartTypeIn, Properties builder) { super(builder); this.minecartType = minecartTypeIn; @@ -199,7 +203,7 @@ public class MinecartContraptionItem extends Item { return; AbstractMinecartEntity cart = (AbstractMinecartEntity) entity; Type type = cart.getMinecartType(); - if (type != Type.RIDEABLE && type != Type.FURNACE) + if (type != Type.RIDEABLE && type != Type.FURNACE && type != Type.CHEST) return; List passengers = cart.getPassengers(); if (passengers.isEmpty() || !(passengers.get(0) instanceof ContraptionEntity)) @@ -217,8 +221,20 @@ public class MinecartContraptionItem extends Item { } public static ItemStack create(Type type, ContraptionEntity entity) { - ItemStack stack = - (type == Type.RIDEABLE ? AllItems.MINECART_CONTRAPTION : AllItems.FURNACE_MINECART_CONTRAPTION).asStack(); + ItemStack stack = ItemStack.EMPTY; + switch (type) { + case RIDEABLE: + stack = AllItems.MINECART_CONTRAPTION.asStack(); + break; + case FURNACE: + stack = AllItems.FURNACE_MINECART_CONTRAPTION.asStack(); + break; + case CHEST: + stack = AllItems.CHEST_MINECART_CONTRAPTION.asStack(); + break; + } + if (stack == ItemStack.EMPTY) + return stack; CompoundNBT tag = entity.getContraption() .writeNBT(); tag.remove("UUID"); @@ -233,5 +249,4 @@ public class MinecartContraptionItem extends Item { .put("Contraption", tag); return stack; } - } diff --git a/src/main/resources/assets/create/textures/item/chest_minecart_contraption.png b/src/main/resources/assets/create/textures/item/chest_minecart_contraption.png new file mode 100644 index 0000000000000000000000000000000000000000..747ff905828c8c717ea6a11cc53cd87cca7087d8 GIT binary patch literal 582 zcmV-M0=fN(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0ozGLK~y+Tt&`C! zWKkT)zhg!_T5X%Tb|SnO8ZA+lRuN`O%FEU^t&~SE@=hrY5B?U9Qc4rU8Z}}cFk~{k zNUWJVvsPnfMB)2$?`^J;C*L~voO}9xKfmv}oom4xa@Tx((3Xgv-n?2{q|GML$nlWP zfupVKhY6N16ICyAl-T9Htki~7`W|ZP3hjM^*bdDXBry`uJUB8X9cip|l*0bOF6;Ul z1zUkRxLdphNlZsrURpr!&k-D*syI)kWe{?fNJA<6jKlC^0Ym`Z9}{W$#|FD56(WluL(C|_`)#>Gt8_&C|$<>ipC z>gn#3LPAG-y0E?$LTmds!@Rm0z*abnY&Iho%E|}zFMc_Fb(8U1ifnS6&Fw!ZwpbT}l{Qv*} literal 0 HcmV?d00001