From 1ec63c1511d1fa03f39556e3914306e221c08439 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 12 Jul 2022 17:51:25 +0200 Subject: [PATCH] Patch it while its hot - Fixed Dedicated server crash when riding a train - Fixed broken localisation component in super glue editor - Fixed display links not showing correct icons for dyed nixie tubes --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + gradle.properties | 2 +- src/generated/resources/.cache/cache | 32 +++++++++---------- .../resources/assets/create/lang/en_us.json | 2 +- .../assets/create/lang/unfinished/de_de.json | 2 +- .../assets/create/lang/unfinished/es_cl.json | 2 +- .../assets/create/lang/unfinished/es_es.json | 2 +- .../assets/create/lang/unfinished/fr_fr.json | 2 +- .../assets/create/lang/unfinished/it_it.json | 2 +- .../assets/create/lang/unfinished/ja_jp.json | 2 +- .../assets/create/lang/unfinished/ko_kr.json | 2 +- .../assets/create/lang/unfinished/nl_nl.json | 2 +- .../assets/create/lang/unfinished/pl_pl.json | 2 +- .../assets/create/lang/unfinished/pt_br.json | 2 +- .../assets/create/lang/unfinished/pt_pt.json | 2 +- .../assets/create/lang/unfinished/ro_ro.json | 2 +- .../assets/create/lang/unfinished/ru_ru.json | 4 +-- .../assets/create/lang/unfinished/zh_cn.json | 2 +- .../assets/create/lang/unfinished/zh_tw.json | 2 +- src/main/java/com/simibubi/create/Create.java | 3 +- .../block/display/DisplayLinkScreen.java | 24 +++++++------- .../logistics/trains/entity/Carriage.java | 1 - .../logistics/trains/track/TrackRenderer.java | 1 - src/main/resources/META-INF/mods.toml | 2 +- .../assets/create/lang/default/interface.json | 2 +- 25 files changed, 52 insertions(+), 50 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index d6bfe3f47..37521770e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -49,6 +49,7 @@ body: label: Mod Version description: The version of the mod you were using when the bug occured options: + - "0.5.0c" - "0.5.0b" - "0.5.0a" - "0.5.0" diff --git a/gradle.properties b/gradle.properties index ac87c8be7..4848de810 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx3G org.gradle.daemon = false # mod version info -mod_version = 0.5.0b +mod_version = 0.5.0c minecraft_version = 1.18.2 forge_version = 40.1.60 diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 49dbe71ac..5bf871ea3 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -559,22 +559,22 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo 7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json f85edc574ee6de0de7693ffb031266643db6724a assets/create/lang/en_ud.json -0912780ccfaa354b7e087bbba6566e9b9a671532 assets/create/lang/en_us.json -2e8f7904ef8505d4801f5ca6f49dc0f02abd4dfe assets/create/lang/unfinished/de_de.json -88c44f31d872f8c81e1bacc87723f2f5dcc9223b assets/create/lang/unfinished/es_cl.json -8297f8bd9645fa5164f771186045008322bdb09b assets/create/lang/unfinished/es_es.json -3f15c1c88813587118eeb6d8924bd5ca4740c3c5 assets/create/lang/unfinished/fr_fr.json -988f0a32fe31ab650b954dc4e79019a8f9c62817 assets/create/lang/unfinished/it_it.json -f55115e4346dbcb621d13cd0507f513e800cb1dd assets/create/lang/unfinished/ja_jp.json -e5aa8d44679a9f9e9834dd0035e83e4afb6880f9 assets/create/lang/unfinished/ko_kr.json -71baa135eabfc47c6ea0c91c228de5ba75cb0ab0 assets/create/lang/unfinished/nl_nl.json -978c4f49816e89e00c9f52d6adc6d8c28e07f444 assets/create/lang/unfinished/pl_pl.json -e5f41a077f9e43fcc9703766df83ceee8f3f9408 assets/create/lang/unfinished/pt_br.json -bc235c04748b43160b62400dee47713d98b97093 assets/create/lang/unfinished/pt_pt.json -ac1f0cd7fa76ebcbc3020b82c4d93716a98c225c assets/create/lang/unfinished/ro_ro.json -f4cce36c92c3c776e190c82b99e5b4ed8930c835 assets/create/lang/unfinished/ru_ru.json -c10de552797c819ed686aa9ec345f34c8424a007 assets/create/lang/unfinished/zh_cn.json -82adbce8f58913d07a5d3545ddd40873340ae406 assets/create/lang/unfinished/zh_tw.json +f9fcf3163210806f6cea642b13d36632f3f3c533 assets/create/lang/en_us.json +fcf6c0723f89de67ab5f30e01305522b236bd824 assets/create/lang/unfinished/de_de.json +9083ade329d6b2c7469339f2c7ab54d7866f90ff assets/create/lang/unfinished/es_cl.json +db21f76f89573602c77b988371453013bac530cb assets/create/lang/unfinished/es_es.json +b1ed4fc7258f6fb93127e84ed4364f7cc224be2b assets/create/lang/unfinished/fr_fr.json +7cf94dae2536d27f32cfe7aad3a9a9eb7b9978ac assets/create/lang/unfinished/it_it.json +b8252343025f1555ae717e03b7503bfd9c1069f7 assets/create/lang/unfinished/ja_jp.json +bcc01ee88c1877e46f280c967d92b506d328b08d assets/create/lang/unfinished/ko_kr.json +4fd2bf884f18bf833d9819aed2f6fe83cc8ea9a6 assets/create/lang/unfinished/nl_nl.json +e32d5b48ca498b97e036f5cdf0f3b4192b478adf assets/create/lang/unfinished/pl_pl.json +f9d8fdca30725e5e340f7c2727eb3da197081a25 assets/create/lang/unfinished/pt_br.json +f5648cf550a440d2c60dcb7f8b4605d89f0f9713 assets/create/lang/unfinished/pt_pt.json +6f283e7589df6c2293be271846535887bf5a288c assets/create/lang/unfinished/ro_ro.json +119f9953874f07d016fd9602510221de0cd1730b assets/create/lang/unfinished/ru_ru.json +6a5ab805701021b67b4585f0ae014e4b509d8c45 assets/create/lang/unfinished/zh_cn.json +a6eff86622e24eda8f490587734c19526d0c6ecf assets/create/lang/unfinished/zh_tw.json 487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json 3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json diff --git a/src/generated/resources/assets/create/lang/en_us.json b/src/generated/resources/assets/create/lang/en_us.json index d1a71b87d..a0116afcb 100644 --- a/src/generated/resources/assets/create/lang/en_us.json +++ b/src/generated/resources/assets/create/lang/en_us.json @@ -1718,7 +1718,7 @@ "create.super_glue.first_pos": "First position selected", "create.super_glue.abort": "Selection discarded", "create.super_glue.not_enough": "Not enough glue in inventory", - "create.super_glue.sucess": "Applying Glue...", + "create.super_glue.success": "Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "This is a sample overlay", 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 28ef4ec41..20c218374 100644 --- a/src/generated/resources/assets/create/lang/unfinished/de_de.json +++ b/src/generated/resources/assets/create/lang/unfinished/de_de.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "Dies ist ein Beispiel Overlay", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_cl.json b/src/generated/resources/assets/create/lang/unfinished/es_cl.json index fe7636b63..ca1351047 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_cl.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_cl.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hola :)", "create.gui.config.overlay2": "Este es un overlay de ejemplo", diff --git a/src/generated/resources/assets/create/lang/unfinished/es_es.json b/src/generated/resources/assets/create/lang/unfinished/es_es.json index 4f994e89b..fb4a2413d 100644 --- a/src/generated/resources/assets/create/lang/unfinished/es_es.json +++ b/src/generated/resources/assets/create/lang/unfinished/es_es.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hola :)", "create.gui.config.overlay2": "Esta es una muestra de la superposición", 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 b9eb5f596..ee1c3f676 100644 --- a/src/generated/resources/assets/create/lang/unfinished/fr_fr.json +++ b/src/generated/resources/assets/create/lang/unfinished/fr_fr.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "UNLOCALIZED: Hi :)", "create.gui.config.overlay2": "UNLOCALIZED: This is a sample overlay", 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 aa6e0e635..626ff0dd5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/it_it.json +++ b/src/generated/resources/assets/create/lang/unfinished/it_it.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Ciao :)", "create.gui.config.overlay2": "Questo overlay è di esempio", 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 288bba56a..12107c8c9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ja_jp.json +++ b/src/generated/resources/assets/create/lang/unfinished/ja_jp.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "やぁ(・∀・)", "create.gui.config.overlay2": "これはオーバーレイのサンプルです", 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 453299206..ce10bb801 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ko_kr.json +++ b/src/generated/resources/assets/create/lang/unfinished/ko_kr.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "This is a sample overlay", 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 438cab225..573e6a3f5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/nl_nl.json +++ b/src/generated/resources/assets/create/lang/unfinished/nl_nl.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "UNLOCALIZED: Hi :)", "create.gui.config.overlay2": "UNLOCALIZED: This is a sample overlay", diff --git a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json index c9a850282..7e184a856 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pl_pl.json +++ b/src/generated/resources/assets/create/lang/unfinished/pl_pl.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Cześć :)", "create.gui.config.overlay2": "To jest przykładowa nakładka", 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 138f9873f..070e9be01 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_br.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_br.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Oi :)", "create.gui.config.overlay2": "UNLOCALIZED: This is a sample overlay", diff --git a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json index 67f3a513b..495bcb454 100644 --- a/src/generated/resources/assets/create/lang/unfinished/pt_pt.json +++ b/src/generated/resources/assets/create/lang/unfinished/pt_pt.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "UNLOCALIZED: Hi :)", "create.gui.config.overlay2": "UNLOCALIZED: This is a sample overlay", diff --git a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json index a94619124..ca47740a9 100644 --- a/src/generated/resources/assets/create/lang/unfinished/ro_ro.json +++ b/src/generated/resources/assets/create/lang/unfinished/ro_ro.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "This is a sample overlay", 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 4376e62c3..a36d7059d 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: 0", + "_": "Missing Localizations: 1", "_": "->------------------------] Game Elements [------------------------<-", @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "Выбрана первая позиция", "create.super_glue.abort": "Выбор отклонен", "create.super_glue.not_enough": "Мало клея в инвентаре", - "create.super_glue.sucess": "Нанесение клея...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Привет :)", "create.gui.config.overlay2": "Это образец оверлея", 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 09f21c42b..84c200c7a 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_cn.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_cn.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "这是一个叠加层例子", diff --git a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json index d80142aa2..b5c7bb1c5 100644 --- a/src/generated/resources/assets/create/lang/unfinished/zh_tw.json +++ b/src/generated/resources/assets/create/lang/unfinished/zh_tw.json @@ -1719,7 +1719,7 @@ "create.super_glue.first_pos": "UNLOCALIZED: First position selected", "create.super_glue.abort": "UNLOCALIZED: Selection discarded", "create.super_glue.not_enough": "UNLOCALIZED: Not enough glue in inventory", - "create.super_glue.sucess": "UNLOCALIZED: Applying Glue...", + "create.super_glue.success": "UNLOCALIZED: Applying Glue...", "create.gui.config.overlay1": "嗨 :)", "create.gui.config.overlay2": "這是一個實例層", diff --git a/src/main/java/com/simibubi/create/Create.java b/src/main/java/com/simibubi/create/Create.java index 99d424492..481edf9aa 100644 --- a/src/main/java/com/simibubi/create/Create.java +++ b/src/main/java/com/simibubi/create/Create.java @@ -20,6 +20,7 @@ import com.simibubi.create.content.logistics.block.display.AllDisplayBehaviours; import com.simibubi.create.content.logistics.block.mechanicalArm.AllArmInteractionPointTypes; import com.simibubi.create.content.logistics.trains.GlobalRailwayManager; import com.simibubi.create.content.palettes.AllPaletteBlocks; +import com.simibubi.create.content.palettes.PalettesItemGroup; import com.simibubi.create.content.schematics.SchematicProcessor; import com.simibubi.create.content.schematics.ServerSchematicLoader; import com.simibubi.create.content.schematics.filtering.SchematicInstances; @@ -63,7 +64,7 @@ public class Create { public static final String ID = "create"; public static final String NAME = "Create"; - public static final String VERSION = "0.5b"; + public static final String VERSION = "0.5c"; public static final Logger LOGGER = LogManager.getLogger(); diff --git a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java index 711d41468..5ad126c0e 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/display/DisplayLinkScreen.java @@ -30,12 +30,12 @@ import com.simibubi.create.foundation.utility.Lang; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.TextComponent; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; @@ -99,24 +99,26 @@ public class DisplayLinkScreen extends AbstractSimiScreen { initGathererOptions(); } + @SuppressWarnings("deprecation") private void initGathererOptions() { - sourceState = minecraft.level.getBlockState(te.getSourcePosition()); - targetState = minecraft.level.getBlockState(te.getTargetPosition()); + ClientLevel level = minecraft.level; + sourceState = level.getBlockState(te.getSourcePosition()); + targetState = level.getBlockState(te.getTargetPosition()); - Item asItem; + ItemStack asItem; int x = guiLeft; int y = guiTop; Block sourceBlock = sourceState.getBlock(); Block targetBlock = targetState.getBlock(); - asItem = sourceBlock.asItem(); - ItemStack sourceIcon = asItem == null || asItem == Items.AIR ? FALLBACK : new ItemStack(asItem); - asItem = targetBlock.asItem(); - ItemStack targetIcon = asItem == null || asItem == Items.AIR ? FALLBACK : new ItemStack(asItem); + asItem = sourceBlock.getCloneItemStack(level, te.getSourcePosition(), sourceState); + ItemStack sourceIcon = asItem == null || asItem.isEmpty() ? FALLBACK : asItem; + asItem = targetBlock.getCloneItemStack(level, te.getTargetPosition(), targetState); + ItemStack targetIcon = asItem == null || asItem.isEmpty() ? FALLBACK : asItem; - sources = AllDisplayBehaviours.sourcesOf(minecraft.level, te.getSourcePosition()); - target = AllDisplayBehaviours.targetOf(minecraft.level, te.getTargetPosition()); + sources = AllDisplayBehaviours.sourcesOf(level, te.getSourcePosition()); + target = AllDisplayBehaviours.targetOf(level, te.getTargetPosition()); removeWidget(targetLineSelector); removeWidget(targetLineLabel); @@ -131,7 +133,7 @@ public class DisplayLinkScreen extends AbstractSimiScreen { sourceTypeSelector = null; if (target != null) { - DisplayTargetStats stats = target.provideStats(new DisplayLinkContext(minecraft.level, te)); + DisplayTargetStats stats = target.provideStats(new DisplayLinkContext(level, te)); int rows = stats.maxRows(); int startIndex = Math.min(te.targetLine, rows); diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java index 740174dfb..43fbb12ee 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java @@ -18,7 +18,6 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.mutable.MutableDouble; -import com.jozufozu.flywheel.repack.joml.Math; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; import com.simibubi.create.content.contraptions.components.structureMovement.train.TrainCargoManager; import com.simibubi.create.content.logistics.trains.DimensionPalette; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java index 5cc5aa8af..1ee412ea0 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/track/TrackRenderer.java @@ -8,7 +8,6 @@ import static com.simibubi.create.AllBlockPartials.TRACK_SEGMENT_RIGHT; import static com.simibubi.create.AllBlockPartials.TRACK_TIE; import com.jozufozu.flywheel.backend.Backend; -import com.jozufozu.flywheel.repack.joml.Math; import com.jozufozu.flywheel.util.transform.TransformStack; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack.Pose; diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4fb77ad04..bb1595ba9 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -5,7 +5,7 @@ license="MIT" [[mods]] modId="create" -version="0.5.0b" +version="0.5.0c" displayName="Create" #updateJSONURL="" displayURL="https://www.curseforge.com/minecraft/mc-mods/create" diff --git a/src/main/resources/assets/create/lang/default/interface.json b/src/main/resources/assets/create/lang/default/interface.json index 5c8e1cd9f..84cb246e4 100644 --- a/src/main/resources/assets/create/lang/default/interface.json +++ b/src/main/resources/assets/create/lang/default/interface.json @@ -887,7 +887,7 @@ "create.super_glue.first_pos": "First position selected", "create.super_glue.abort": "Selection discarded", "create.super_glue.not_enough": "Not enough glue in inventory", - "create.super_glue.sucess": "Applying Glue...", + "create.super_glue.success": "Applying Glue...", "create.gui.config.overlay1": "Hi :)", "create.gui.config.overlay2": "This is a sample overlay",