From a7ad1c423ab0de14332ed8e47d63e56b5328236f Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Mon, 18 May 2020 13:42:44 +0200 Subject: [PATCH 1/9] Update README.md --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index bbec6e64f..0bc778b47 100644 --- a/README.md +++ b/README.md @@ -21,13 +21,5 @@ Check out the wiki and in-game Tool-tips for further info on how to use these fe - Support for Minecraft 1.12: Not planned - Support for Minecraft 1.15: Porting work is in Progress! - Support for Fabric: Not planned - -## The Creators of Create -- evanthebruce - Resident Nitwit -- fuzzyweapon - Contributor -- LeastReality - Artist -- Zelophed - Developer -- simibubi - Developer & Artist -- tterrag - Developer & Port-Meister - -### For more information, check out our [Project Page](https://www.curseforge.com/minecraft/mc-mods/create) +
+

Find out more about Create on our Project Page

From 21cdea67f6369e3845f391ab13713d185d61e182 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 22:13:07 +0800 Subject: [PATCH 2/9] Fix AirCurrent damage handling --- .../contraptions/components/fan/AirCurrent.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java index 7d472a462..982b5740f 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/fan/AirCurrent.java @@ -17,7 +17,9 @@ import com.simibubi.create.modules.logistics.InWorldProcessing.Type; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.state.properties.BlockStateProperties; @@ -113,14 +115,21 @@ public class AirCurrent { } else { switch (processingType) { case BLASTING: - entity.setFire(10); - entity.attackEntityFrom(damageSourceLava, 4); + if (!entity.isImmuneToFire()) { + entity.setFire(10); + entity.attackEntityFrom(damageSourceLava, 4); + } break; case SMOKING: - entity.setFire(2); - entity.attackEntityFrom(damageSourceFire, 2); + if (!entity.isImmuneToFire()) { + entity.setFire(2); + entity.attackEntityFrom(damageSourceFire, 2); + } break; case SPLASHING: + if (entity instanceof EndermanEntity || entity.getType() == EntityType.SNOW_GOLEM || entity.getType() == EntityType.BLAZE) { + entity.attackEntityFrom(DamageSource.DROWN, 2); + } if (!entity.isBurning()) break; entity.extinguish(); From 4a7ad75cd0a1125c4156c5df94ea0bae65f98498 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 22:29:25 +0800 Subject: [PATCH 3/9] Fix sand paper is sometimes stackable --- .../curiosities/tools/SandPaperItem.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java b/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java index 6747f1f5a..542affa6c 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/tools/SandPaperItem.java @@ -33,7 +33,7 @@ import net.minecraftforge.common.util.FakePlayer; public class SandPaperItem extends Item implements IHaveCustomItemModel { public SandPaperItem(Properties properties) { - super(properties); + super(properties.maxDamage(8)); } @Override @@ -173,21 +173,6 @@ public class SandPaperItem extends Item implements IHaveCustomItemModel { return 32; } - @Override - public int getItemStackLimit(ItemStack stack) { - return 1; - } - - @Override - public boolean isDamageable() { - return true; - } - - @Override - public int getMaxDamage(ItemStack stack) { - return 8; - } - @Override public int getItemEnchantability() { return 5; From 137841859360b5385cddcece9a8c2589e6cebfe9 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 22:35:11 +0800 Subject: [PATCH 4/9] Fix deployer can eat --- .../contraptions/components/deployer/DeployerFakePlayer.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java index f5f71dc1a..ec3768403 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java @@ -82,6 +82,11 @@ public class DeployerFakePlayer extends FakePlayer { return 1 / 64f; } + @Override + public boolean canEat(boolean ignoreHunger) { + return false; + } + @SubscribeEvent public static void deployerHasEyesOnHisFeet(EntityEvent.EyeHeight event) { if (event.getEntity() instanceof DeployerFakePlayer) From 485e6c529dec7e98982c70638559b5236bf20b14 Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Mon, 18 May 2020 23:57:49 +0800 Subject: [PATCH 5/9] Implement IHaveColorHandler on WindowInABlockBlock https://discordapp.com/channels/620934202875183104/689866656914210897/700713829407129620 --- .../partialWindows/WindowInABlockBlock.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockBlock.java b/src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockBlock.java index f913a6bb1..a38ffafbd 100644 --- a/src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockBlock.java +++ b/src/main/java/com/simibubi/create/modules/curiosities/partialWindows/WindowInABlockBlock.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import com.simibubi.create.foundation.block.IHaveColorHandler; import com.simibubi.create.foundation.block.IHaveCustomBlockModel; import com.simibubi.create.foundation.block.IHaveNoBlockItem; import com.simibubi.create.foundation.block.ITE; @@ -15,6 +16,8 @@ import net.minecraft.block.FourWayBlock; import net.minecraft.block.PaneBlock; import net.minecraft.block.material.Material; import net.minecraft.block.material.MaterialColor; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; @@ -47,7 +50,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; public class WindowInABlockBlock extends PaneBlock - implements ITE, IHaveNoBlockItem, IHaveCustomBlockModel { + implements ITE, IHaveNoBlockItem, IHaveCustomBlockModel, IHaveColorHandler { public WindowInABlockBlock() { super(Properties.create(Material.ROCK)); @@ -210,6 +213,7 @@ public class WindowInABlockBlock extends PaneBlock return Blocks.AIR.getDefaultState(); } + @Override @OnlyIn(Dist.CLIENT) public boolean isSideInvisible(BlockState state, BlockState adjacentBlockState, Direction side) { return false; @@ -226,4 +230,16 @@ public class WindowInABlockBlock extends PaneBlock return WindowInABlockTileEntity.class; } + @Override + @OnlyIn(Dist.CLIENT) + public IBlockColor getColorHandler() { + return (state, world, pos, index) -> { + try { + BlockState surrounding = getSurroundingBlockState(world, pos); + return Minecraft.getInstance().getBlockColors().getColor(surrounding, world, pos, index); + } catch (Exception e) {} + return -1; + }; + } + } From 282445d2ac12ccd6c4d3d4a34b6cb891779941ce Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Tue, 19 May 2020 01:43:59 +0800 Subject: [PATCH 6/9] Fix deployer can eat, part 2 --- .../contraptions/components/deployer/DeployerHandler.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java index 14400a1ac..5c6b9a069 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java @@ -266,8 +266,6 @@ public class DeployerHandler { CompoundNBT tag = stack.getOrCreateTag(); if (stack.getItem() instanceof SandPaperItem && tag.contains("Polishing")) player.spawnedItemEffects = ItemStack.read(tag.getCompound("Polishing")); - if (stack.isFood()) - player.spawnedItemEffects = stack.copy(); if (!player.getActiveItemStack().isEmpty()) player.setHeldItem(hand, stack.onItemUseFinish(world, player)); From f08a5746534a810dac22d1aa7fb4b53723d613ab Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Tue, 19 May 2020 02:06:22 +0800 Subject: [PATCH 7/9] Add deployer feeding --- .../components/deployer/DeployerFakePlayer.java | 6 ++++++ .../components/deployer/DeployerHandler.java | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java index ec3768403..bd8fd3288 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerFakePlayer.java @@ -30,6 +30,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -87,6 +88,11 @@ public class DeployerFakePlayer extends FakePlayer { return false; } + @Override + public ItemStack onFoodEaten(World world, ItemStack stack) { + return stack; + } + @SubscribeEvent public static void deployerHasEyesOnHisFeet(EntityEvent.EyeHeight event) { if (event.getEntity() instanceof DeployerFakePlayer) diff --git a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java index 5c6b9a069..d19f330a0 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/components/deployer/DeployerHandler.java @@ -20,6 +20,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.item.ItemEntity; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.EquipmentSlotType; @@ -137,6 +138,14 @@ public class DeployerHandler { && stack.interactWithEntity(player, (LivingEntity) entity, hand)) success = true; } + if (!success && stack.isFood() && entity instanceof PlayerEntity) { + PlayerEntity playerEntity = (PlayerEntity) entity; + if (playerEntity.canEat(item.getFood().canEatWhenFull())) { + playerEntity.onFoodEaten(world, stack); + player.spawnedItemEffects = stack.copy(); + success = true; + } + } } // Punch entity From b08d147311c0ea5bc4520509b5d21a2abb700b6b Mon Sep 17 00:00:00 2001 From: BigDaleAHA <56267928+BigDaleAHA@users.noreply.github.com> Date: Mon, 18 May 2020 22:59:30 -0500 Subject: [PATCH 8/9] Minor Chinese Lang File Fix (#331) * Minor Chinese Lang File Fix According to the feedback received from fellow Chinese players, I made some minor fixes and improvements. * Update zh_cn.json Co-authored-by: Snownee <1850986885@qq.com> --- .../resources/assets/create/lang/zh_cn.json | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/resources/assets/create/lang/zh_cn.json b/src/main/resources/assets/create/lang/zh_cn.json index 483938be6..edf2fddf9 100644 --- a/src/main/resources/assets/create/lang/zh_cn.json +++ b/src/main/resources/assets/create/lang/zh_cn.json @@ -8,7 +8,7 @@ "item.create.tree_fertilizer": "树木肥料", "item.create.empty_blueprint": "空白蓝图", "item.create.andesite_alloy": "安山合金", - "item.create.chromatic_compound": "谜之化合物", + "item.create.chromatic_compound": "异彩化合物", "item.create.shadow_steel": "暗影金属", "item.create.blueprint_and_quill": "蓝图与笔", "item.create.blueprint": "蓝图", @@ -123,7 +123,7 @@ "block.create.mechanical_bearing": "动力轴承", "block.create.clockwork_bearing": "时钟轴承", "block.create.rope_pulley": "绳索滑轮", - "block.create.rope": "Rope", + "block.create.rope": "绳索", "block.create.pulley_magnet": "滑轮磁铁", "block.create.translation_chassis": "机壳底盘", "block.create.rotation_chassis": "旋转底盘", @@ -143,7 +143,7 @@ "block.create.redstone_latch": "锁存器", "block.create.toggle_latch": "T触发器", "block.create.flexpeater": "高级中继器", - "block.create.entity_detector": "传送带观察者", + "block.create.entity_detector": "传送带侦测器", "block.create.belt_tunnel": "传送带隧道", "block.create.sequenced_gearshift": "可编程齿轮箱", @@ -271,7 +271,7 @@ "death.attack.create.fan_lava": "%1$s 在接受热风的洗礼中欲火焚身", "death.attack.create.drill": "%1$s 的钻头是突破天际的钻头", "death.attack.create.saw": "%1$s 被圆锯切成了两截", - "create.block.deployer.damage_source_name": "背叛的机械臂", + "create.block.deployer.damage_source_name": "机械臂二五仔", "death.attack.create.cuckoo_clock_explosion": "%1$s被布谷鸟闹钟炸得粉身碎骨", "create.recipe.crushing": "批量粉碎", @@ -336,11 +336,11 @@ "create.orientation.orthogonal": "垂直", "create.orientation.diagonal": "对角线", "create.orientation.horizontal": "水平", - "create.orientation.alongZ": "以z轴为中心", - "create.orientation.alongX": "以x轴为中心", + "create.orientation.alongZ": "以z轴对齐", + "create.orientation.alongX": "以x轴对齐", "create.gui.blockzapper.title": "手持式方块放置机", - "create.gui.blockzapper.replaceMode": "更换模式", + "create.gui.blockzapper.replaceMode": "替换模式", "create.gui.blockzapper.searchDiagonal": "根据对角线", "create.gui.blockzapper.searchFuzzy": "忽视边界", "create.gui.blockzapper.range": "扩散范围", @@ -382,7 +382,7 @@ "create.blockzapper.componentTier.blazebrass": "烈焰合金", "create.blockzapper.componentTier.choruschrome": "紫颂合金", "create.blockzapper.leftClickToSet": "左键点击方块以设定方块", - "create.blockzapper.empty": "出击!", + "create.blockzapper.empty": "方块不足！", "create.contraptions.movement_mode": "运动模式", "create.contraptions.movement_mode.move_place": "停止时总是实体化方块", @@ -693,8 +693,8 @@ "advancement.create.crushing_wheel": "超级巨无霸", "advancement.create.crushing_wheel.desc": "制作一些能更快粉碎物品的粉碎轮", - "advancement.create.chromatic_compound": "极端材料", - "advancement.create.chromatic_compound.desc": "制作一个谜之化合物", + "advancement.create.chromatic_compound": "极性材料", + "advancement.create.chromatic_compound.desc": "制作一个异彩化合物", "advancement.create.shadow_steel": "暗影中的宝石", "advancement.create.shadow_steel.desc": "制作一些暗影金属", "advancement.create.refined_radiance": "闪耀着洁白的圣光", @@ -713,14 +713,14 @@ "advancement.create.eob.desc": "未来会有更多很棒棒的东西哦", "create.subtitle.schematicannon_launch_block": "蓝图大炮发射", - "create.subtitle.schematicannon_finish": "蓝图大炮完成", + "create.subtitle.schematicannon_finish": "蓝图大炮完成任务", "create.subtitle.slime_added": "史莱姆挤压", "create.subtitle.mechanical_press_activation": "辊压机工作", "create.subtitle.mechanical_press_item_break": "金属碰撞", - "create.subtitle.blockzapper_place": "方块被放置", - "create.subtitle.blockzapper_confirm": "完成的“叮”提示声", - "create.subtitle.blockzapper_deny": "拒绝的警报", - "create.subtitle.block_funnel_eat": "传送带漏斗咀嚼", + "create.subtitle.blockzapper_place": "放置方块", + "create.subtitle.blockzapper_confirm": "选择方块", + "create.subtitle.blockzapper_deny": "放置失败", + "create.subtitle.block_funnel_eat": "传送带漏斗吞食", "_comment": "-------------------------] ITEM DESCRIPTIONS [------------------------------------------------", @@ -1088,7 +1088,7 @@ "block.create.flexcrate.tooltip.action1": "打开箱子", "block.create.creative_crate.tooltip": "THE ENDLESS CRATE", - "block.create.creative_crate.tooltip.summary": "这个容器可以给临近的 _蓝图大炮_ 提供无限物品 （创造专用物品）", + "block.create.creative_crate.tooltip.summary": "这个容器可以给临近的 _蓝图大炮_ 提供无限物品以及燃料 （创造专用物品）", "block.create.creative_crate.tooltip.condition1": "当标记了物品时", "block.create.creative_crate.tooltip.behaviour1": "容器将会从虚空中提供无限量的标记物品，并且任何放置到容器中的物品都会被送入虚空", @@ -1219,7 +1219,7 @@ "tool.create.blazing.tooltip.summary": "将会冶炼被破坏的方块,并且点燃怪物,在地狱中不会减少耐久", "tool.create.rose_quartz.tooltip": "ROSE QUARTZ TOOLS", - "tool.create.rose_quartz.tooltip.summary": "这个工具将会让你的手更长， 伸的更远.", + "tool.create.rose_quartz.tooltip.summary": "这个工具将会让你的手更长，伸得更远.", "itemGroup.create": "机械动力" -} \ No newline at end of file +} From 3890698a4b26b9a3564331df8177f732026a904d Mon Sep 17 00:00:00 2001 From: Snownee <1850986885@qq.com> Date: Tue, 19 May 2020 13:29:11 +0800 Subject: [PATCH 9/9] Fix GUI rendering order --- .../create/foundation/gui/AbstractSimiContainerScreen.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java b/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java index 1a1f5e3d1..917c16f9a 100644 --- a/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java +++ b/src/main/java/com/simibubi/create/foundation/gui/AbstractSimiContainerScreen.java @@ -44,6 +44,9 @@ public abstract class AbstractSimiContainerScreen extends C renderBackground(); renderWindow(mouseX, mouseY, partialTicks); + for (Widget widget : widgets) + widget.render(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); GlStateManager.enableAlphaTest(); @@ -52,9 +55,6 @@ public abstract class AbstractSimiContainerScreen extends C RenderHelper.disableStandardItemLighting(); GlStateManager.disableLighting(); GlStateManager.disableDepthTest(); - - for (Widget widget : widgets) - widget.render(mouseX, mouseY, partialTicks); renderWindowForeground(mouseX, mouseY, partialTicks); for (Widget widget : widgets) widget.renderToolTip(mouseX, mouseY);