From 95a23f74338adeace8a1dfbd62fdc3e8e4e3ab1b Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 25 Sep 2022 20:41:12 +0200 Subject: [PATCH 1/6] Collision Spike - Reduced false positives for train/player collisions during lag spikes --- .../structureMovement/ContraptionCollider.java | 10 +++++++++- .../mixin/EntityContraptionInteractionMixin.java | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index f8258f762..6d0594123 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -32,6 +32,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Direction.Axis; import net.minecraft.core.Direction.AxisDirection; +import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -373,6 +374,13 @@ public class ContraptionCollider { return entityMotion; if (!entity.isOnGround()) return entityMotion; + + CompoundTag persistentData = entity.getPersistentData(); + if (persistentData.contains("ContraptionGrounded")) { + persistentData.remove("ContraptionGrounded"); + return entityMotion; + } + if (cce.collidingEntities.containsKey(entity)) return entityMotion; if (entity instanceof ItemEntity) @@ -413,7 +421,7 @@ public class ContraptionCollider { .add(0, .25, 0) .scale(damage * 4)) .add(diffMotion); - + return VecHelper.clamp(added, 3); } diff --git a/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java index 27fe5f5cb..f52baa2cb 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/EntityContraptionInteractionMixin.java @@ -141,6 +141,8 @@ public abstract class EntityContraptionInteractionMixin extends CapabilityProvid return; self.setOnGround(true); + self.getPersistentData() + .putBoolean("ContraptionGrounded", true); } @Inject(method = { "spawnSprintParticle" }, at = @At(value = "TAIL")) From 916638997d801ae00e5201da5715523581f16fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=92=80=E5=A2=83=E7=9F=B3?= Date: Mon, 26 Sep 2022 02:47:52 +0800 Subject: [PATCH 2/6] Updates to zh_cn.json by Demonese (#3814) --- src/main/resources/assets/create/lang/zh_cn.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/assets/create/lang/zh_cn.json b/src/main/resources/assets/create/lang/zh_cn.json index 459b5f282..f4be7ff19 100644 --- a/src/main/resources/assets/create/lang/zh_cn.json +++ b/src/main/resources/assets/create/lang/zh_cn.json @@ -1260,6 +1260,8 @@ "create.item_attributes.smokable.inverted": "不可被烟熏", "create.item_attributes.blastable": "可被高炉冶炼", "create.item_attributes.blastable.inverted": "不可被高炉冶炼", + "create.item_attributes.compostable": "可被堆肥", + "create.item_attributes.compostable.inverted": "不可被堆肥", "create.item_attributes.shulker_level": "潜影盒是%1$s的", "create.item_attributes.shulker_level.inverted": "潜影盒不是%1$s的", "create.item_attributes.shulker_level.full": "满", @@ -1483,6 +1485,7 @@ "create.schedule.condition.threshold.equal": "恰好", "create.schedule.condition.threshold.x_units_of_item": "%1$s%2$s%3$s", "create.schedule.condition.threshold.matching_content": "匹配内容", + "create.schedule.condition.threshold.anything": "任意物品", "create.schedule.condition.threshold.item_measure": "物品度量", "create.schedule.condition.threshold.items": "个", "create.schedule.condition.threshold.stacks": "组", @@ -1490,6 +1493,7 @@ "create.schedule.condition.threshold.status": "货物：%1$s/%2$s %3$s", "create.schedule.condition.threshold.place_item": "参考物品", "create.schedule.condition.threshold.place_item_2": "可以使用过滤器", + "create.schedule.condition.threshold.place_item_3": "留空以匹配任意物品", "create.schedule.condition.fluid_threshold": "流体货物条件", "create.schedule.condition.item_threshold": "物品货物条件", "create.schedule.condition.redstone_link": "无线红石", From 94578adad577d35b0ca865e3e87930b86f37467c Mon Sep 17 00:00:00 2001 From: luffypirat Date: Sun, 25 Sep 2022 21:48:28 +0300 Subject: [PATCH 3/6] Updates to ru_ru.json by luffypirat (#3817) --- src/main/resources/assets/create/lang/ru_ru.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/create/lang/ru_ru.json b/src/main/resources/assets/create/lang/ru_ru.json index 8a293b647..ef512be4d 100644 --- a/src/main/resources/assets/create/lang/ru_ru.json +++ b/src/main/resources/assets/create/lang/ru_ru.json @@ -1485,13 +1485,15 @@ "create.schedule.condition.threshold.equal": "точно", "create.schedule.condition.threshold.x_units_of_item": "%1$s %2$s (%3$s)", "create.schedule.condition.threshold.matching_content": "Определённое содержимое", + "create.schedule.condition.threshold.anything": "предметов", "create.schedule.condition.threshold.item_measure": "Количество предметов", "create.schedule.condition.threshold.items": "штук", "create.schedule.condition.threshold.stacks": "стаков", "create.schedule.condition.threshold.buckets": "вёдер", "create.schedule.condition.threshold.status": "Груз: %1$s/%2$s %3$s", - "create.schedule.condition.threshold.place_item": "Основной предмет", + "create.schedule.condition.threshold.place_item": "Эталонный предмет", "create.schedule.condition.threshold.place_item_2": "Можно использовать фильтры", + "create.schedule.condition.threshold.place_item_3": "Оставьте пустым, чтобы выбрать все предметы", "create.schedule.condition.fluid_threshold": "Состояние жидкого груза", "create.schedule.condition.item_threshold": "Состояние груза", "create.schedule.condition.redstone_link": "Беспроводной сигнал", From bb404c3ceb0d80483242b84b80ca224ae008d6ac Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Sun, 25 Sep 2022 20:51:06 +0200 Subject: [PATCH 4/6] PR Datagen --- src/generated/resources/.cache/cache | 4 ++-- .../resources/assets/create/lang/unfinished/ru_ru.json | 8 ++++---- .../resources/assets/create/lang/unfinished/zh_cn.json | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 0b8665128..c345e5268 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -572,9 +572,9 @@ d5bfeacb442236c8b075fddb41364f85c8cb7feb assets/create/lang/unfinished/pl_pl.jso 0f3f51d065d896a7e3b4abd8c2801fa3e8fbd8c3 assets/create/lang/unfinished/pt_br.json 9f2ec0b2f8fa9b380c7edb56bfb806bcce621cce assets/create/lang/unfinished/pt_pt.json 1f88f0d91bdf5c68224cb65249f77272771939c9 assets/create/lang/unfinished/ro_ro.json -d815a8642f6b7de3142877bb2a0b642a4e65ad32 assets/create/lang/unfinished/ru_ru.json +928ac3ad2ab5e7fa3d582b8b956258c110bea868 assets/create/lang/unfinished/ru_ru.json ed29ef4ae8f3633533485d56f7fa8cb77b790a0a assets/create/lang/unfinished/uk_ua.json -fa36855229bf63e2c4c6c8ce07cc2a1ab3c67592 assets/create/lang/unfinished/zh_cn.json +e5cf7b657be816bc15b331dd058f7ccdabee8c14 assets/create/lang/unfinished/zh_cn.json 316dae07f95fb65c984fe7c424b566eb8ddba5f9 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 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 895d13915..28d2f0826 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: 2", + "_": "Missing Localizations: 0", "_": "->------------------------] Game Elements [------------------------<-", @@ -1485,15 +1485,15 @@ "create.schedule.condition.threshold.equal": "точно", "create.schedule.condition.threshold.x_units_of_item": "%1$s %2$s (%3$s)", "create.schedule.condition.threshold.matching_content": "Определённое содержимое", - "create.schedule.condition.threshold.anything": "UNLOCALIZED: Anything", + "create.schedule.condition.threshold.anything": "предметов", "create.schedule.condition.threshold.item_measure": "Количество предметов", "create.schedule.condition.threshold.items": "штук", "create.schedule.condition.threshold.stacks": "стаков", "create.schedule.condition.threshold.buckets": "вёдер", "create.schedule.condition.threshold.status": "Груз: %1$s/%2$s %3$s", - "create.schedule.condition.threshold.place_item": "Основной предмет", + "create.schedule.condition.threshold.place_item": "Эталонный предмет", "create.schedule.condition.threshold.place_item_2": "Можно использовать фильтры", - "create.schedule.condition.threshold.place_item_3": "UNLOCALIZED: Leave empty to match any", + "create.schedule.condition.threshold.place_item_3": "Оставьте пустым, чтобы выбрать все предметы", "create.schedule.condition.fluid_threshold": "Состояние жидкого груза", "create.schedule.condition.item_threshold": "Состояние груза", "create.schedule.condition.redstone_link": "Беспроводной сигнал", 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 515ec7d83..f4be7ff19 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: 4", + "_": "Missing Localizations: 0", "_": "->------------------------] Game Elements [------------------------<-", @@ -1260,8 +1260,8 @@ "create.item_attributes.smokable.inverted": "不可被烟熏", "create.item_attributes.blastable": "可被高炉冶炼", "create.item_attributes.blastable.inverted": "不可被高炉冶炼", - "create.item_attributes.compostable": "UNLOCALIZED: can be composted", - "create.item_attributes.compostable.inverted": "UNLOCALIZED: cannot be composted", + "create.item_attributes.compostable": "可被堆肥", + "create.item_attributes.compostable.inverted": "不可被堆肥", "create.item_attributes.shulker_level": "潜影盒是%1$s的", "create.item_attributes.shulker_level.inverted": "潜影盒不是%1$s的", "create.item_attributes.shulker_level.full": "满", @@ -1485,7 +1485,7 @@ "create.schedule.condition.threshold.equal": "恰好", "create.schedule.condition.threshold.x_units_of_item": "%1$s%2$s%3$s", "create.schedule.condition.threshold.matching_content": "匹配内容", - "create.schedule.condition.threshold.anything": "UNLOCALIZED: Anything", + "create.schedule.condition.threshold.anything": "任意物品", "create.schedule.condition.threshold.item_measure": "物品度量", "create.schedule.condition.threshold.items": "个", "create.schedule.condition.threshold.stacks": "组", @@ -1493,7 +1493,7 @@ "create.schedule.condition.threshold.status": "货物：%1$s/%2$s %3$s", "create.schedule.condition.threshold.place_item": "参考物品", "create.schedule.condition.threshold.place_item_2": "可以使用过滤器", - "create.schedule.condition.threshold.place_item_3": "UNLOCALIZED: Leave empty to match any", + "create.schedule.condition.threshold.place_item_3": "留空以匹配任意物品", "create.schedule.condition.fluid_threshold": "流体货物条件", "create.schedule.condition.item_threshold": "物品货物条件", "create.schedule.condition.redstone_link": "无线红石", From 2e838b6e01e0fbf6e4d4b837cd78882c740d6776 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Sun, 25 Sep 2022 11:56:52 -0700 Subject: [PATCH 5/6] Obsidian movement config now controls respawn anchor --- .../create/foundation/config/ContraptionMovementSetting.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java b/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java index f197203bd..5aca81cdb 100644 --- a/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java +++ b/src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java @@ -46,10 +46,11 @@ public enum ContraptionMovementSetting { } public static void registerDefaults() { - register(Blocks.BUDDING_AMETHYST, () -> AllConfigs.SERVER.kinetics.amethystMovement.get()); register(Blocks.SPAWNER, () -> AllConfigs.SERVER.kinetics.spawnerMovement.get()); + register(Blocks.BUDDING_AMETHYST, () -> AllConfigs.SERVER.kinetics.amethystMovement.get()); register(Blocks.OBSIDIAN, () -> AllConfigs.SERVER.kinetics.obsidianMovement.get()); register(Blocks.CRYING_OBSIDIAN, () -> AllConfigs.SERVER.kinetics.obsidianMovement.get()); + register(Blocks.RESPAWN_ANCHOR, () -> AllConfigs.SERVER.kinetics.obsidianMovement.get()); } public interface IMovementSettingProvider extends IForgeBlock { From 96b76a83a158b5554eb632db457898c79b63f307 Mon Sep 17 00:00:00 2001 From: PepperCode1 <44146161+PepperCode1@users.noreply.github.com> Date: Sun, 25 Sep 2022 12:07:39 -0700 Subject: [PATCH 6/6] Add 1.19 to Github files --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + .github/config/labels.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 3a6a51b4e..1efa72840 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -108,6 +108,7 @@ body: label: Minecraft Version description: The version of Minecraft you were using when the bug occured options: + - "1.19.2" - "1.18.2" - "1.18.1" - "1.18" diff --git a/.github/config/labels.yml b/.github/config/labels.yml index c5a1bc5a6..f3378f6c1 100644 --- a/.github/config/labels.yml +++ b/.github/config/labels.yml @@ -8,3 +8,5 @@ - "1.17" 1.18: - "1.18" +1.19: + - "1.19"