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
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 e856d60ab..5ed72ec0e 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);
RenderSystem.enableAlphaTest();
@@ -52,9 +55,6 @@ public abstract class AbstractSimiContainerScreen extends C
RenderHelper.disableStandardItemLighting();
RenderSystem.disableLighting();
RenderSystem.disableDepthTest();
-
- for (Widget widget : widgets)
- widget.render(mouseX, mouseY, partialTicks);
renderWindowForeground(mouseX, mouseY, partialTicks);
for (Widget widget : widgets)
widget.renderToolTip(mouseX, mouseY);
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 9c6adcef3..318f20bb6 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;
@@ -82,6 +83,16 @@ public class DeployerFakePlayer extends FakePlayer {
return 1 / 64f;
}
+ @Override
+ public boolean canEat(boolean ignoreHunger) {
+ 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 c8d6f678a..2a660555a 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;
@@ -142,6 +143,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
@@ -275,8 +284,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())
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();
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;
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
+}