From 2b60b7d520ffa5db9d7d6d71d8f068de603b5913 Mon Sep 17 00:00:00 2001 From: Joccob Date: Thu, 20 Aug 2015 09:52:58 +0800 Subject: Update zh_CN.lang ---- V1.1.3 --- .../resources/assets/jewelrycraft2/lang/zh_CN.lang | 113 ++++++++++++++++++++- 1 file changed, 109 insertions(+), 4 deletions(-) diff --git a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang index f5695f6..113dc06 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang @@ -66,6 +66,81 @@ chatmessage.jewelrycraft2.molder.moldisempty=模具台现在是空的. chatmessage.jewelrycraft2.molder.moldismissing=模具台中没有模具. chatmessage.jewelrycraft2.molder.hasmoltenmetal=你无法移除这个模具.它装有熔融金属! +chatmessage.jewelrycraft2.smelter.alreadyhasingot=熔炼坩埚已经装有 %s +chatmessage.jewelrycraft2.smelter.hasmolteningot=熔炼坩埚已经装有熔融 %s +chatmessage.jewelrycraft2.smelter.itemneedstobeingot=物品必须为金属锭! +chatmessage.jewelrycraft2.smelter.itemrenamedtoingot=做的不item.jewelrycraft2.thiefGloves.name=神偷护手 +item.jewelrycraft2.ingotShadow.name=暗影锭 +item.jewelrycraft2.mold.ingot.name=锭模具 +item.jewelrycraft2.mold.ring.name=戒指模具 +item.jewelrycraft2.mold.necklace.name=项链模具 +item.jewelrycraft2.mold.bracelet.name=手镯模具 +item.jewelrycraft2.mold.earrings.name=耳环模具 +item.jewelrycraft2.mold.clayIngot.name=粘土锭模具 +item.jewelrycraft2.mold.clayRing.name=粘土戒指模具 +item.jewelrycraft2.mold.clayNecklace.name=粘土项链模具 +item.jewelrycraft2.mold.clayBracelet.name=粘土手镯模具 +item.jewelrycraft2.mold.clayEarrings.name=粘土耳环模具 +item.jewelrycraft2.ring.name=戒指 +item.jewelrycraft2.necklace.name=项链 +item.jewelrycraft2.bracelet.name=手镯 +item.jewelrycraft2.earrings.name=耳环 +item.jewelrycraft2.guide.name=珠宝工艺2手册 +item.jewelrycraft2.bucket.name=熔融 +item.jewelrycraft2.test.name=Chuck TestTa + +item.jewelrycraft2.jewelryModifier.name=珠宝强化石(创造) +item.jewelrycraft2.goldObject.name=闪金物品 +item.jewelrycraft2.structureGen.name=Structure Generator + +item.jewelrycraft2.goldObject.info.standard=闪闪发光,但并没有什么用处 :( +item.jewelrycraft2.goldObject.info.food=它是用金子制作的! 你想怎么吃它? +item.jewelrycraft2.thievingGloves.info.extra=按 查看更多信息. +item.jewelrycraft2.thievingGloves.info.1=潜行时手持护手 +item.jewelrycraft2.thievingGloves.info.2=对准村民右键来 +item.jewelrycraft2.thievingGloves.info.3=偷窃其物品 +item.jewelrycraft2.monsterPlacer.name=生成 %s + +tile.jewelrycraft2.oreShadow.name=暗影矿石 +tile.jewelrycraft2.blockShadow.name=暗影方块 +tile.jewelrycraft2.glow.name=Glow +tile.jewelrycraft2.smelter.name=熔炼坩埚 +tile.jewelrycraft2.molder.name=模具台 +tile.jewelrycraft2.displayer.name=展示台 +tile.jewelrycraft2.jewelCraftingTable.name=珠宝合成台 +tile.jewelrycraft2.altar.name=宝石圣坛 +tile.jewelrycraft2.moltenMetal.name=熔融 +tile.jewelrycraft2.shadowHand.name=暗影之手 +tile.jewelrycraft2.shadowEye.name=诅咒之眼 +tile.jewelrycraft2.handPedestal.name=石手基座 +tile.jewelrycraft2.midasTouchBlock.name=黄金生物 + +tile.jewelrycraft2.blockCrystal.0.name=黑色水晶 +tile.jewelrycraft2.blockCrystal.1.name=红色水晶 +tile.jewelrycraft2.blockCrystal.2.name=绿色水晶 +tile.jewelrycraft2.blockCrystal.3.name=棕色水晶 +tile.jewelrycraft2.blockCrystal.4.name=蓝色水晶 +tile.jewelrycraft2.blockCrystal.5.name=紫色水晶 +tile.jewelrycraft2.blockCrystal.6.name=青色水晶 +tile.jewelrycraft2.blockCrystal.7.name=浅灰色水晶 +tile.jewelrycraft2.blockCrystal.8.name=灰色水晶 +tile.jewelrycraft2.blockCrystal.9.name=粉色水晶 +tile.jewelrycraft2.blockCrystal.10.name=黄绿色水晶 +tile.jewelrycraft2.blockCrystal.11.name=黄色水晶 +tile.jewelrycraft2.blockCrystal.12.name=淡蓝色水晶 +tile.jewelrycraft2.blockCrystal.13.name=品红色水晶 +tile.jewelrycraft2.blockCrystal.14.name=橙色水晶 +tile.jewelrycraft2.blockCrystal.15.name=白色水晶 + +itemGroup.jewelrycraft2=珠宝工艺2 +itemGroup.Liquids=珠宝工艺|液体 + +chatmessage.jewelrycraft2.molder.addedmold=添加 %s 到模具台. +chatmessage.jewelrycraft2.molder.metaliscooling=熔融金属正在冷却中... +chatmessage.jewelrycraft2.molder.moldisempty=模具台现在是空的. +chatmessage.jewelrycraft2.molder.moldismissing=模具台中没有模具. +chatmessage.jewelrycraft2.molder.hasmoltenmetal=你无法移除这个模具.它装有熔融金属! + chatmessage.jewelrycraft2.smelter.alreadyhasingot=熔炼坩埚已经装有 %s chatmessage.jewelrycraft2.smelter.hasmolteningot=熔炼坩埚已经装有熔融 %s chatmessage.jewelrycraft2.smelter.itemneedstobeingot=物品必须为金属锭! @@ -104,23 +179,43 @@ chatmessage.jewelrycraft2.endereye.1=你感觉到一些 chatmessage.jewelrycraft2.endereye.2=在你周围. chatmessage.jewelrycraft2.feather=项链能够保护你不受到伤害! +chatmessage.jewelrycraft2.heartKilled.Red=GG!你刚刚击杀了价值很高的生物! MURDERER! 当你走上去时红心会治疗你 >:c +chatmessage.jewelrycraft2.heartKilled.White=GG!你刚刚击杀了价值很高的生物! MURDERER! 如果你收集到两颗半心你会得到一颗心的额外生命 >:c +chatmessage.jewelrycraft2.heartKilled.Blue=GG!你刚刚击杀了价值很高的生物! MURDERER! 蓝心将会保护红心, 走上前即可, 不要杀了他们 >:c +chatmessage.jewelrycraft2.heartKilled.Black=GG!你刚刚击杀了价值很高的生物! MURDERER! 黑心同蓝心一样, 但它们会对攻击者造成伤害 >:c + curse.jewelrycraft2.blind.description=你眼前的光亮正在渐渐的消退 curse.jewelrycraft2.flamingsoul.description=就我一个人感觉到越来越热了么? curse.jewelrycraft2.greed.description=你可能以后才会需要它 -curse.jewelrycraft2.humblebundle.description=买一送一 +curse.jewelrycraft2.humblebundle.description=两份的价格和一份一样 curse.jewelrycraft2.infamy.description=你都干了些什么?! curse.jewelrycraft2.midastouch.description=小心事与愿违... -curse.jewelrycraft2.pentagram.description=黑暗领主喜欢用神秘的方式来表示他对你的喜爱. -curse.jewelrycraft2.rabbitspaw.description=这是黑暗领主赐予你的礼物.不要弄丢了. +curse.jewelrycraft2.pentagram.description=黑暗领主喜欢用神秘的方式来表示他对你的喜爱 +curse.jewelrycraft2.rabbitspaw.description=这是黑暗领主赐予你的礼物.不要弄丢了 curse.jewelrycraft2.rottenheart.description=你的内心正在慢慢地腐烂 curse.jewelrycraft2.vampirehunger.description=你极度的渴望鲜血 +curse.jewelrycraft2.deathsTouch.description=死亡的来临势不可挡 + +curse.jewelrycraft2.blind=致盲 +curse.jewelrycraft2.flamingsoul=灵魂灼烧 +curse.jewelrycraft2.greed=贪婪之心 +curse.jewelrycraft2.humblebundle=买一送一 +curse.jewelrycraft2.infamy=声名狼藉 +curse.jewelrycraft2.midastouch=点石成金 +curse.jewelrycraft2.pentagram=五芒星 +curse.jewelrycraft2.rabbitspaw=兔脚 +curse.jewelrycraft2.rottenheart=腐朽之心 +curse.jewelrycraft2.vampirehunger=嗜血成性 +curse.jewelrycraft2.deathsTouch=死亡之触 + +curse.jewelrycraft2.activated=你受到了诅咒, 按住C键查看激活的诅咒. death.attack.weak=%1$s 被珠宝削弱最终导致死亡 death.attack.shadows=%1$s 被暗影吞噬了 death.attack.blackHeart=%1$s 被 %2$s's 的诅咒杀死了 entity.jewelrycraft2.Heart.name=心 -entity.jewelrycraft2.Half-Heart.name=半心 +entity.jewelrycraft2.HalfHeart.name=半心 jewelrycraft2.potion.stun=眩晕 @@ -146,3 +241,13 @@ guide.jewelrycraft2.tab.items=物品 guide.jewelrycraft2.tab.modifiers=强化材料 guide.jewelrycraft2.tab.oretoingot=矿物与对应金属锭 guide.jewelrycraft2.tab.ritual=仪式相关 +guide.jewelrycraft2.tab.curses=诅咒 + +bucket.unknown=一桶未知液体 + +achievement.jewelrycraft.openGuide=一个全新的世界 +achievement.jewelrycraft.openGuide.desc=打开珠宝工艺2指南 +achievement.jewelrycraft.pentagram=拒绝诱惑 +achievement.jewelrycraft.pentagram.desc=§4挑战:§7 当五芒星诅咒激活时, 一天之内不偷取生物生命. §a奖励:§7 在五芒星诅咒激活时, 你将能够从生物处永久偷取一颗心. + +challenge.failed=挑战失败: -- cgit v1.2.3 From 8f8fa976f20928c3676c775d996dcbf9538f9293 Mon Sep 17 00:00:00 2001 From: Joccob Date: Thu, 20 Aug 2015 09:55:10 +0800 Subject: Some correction --- .../resources/assets/jewelrycraft2/lang/zh_CN.lang | 71 ---------------------- 1 file changed, 71 deletions(-) diff --git a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang index 113dc06..ae56c16 100644 --- a/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang +++ b/src/main/resources/assets/jewelrycraft2/lang/zh_CN.lang @@ -16,77 +16,6 @@ item.jewelrycraft2.bracelet.name=手镯 item.jewelrycraft2.earrings.name=耳环 item.jewelrycraft2.guide.name=珠宝工艺2手册 item.jewelrycraft2.bucket.name=熔融 - -item.jewelrycraft2.crystal.0.name=黑色水晶 -item.jewelrycraft2.crystal.1.name=红色水晶 -item.jewelrycraft2.crystal.2.name=绿色水晶 -item.jewelrycraft2.crystal.3.name=棕色水晶 -item.jewelrycraft2.crystal.4.name=蓝色水晶 -item.jewelrycraft2.crystal.5.name=紫色水晶 -item.jewelrycraft2.crystal.6.name=青色水晶 -item.jewelrycraft2.crystal.7.name=浅灰色水晶 -item.jewelrycraft2.crystal.8.name=灰色水晶 -item.jewelrycraft2.crystal.9.name=粉色水晶 -item.jewelrycraft2.crystal.10.name=黄绿色水晶 -item.jewelrycraft2.crystal.11.name=黄色水晶 -item.jewelrycraft2.crystal.12.name=淡蓝色水晶 -item.jewelrycraft2.crystal.13.name=品红色水晶 -item.jewelrycraft2.crystal.14.name=橙色水晶 -item.jewelrycraft2.crystal.15.name=白色水晶 -item.jewelrycraft2.jewelryModifier.name=珠宝强化石(创造) -item.jewelrycraft2.goldObject.name=闪金物品 - -item.jewelrycraft2.goldObject.info.standard=闪闪发光,但并没有什么用处 :( -item.jewelrycraft2.goldObject.info.food=它是用金子制作的! 你想怎么吃它? -item.jewelrycraft2.thievingGloves.info.extra=按 查看更多信息. -item.jewelrycraft2.thievingGloves.info.1=潜行时手持护手 -item.jewelrycraft2.thievingGloves.info.2=对准村民右键来 -item.jewelrycraft2.thievingGloves.info.3=偷窃其物品 - -tile.jewelrycraft2.oreShadow.name=暗影矿石 -tile.jewelrycraft2.blockShadow.name=暗影方块 -tile.jewelrycraft2.glow.name=Glow -tile.jewelrycraft2.smelter.name=熔炼坩埚 -tile.jewelrycraft2.molder.name=模具台 -tile.jewelrycraft2.displayer.name=展示台 -tile.jewelrycraft2.jewelCraftingTable.name=珠宝合成台 -tile.jewelrycraft2.altar.name=宝石圣坛 -tile.jewelrycraft2.moltenMetal.name=熔融 -tile.jewelrycraft2.shadowHand.name=暗影之手 -tile.jewelrycraft2.shadowEye.name=诅咒之眼 -tile.jewelrycraft2.handPedestal.name=石手基座 -tile.jewelrycraft2.midasTouchBlock.name=黄金生物 - -itemGroup.jewelrycraft2=珠宝工艺2 -itemGroup.Liquids=珠宝工艺|液体 - -chatmessage.jewelrycraft2.molder.addedmold=添加 %s 到模具台. -chatmessage.jewelrycraft2.molder.metaliscooling=熔融金属正在冷却中... -chatmessage.jewelrycraft2.molder.moldisempty=模具台现在是空的. -chatmessage.jewelrycraft2.molder.moldismissing=模具台中没有模具. -chatmessage.jewelrycraft2.molder.hasmoltenmetal=你无法移除这个模具.它装有熔融金属! - -chatmessage.jewelrycraft2.smelter.alreadyhasingot=熔炼坩埚已经装有 %s -chatmessage.jewelrycraft2.smelter.hasmolteningot=熔炼坩埚已经装有熔融 %s -chatmessage.jewelrycraft2.smelter.itemneedstobeingot=物品必须为金属锭! -chatmessage.jewelrycraft2.smelter.itemrenamedtoingot=做的不item.jewelrycraft2.thiefGloves.name=神偷护手 -item.jewelrycraft2.ingotShadow.name=暗影锭 -item.jewelrycraft2.mold.ingot.name=锭模具 -item.jewelrycraft2.mold.ring.name=戒指模具 -item.jewelrycraft2.mold.necklace.name=项链模具 -item.jewelrycraft2.mold.bracelet.name=手镯模具 -item.jewelrycraft2.mold.earrings.name=耳环模具 -item.jewelrycraft2.mold.clayIngot.name=粘土锭模具 -item.jewelrycraft2.mold.clayRing.name=粘土戒指模具 -item.jewelrycraft2.mold.clayNecklace.name=粘土项链模具 -item.jewelrycraft2.mold.clayBracelet.name=粘土手镯模具 -item.jewelrycraft2.mold.clayEarrings.name=粘土耳环模具 -item.jewelrycraft2.ring.name=戒指 -item.jewelrycraft2.necklace.name=项链 -item.jewelrycraft2.bracelet.name=手镯 -item.jewelrycraft2.earrings.name=耳环 -item.jewelrycraft2.guide.name=珠宝工艺2手册 -item.jewelrycraft2.bucket.name=熔融 item.jewelrycraft2.test.name=Chuck TestTa item.jewelrycraft2.jewelryModifier.name=珠宝强化石(创造) -- cgit v1.2.3 From 7065e29df79cf410e63725550d7bb044be1e79e1 Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 00:40:42 +0200 Subject: Fixed infinite loop --- src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java index d6f60ae..c3b35a9 100644 --- a/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java +++ b/src/main/java/darkknight/jewelrycraft/events/EntityEventHandler.java @@ -227,7 +227,7 @@ public class EntityEventHandler { else if (playerInfo.getFloat("BlackHeart") > 0) { AxisAlignedBB axisalignedbb = player.boundingBox.expand(3.0D, 0.0D, 3.0D); List enemies = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, axisalignedbb); - if (enemies != null && !enemies.isEmpty()) { + if (enemies != null && !enemies.isEmpty() && event.source != DamageSourceList.blackHeart) { Iterator iterator = enemies.iterator(); while (iterator.hasNext()) { Entity enemy = (Entity) iterator.next(); @@ -374,4 +374,4 @@ public class EntityEventHandler { } if (event.entity instanceof EntityPlayer && !(event.entity instanceof EntityPlayerMP)) JewelrycraftMod.netWrapper.sendToServer(new PacketRequestPlayerInfo()); } -} \ No newline at end of file +} -- cgit v1.2.3 From 79ce797db01e6485fc20b67bdb1e8c09b81bf195 Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 00:46:00 +0200 Subject: Fixed GuiJewelryModifier crash? Hopefully fixed The Jewelry Modifier GUI from crashing when trying to search for an item (I think?) --- .../java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java index 9c5d7be..a083f57 100644 --- a/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java +++ b/src/main/java/darkknight/jewelrycraft/client/gui/GuiJewelryModifier.java @@ -87,7 +87,7 @@ public class GuiJewelryModifier extends GuiContainer { if (this.searchField.textboxKeyTyped(character, key)) { int items = 0; for (ItemStack item : JewelrycraftUtil.objects) - if (item != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++; + if (item != null && searchField != null && searchField.getText() != "" && item.getItem() != null && item.getDisplayName().toLowerCase().contains(this.searchField.getText().toLowerCase())) items++; maxPages = items / 48 + 1; page = 1; this.pages.setText(page + "/" + maxPages); -- cgit v1.2.3 From c5c410ee5e3f1a96cd93c746beddd4d9e48a63be Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 00:51:54 +0200 Subject: Limiting black and blue hearts a player can pick --- src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java index 12239e5..1f45d0a 100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java @@ -30,6 +30,9 @@ public class ConfigHandler public static int GEM_CHEST_MAX; public static int FURNACE_MIN_INGOT_STACK; public static int FURNACE_MAX_INGOT_STACK; + + public static int MAX_BLACK_HEARTS_PICKUP; + public static int MAX_BLUE_HEARTS_PICKUP; public static boolean CRYSTAL_GLOW; public static boolean CRYSTAL_PARTICLES; @@ -52,7 +55,7 @@ public class ConfigHandler public static boolean ENABLE_WORLD_GEN = true; public static boolean ORE_GEN = true; public static boolean CRYSTAL_GEN = true; - public static boolean STRUCTURES[] = {true, true, true, true, true, true}; + public static boolean STRUCTURES[] = {tr ue, true, true, true, true, true}; public void loadConfig(FMLPreInitializationEvent event) { @@ -86,6 +89,8 @@ public class ConfigHandler CRYSTAL_PARTICLES = config.getBoolean("Crystal Particles", categories[2], true, "If false, then crystal will no longer spawn particles"); HEARTS_DESPAWN = config.getBoolean("Hearts Despawn", categories[2], true, "If false, then Hearts and Half-hearts will no longer despawn"); JEWELRY_INFO = config.getBoolean("Jewelry Info", categories[2], true, "If false, then extra info won't be show when hovering over a jewelery."); + MAX_BLACK_HEARTS_PICKUP = config.getInt("Max Black Hearts Pickup", categories[2], Integer.MAX_VALUE, 0, Integer.MAX_VALUE, "Determines how many black hearts can a player pick up."); + MAX_BLUE_HEARTS_PICKUP = config.getInt("Max Blue Hearts Pickup", categories[2], Integer.MAX_VALUE, 0, Integer.MAX_VALUE, "Determines how many blue hearts can a player pick up."); ENABLE_WORLD_GEN = config.getBoolean("World Generation", categories[3], true, "If false, nothing will generate (this includes ore)"); ORE_GEN = config.getBoolean("Ore Generation", categories[3], true, "If false, ores won't generate"); -- cgit v1.2.3 From 82e37b6c3632a0028f365321bf041c63912e29f6 Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 00:52:21 +0200 Subject: Changed version --- src/main/java/darkknight/jewelrycraft/util/Variables.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/darkknight/jewelrycraft/util/Variables.java b/src/main/java/darkknight/jewelrycraft/util/Variables.java index 15d4d9e..4ced1ea 100644 --- a/src/main/java/darkknight/jewelrycraft/util/Variables.java +++ b/src/main/java/darkknight/jewelrycraft/util/Variables.java @@ -8,7 +8,7 @@ public class Variables public static final String MODID = "jewelrycraft2"; public static final String MODNAME = "Jewelrycraft 2"; - public static final String VERSION = "1.1.3"; + public static final String VERSION = "1.1.4"; public static final String PACKET_CHANNEL = "jewelrycraft2"; public static final String CONFIG_GUI = "darkknight.jewelrycraft.config.ConfigGuiFactory"; -- cgit v1.2.3 From c040061dc1c1f4eded82f341804fd41e8383db7e Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 00:53:19 +0200 Subject: Updated gradle version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b24ed16..0571c57 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'curseforge' project.ext { massive = "1" major = "1" - minor = "2" + minor = "4" mcVersion = "1.7.10" ee3Version = "0.3.505" alpacaVersion = "1.2" -- cgit v1.2.3 From 1abd7b56139c871f0d7590f557d24927ba34dd79 Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 01:00:58 +0200 Subject: Updated hearts - They should no longer increase health when combining - They can now be limited to how much each heart can be picked --- src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java index 7f547bb..84d1ee4 100644 --- a/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java +++ b/src/main/java/darkknight/jewelrycraft/entities/EntityHeart.java @@ -53,8 +53,6 @@ public class EntityHeart extends EntityLiving { super.collideWithEntity(entity); if (!this.worldObj.isRemote && entity instanceof EntityHeart && getType().equals(((EntityHeart) entity).getType())) { setQuantity(getQuantity() + ((EntityHeart) entity).getQuantity()); - getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(getQuantity() + ((EntityHeart) entity).getQuantity()); - this.heal(getQuantity()); entity.setDead(); } } @@ -76,10 +74,10 @@ public class EntityHeart extends EntityLiving { } else if (getType().equals("White") && playerInfo.getFloat("WhiteHeart") > 0.1F) { playerInfo.setFloat(getType() + "Heart", 0F); player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f); - player.setHealth(player.getHealth() + 2f); + player.setHealth(player.getHealth() + 2f); JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player); this.setDead(); - } else if (!getType().equals("Red")) { + } else if (!getType().equals("Red") && ((getType().equals("Black") && playerInfo.getFloat("BlackHeart") <= ConfigHandler.MAX_BLACK_HEARTS_PICKUP) || (getType().equals("Blue") && playerInfo.getFloat("BlueHeart") <= ConfigHandler.MAX_BLUE_HEARTS_PICKUP))) { if(playerInfo.hasKey(getType() + "Heart")) playerInfo.setFloat(getType() + "Heart", playerInfo.getFloat(getType() + "Heart") + getQuantity()); else playerInfo.setFloat(getType() + "Heart", getQuantity()); JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player); -- cgit v1.2.3 From 45e3765b7f2ea87c33cd22900baabb31e8e1d87c Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Sat, 22 Aug 2015 01:02:07 +0200 Subject: Not my fault --- src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java index 1f45d0a..290c8ae 100644 --- a/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java +++ b/src/main/java/darkknight/jewelrycraft/config/ConfigHandler.java @@ -55,7 +55,7 @@ public class ConfigHandler public static boolean ENABLE_WORLD_GEN = true; public static boolean ORE_GEN = true; public static boolean CRYSTAL_GEN = true; - public static boolean STRUCTURES[] = {tr ue, true, true, true, true, true}; + public static boolean STRUCTURES[] = {true, true, true, true, true, true}; public void loadConfig(FMLPreInitializationEvent event) { -- cgit v1.2.3 From d0abbc5bda63dc777c660b703ffcfa4a81a41e1a Mon Sep 17 00:00:00 2001 From: The Dark Knight Date: Wed, 26 Aug 2015 01:28:32 +0200 Subject: Smelt anything Fuck it, fun for everybody! --- src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java index cd24deb..fe48dd0 100644 --- a/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java +++ b/src/main/java/darkknight/jewelrycraft/block/BlockSmelter.java @@ -97,11 +97,7 @@ public class BlockSmelter extends BlockContainer { te.isDirty = true; } if (item != null && item.getItem() != null && !(item.getItem() instanceof ItemMoltenMetalBucket)) { - int index = -1; - for (int a = 0; a < JewelrycraftUtil.jamcraftPlayers.size(); a++) - if (entityPlayer.getUniqueID().toString().equals(JewelrycraftUtil.jamcraftPlayers.get(a))) index = a; - if (entityPlayer.capabilities.isCreativeMode) index = 1; - boolean canPlace = item != null && (JewelrycraftUtil.isMetal(item) || JewelrycraftUtil.isOre(item) || index >= 0 || JewelryNBT.ingot(item) != null); + boolean canPlace = item != null; boolean isOre = false, oreCoincidesWithMetal = false, itemCoincidesWithMetal = false, itemCoincidesWithMoltenMetal = false, overflow = false; isOre = JewelrycraftUtil.isOre(item); if (te.metal != null && te.metal.getItem() != null) { -- cgit v1.2.3