mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-12-28 16:06:48 +01:00
Merge branch 'mc1.18/dev' into mc1.19/dev
Conflicts: src/generated/resources/.cache/cache src/generated/resources/assets/create/lang/unfinished/ru_ru.json src/generated/resources/assets/create/lang/unfinished/zh_cn.json
This commit is contained in:
PepperCode1
commit
92d05e7498
10 changed files with 35 additions and 15 deletions
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
1
.github/ISSUE_TEMPLATE/bug_report.yml
vendored
|
|
@ -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"
|
||||
|
|
|
|||
2
.github/config/labels.yml
vendored
2
.github/config/labels.yml
vendored
|
|
@ -8,3 +8,5 @@
|
|||
- "1.17"
|
||||
1.18:
|
||||
- "1.18"
|
||||
1.19:
|
||||
- "1.19"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
// 1.19.2 2022-09-23T20:53:24.8228086 Lang merger
|
||||
// 1.19.2 2022-09-25T12:22:44.7537946 Lang merger
|
||||
4b9ffd38401c3366dc8fba48bd867b580bd7a016 assets/create/lang/en_us.json
|
||||
c2d8149ca2c7db92f0c8c3c7d68e7e63302878df assets/create/lang/unfinished/de_de.json
|
||||
a0e1127515d1cf6868741eaa864d9342f552a99c assets/create/lang/unfinished/es_cl.json
|
||||
|
|
@ -12,7 +12,7 @@ b88ce42806a06cd65203e2e296057e0911733d06 assets/create/lang/unfinished/pl_pl.jso
|
|||
c3bc8db145cdc14dc3403fdf7f9bdf4fc3ed5f45 assets/create/lang/unfinished/pt_br.json
|
||||
338d90442da4075a5c8facbc0e9fca8d2accfcd2 assets/create/lang/unfinished/pt_pt.json
|
||||
c3afd5e860c6e2956cda4d55ee1167e8b987ade6 assets/create/lang/unfinished/ro_ro.json
|
||||
ba8e498f1cdc26d5af6b22b57aafc70358d42c4a assets/create/lang/unfinished/ru_ru.json
|
||||
ba3c585e3ba61138fec85ece927b0c47c98e33e8 assets/create/lang/unfinished/ru_ru.json
|
||||
5f2d947d98adbcc2e79eeb792352a4b5596e76dc assets/create/lang/unfinished/uk_ua.json
|
||||
135f81829c79a0f4209ec02bfc0acc817de87e94 assets/create/lang/unfinished/zh_cn.json
|
||||
a38e0091abafd7e6caa62e20fae7b7d9541abb99 assets/create/lang/unfinished/zh_cn.json
|
||||
400a4ebd430a0ca749898a3d8a068a7f15d2e62a assets/create/lang/unfinished/zh_tw.json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 4",
|
||||
"_": "Missing Localizations: 2",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -1487,15 +1487,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": "Беспроводной сигнал",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 6",
|
||||
"_": "Missing Localizations: 2",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -1262,8 +1262,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": "满",
|
||||
|
|
@ -1487,7 +1487,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": "组",
|
||||
|
|
@ -1495,7 +1495,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": "无线红石",
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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"))
|
||||
|
|
|
|||
|
|
@ -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": "Беспроводной сигнал",
|
||||
|
|
|
|||
|
|
@ -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": "无线红石",
|
||||
|
|
|
|||
Loading…
Reference in a new issue