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(-) (limited to 'src/main/java/darkknight') 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(-) (limited to 'src/main/java/darkknight') 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(-) (limited to 'src/main/java/darkknight') 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(-) (limited to 'src/main/java/darkknight') 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 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(-) (limited to 'src/main/java/darkknight') 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(-) (limited to 'src/main/java/darkknight') 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(-) (limited to 'src/main/java/darkknight') 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