From a1fa511e7a30778a7e74e5fe1629a01a405f20ac Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 13 Feb 2015 14:48:22 -0500 Subject: [PATCH] Funness - I can't spell --- .../AlchemicalWizardry.java | 3 +- .../BloodMagicConfiguration.java | 4 +- .../api/altarRecipeRegistry/IFadedRune.java | 6 ++ .../common/AlchemicalWizardryEventHooks.java | 2 +- .../bloodAltarUpgrade/UpgradedAltars.java | 86 ++++++++++--------- .../common/items/LavaCrystal.java | 22 +++-- .../common/tileEntity/TEAltar.java | 4 + .../assets/alchemicalwizardry/lang/en_US.lang | 1 + 8 files changed, 78 insertions(+), 50 deletions(-) create mode 100644 src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 1d8c757c..61f956d0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -345,6 +345,7 @@ public class AlchemicalWizardry public static boolean respawnWithDebuff; public static boolean lockdownAltar; public static boolean causeHungerWithRegen; + public static boolean causeHungerChatMessage = true; public static List wellBlacklist; @@ -1587,7 +1588,7 @@ public class AlchemicalWizardry continue; } - strLine = strLine.replace('”', '"').replace('“','"').replace("Â…", "...").replace('Â’', '\'').replace('–', '-'); + strLine = strLine.replace('”', '"').replace('“','"').replace("…", "...").replace('’', '\'').replace('–', '-'); if(Minecraft.getMinecraft() != null && Minecraft.getMinecraft().fontRenderer != null) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 2ac09d08..f25c6892 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -84,8 +84,8 @@ public class BloodMagicConfiguration AlchemicalWizardry.customPotionSoulHardenID = config.get("Potion ID", "SoulHarden", 112).getInt(); AlchemicalWizardry.customPotionDeafID = config.get("Potion ID", "Deaf", 113).getInt(); AlchemicalWizardry.customPotionFeatherFallID = config.get("Potion ID", "FeatherFall", 114).getInt(); - AlchemicalWizardry.customPotionDemonCloakID = config.get("Potion ID", "DemonCloak", 114).getInt(); - AlchemicalWizardry.customPotionAmphibianID = config.get("Potion ID", "Amphibian", 115).getInt(); + AlchemicalWizardry.customPotionDemonCloakID = config.get("Potion ID", "DemonCloak", 115).getInt(); + AlchemicalWizardry.customPotionAmphibianID = config.get("Potion ID", "Amphibian", 116).getInt(); MeteorParadigm.maxChance = config.get("meteor", "maxChance", 1000).getInt(); AlchemicalWizardry.doMeteorsDestroyBlocks = config.get("meteor", "doMeteorsDestroyBlocks", true).getBoolean(true); diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java new file mode 100644 index 00000000..9f685d55 --- /dev/null +++ b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/IFadedRune.java @@ -0,0 +1,6 @@ +package WayofTime.alchemicalWizardry.api.altarRecipeRegistry; + +public interface IFadedRune +{ + public int getAltarTierLimit(int meta); +} diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java index bdd7fa13..9304910b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java @@ -332,7 +332,7 @@ public class AlchemicalWizardryEventHooks @SubscribeEvent public void onPlayerRespawnEvent(PlayerRespawnEvent event) { - if (AlchemicalWizardry.respawnWithDebuff) + if (AlchemicalWizardry.respawnWithDebuff && event.player != null) { event.player.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionSoulFray.id, 20 * 60 * 5, 0)); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java b/src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java index ad8839b2..2f3a77b4 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java @@ -1,14 +1,15 @@ package WayofTime.alchemicalWizardry.common.bloodAltarUpgrade; -import WayofTime.alchemicalWizardry.ModBlocks; -import WayofTime.alchemicalWizardry.common.block.BloodRune; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; +import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.ModBlocks; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.IFadedRune; +import WayofTime.alchemicalWizardry.common.block.BloodRune; + public class UpgradedAltars { public static List secondTierAltar = new ArrayList(); @@ -170,6 +171,10 @@ public class UpgradedAltars public static AltarUpgradeComponent getUpgrades(World world, int x, int y, int z, int altarTier) { + if(!world.isRemote) + { + return null; + } AltarUpgradeComponent upgrades = new AltarUpgradeComponent(); List list = UpgradedAltars.getAltarUpgradeListForTier(altarTier); @@ -180,49 +185,52 @@ public class UpgradedAltars //Currently checks the getRuneEffect. //TODO Change so that it uses the metadata instead, with the BlockID. Block testBlock = world.getBlock(x + ac.getX(), y + ac.getY(), z + ac.getZ()); - + int meta = world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ()); + if (testBlock instanceof BloodRune) { - if (!world.isRemote) + if (testBlock instanceof IFadedRune && altarTier > ((IFadedRune)testBlock).getAltarTierLimit(meta)) { - switch (((BloodRune) testBlock).getRuneEffect(world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ()))) - { - case 1: - upgrades.addSpeedUpgrade(); - break; + return UpgradedAltars.getUpgrades(world, x, y, z, ((IFadedRune)testBlock).getAltarTierLimit(meta)); + } + + switch (((BloodRune) testBlock).getRuneEffect(meta)) + { + case 1: + upgrades.addSpeedUpgrade(); + break; - case 2: - upgrades.addEfficiencyUpgrade(); - break; + case 2: + upgrades.addEfficiencyUpgrade(); + break; - case 3: - upgrades.addSacrificeUpgrade(); - break; + case 3: + upgrades.addSacrificeUpgrade(); + break; - case 4: - upgrades.addSelfSacrificeUpgrade(); - break; + case 4: + upgrades.addSelfSacrificeUpgrade(); + break; - case 5: - upgrades.addaltarCapacitiveUpgrade(); - break; + case 5: + upgrades.addaltarCapacitiveUpgrade(); + break; - case 6: - upgrades.addDisplacementUpgrade(); - break; + case 6: + upgrades.addDisplacementUpgrade(); + break; - case 7: - upgrades.addorbCapacitiveUpgrade(); - break; + case 7: + upgrades.addorbCapacitiveUpgrade(); + break; - case 8: - upgrades.addBetterCapacitiveUpgrade(); - break; - - case 9: - upgrades.addAccelerationUpgrade(); - break; - } + case 8: + upgrades.addBetterCapacitiveUpgrade(); + break; + + case 9: + upgrades.addAccelerationUpgrade(); + break; } } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java index b507deec..aa8977dc 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/LavaCrystal.java @@ -1,17 +1,19 @@ package WayofTime.alchemicalWizardry.common.items; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.StatCollector; import net.minecraft.world.World; - -import java.util.List; +import net.minecraft.world.WorldProvider; +import net.minecraftforge.common.DimensionManager; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class LavaCrystal extends EnergyItems { @@ -84,7 +86,13 @@ public class LavaCrystal extends EnergyItems return false; } - World world = MinecraftServer.getServer().worldServers[0]; +// World world = MinecraftServer.getServer().worldServers[0]; + WorldProvider provider = DimensionManager.getProvider(0); + if(provider == null || provider.worldObj == null) + { + return false; + } + World world = provider.worldObj; LifeEssenceNetwork data = (LifeEssenceNetwork) world.loadItemData(LifeEssenceNetwork.class, ownerName); if (data == null) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java index c599d9a5..fa49395e 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java @@ -619,6 +619,10 @@ public class TEAltar extends TileEntity implements IInventory, IFluidTank, IFlui PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); if (regenEffect != null && regenEffect.getAmplifier() > 0) { + if(AlchemicalWizardry.causeHungerChatMessage && player.getActivePotionEffect(Potion.hunger) != null) + { + player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("message.altar.hunger"))); + } player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2)); } } diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 5f452d97..09d11f10 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -387,6 +387,7 @@ message.altar.currenttier=Altar's Current Tier: %s message.altar.progress=Altar's Progress: message.altar.inputtank= Input Tank: %s LP message.altar.outputtank= Output Tank: %s LP +message.altar.hunger=[BM] Your high regeneration rate has caused you to become hungry... message.attunedcrystal.clearing=Clearing saved container... message.attunedcrystal.error.cannotfind=Can no longer find linked container. message.attunedcrystal.error.noconnections=Linked container has no connections remaining!