diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 658dc8d8..69d11348 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -5,6 +5,7 @@ import java.io.FileOutputStream; import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; @@ -204,6 +205,8 @@ public class AlchemicalWizardry public static boolean wimpySettings; public static boolean respawnWithDebuff; public static boolean lockdownAltar; + + public static List wellBlacklist; public static CreativeTabs tabBloodMagic = new CreativeTabs("tabBloodMagic") { @@ -934,7 +937,9 @@ public class AlchemicalWizardry }else { this.isForestryLoaded = false; - } + } + + BloodMagicConfiguration.loadBlacklist(); } public static void initAlchemyPotionRecipes() diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 17320e6b..351ea952 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -1,7 +1,12 @@ package WayofTime.alchemicalWizardry; import java.io.File; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.Map.Entry; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.common.config.Configuration; import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm; @@ -96,5 +101,25 @@ public class BloodMagicConfiguration } + + public static void loadBlacklist() + { + AlchemicalWizardry.wellBlacklist=new ArrayList(); + for( Object o : EntityList.stringToClassMapping.entrySet()) + { + Entry entry=(Entry) o; + Class curClass=(Class)entry.getValue(); + boolean valid=EntityLivingBase.class.isAssignableFrom(curClass) && !Modifier.isAbstract(curClass.getModifiers()); + if(valid) + { + boolean blacklisted=config.get("wellOfSufferingBlackList", entry.getKey().toString(), false).getBoolean(); + if(blacklisted) + AlchemicalWizardry.wellBlacklist.add(curClass); + } + + } + config.save(); + } + } diff --git a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java index bc253a23..993c102b 100644 --- a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java +++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java @@ -12,6 +12,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; @@ -110,7 +111,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect { entity = (EntityLivingBase) iterator2.next(); - if (entity instanceof EntityPlayer) + if (entity instanceof EntityPlayer || AlchemicalWizardry.wellBlacklist.contains(entity.getClass())) { continue; } diff --git a/1.7.10/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang b/1.7.10/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang index b5ecebc6..c76fcfd9 100644 --- a/1.7.10/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang +++ b/1.7.10/main/resources/assets/alchemicalwizardry/lang/ru_RU.lang @@ -3,8 +3,7 @@ tile.bloodAltar.name=Кровавый алтарь tile.bloodRune.blank.name=Кровавая руна tile.bloodRune.fill.name=Руна дополнительной ёмкости tile.bloodRune.empty.name=Руна дислокации -tile.bloodRune.orb.name=Руна шара -tile.bloodRune.betterCapacity.name=Руна улучшенной ёмкости +tile.bloodRune.test.name=Руна шара tile.speedRune.name=Руна скорости tile.efficiencyRune.name=Руна эффективности tile.runeOfSacrifice.name=Руна жертвоприношения @@ -26,7 +25,6 @@ tile.blockConduit.name=Труба для заклинаний tile.blockSpellParadigm.projectile.name=Генератор частиц tile.blockSpellParadigm.self.name=Self Augmentator tile.blockSpellParadigm.melee.name=Агрегатор ближнего действия -tile.blockSpellParadigm.tool.name=Кузнец инструментов tile.blockSpellEnhancement.power1.name=Нестабильный усилитель заклинаний tile.blockSpellEnhancement.power2.name=Обычный усилитель заклинаний tile.blockSpellEnhancement.power3.name=Усиленный усилитель заклинаний @@ -129,9 +127,7 @@ item.itemDiabloKey.name=Ключ связывания item.energyBazooka.name=Энергетическая базука item.bloodLightSigil.name=Сигил кровавого светильника item.itemComplexSpellCrystal.name=Сложный кристал заклинаний -item.itemSigilOfSupression.name=Сигил подавления -item.itemSigilOfEnderSeverance.name=Сигил разрыва Края -item.bucketLife.name=Ведро жизни +item.bucketLive.name=Ведро жизни item.bloodMagicBaseItem.QuartzRod.name=Кварцевый стержень item.bloodMagicBaseItem.EmptyCore.name=Пустое ядро item.bloodMagicBaseItem.MagicalesCable.name=Магический провод @@ -140,7 +136,6 @@ item.bloodMagicBaseItem.StoneBrace.name=Каменное скрепление item.bloodMagicBaseItem.ProjectileCore.name=Метательное ядро item.bloodMagicBaseItem.SelfCore.name=Сплошное ядро item.bloodMagicBaseItem.MeleeCore.name=Ближнее ядро -item.bloodMagicBaseItem.ToolCore.name=Ядро инструментов item.bloodMagicBaseItem.ParadigmBackPlate.name=Примерная пластина item.bloodMagicBaseItem.OutputCable.name=Провод для выхода заклинаний item.bloodMagicBaseItem.InputCable.name=Провод для входа заклинаний @@ -168,10 +163,7 @@ item.bloodMagicAlchemyItem.FracturedBone.name=Сломанная кость item.bloodMagicAlchemyItem.Virtus.name=Virtus item.bloodMagicAlchemyItem.Reductus.name=Reductus item.bloodMagicAlchemyItem.Potentia.name=Potentia -item.sanguineHelmet.name=Шлем цвета крови -item.itemSeerSigil.name=Сигил зрения -item.itemFluidSigil.name= -item.multiTool.name=Динамический жезл + #Creative Tab itemGroup.tabBloodMagic=Blood Magic @@ -179,6 +171,4 @@ itemGroup.tabBloodMagic=Blood Magic #Extra Strings bm.string.consume=Потребление bm.string.drain=Опустошение -bm.string.tier=Уровень -bm.string.crafting.orb.shaped=Форменное создание шара -bm.string.crafting.orb.shapeless=Бесформенное создание шара \ No newline at end of file +bm.string.tier=Уровень \ No newline at end of file diff --git a/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang b/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang index 96371fa6..de303903 100644 --- a/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang +++ b/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_CN.lang @@ -2,8 +2,9 @@ tile.bloodAltar.name=血之祭坛 tile.bloodRune.blank.name=气血符文 tile.bloodRune.fill.name=增容符文 -tile.bloodRune.empty.name=紊乱符文 -tile.bloodRune.test.name=宝珠符文 +tile.bloodRune.empty.name=转位符文 +tile.bloodRune.orb.name=宝珠符文 +tile.bloodRune.betterCapacity.name=超容符文 tile.speedRune.name=速度符文 tile.efficiencyRune.name=效率符文 tile.runeOfSacrifice.name=献祭符文 @@ -25,6 +26,7 @@ tile.blockConduit.name=法术管道 tile.blockSpellParadigm.projectile.name=抛射法术基架 tile.blockSpellParadigm.self.name=自体法术基架 tile.blockSpellParadigm.melee.name=格斗法术基架 +tile.blockSpellParadigm.tool.name=工具法术基架 tile.blockSpellEnhancement.power1.name=[不稳定]法术附属：力量 tile.blockSpellEnhancement.power2.name=[标准]法术附属：力量 tile.blockSpellEnhancement.power3.name=[加强]法术附属：力量 @@ -74,7 +76,7 @@ item.divinationSigil.name=占卜印记 item.waterScribeTool.name=元素铭文：水 item.fireScribeTool.name=元素铭文：火 item.earthScribeTool.name=元素铭文：地 -item.airScribeTool.name=元素铭文：空气 +item.airScribeTool.name=元素铭文：风 item.duskScribeTool.name=元素铭文： 幽暗 item.activationCrystalWeak.name=[低等]激活水晶 item.activationCrystalAwakened.name=[觉醒]激活水晶 @@ -127,8 +129,10 @@ item.itemDiabloKey.name=约束钥匙 item.energyBazooka.name=能源火箭筒 item.bloodLightSigil.name=血光印记 item.itemComplexSpellCrystal.name=复杂的法术水晶 +item.itemSigilOfSupression.name=抑液印记 +item.itemSigilOfEnderSeverance.name=Sigil of Ender Severance item.bucketLive.name=生命之桶 -item.bloodMagicBaseItem.quartzRod.name=石英棍 +item.bloodMagicBaseItem.QuartzRod.name=石英棍 item.bloodMagicBaseItem.EmptyCore.name=空白核心 item.bloodMagicBaseItem.MagicalesCable.name=魔法线缆 item.bloodMagicBaseItem.WoodBrace.name=木支架 @@ -136,6 +140,7 @@ item.bloodMagicBaseItem.StoneBrace.name=石支架 item.bloodMagicBaseItem.ProjectileCore.name=抛射核心 item.bloodMagicBaseItem.SelfCore.name=自体核心 item.bloodMagicBaseItem.MeleeCore.name=格斗核心 +item.bloodMagicBaseItem.ToolCore.name=工具核心 item.bloodMagicBaseItem.ParadigmBackPlate.name=范式板 item.bloodMagicBaseItem.OutputCable.name=法术线缆：输出 item.bloodMagicBaseItem.InputCable.name=法术线缆：输入 @@ -163,6 +168,10 @@ item.bloodMagicAlchemyItem.FracturedBone.name=断裂的骨头 item.bloodMagicAlchemyItem.Virtus.name=力量粉末 item.bloodMagicAlchemyItem.Reductus.name=代价粉末 item.bloodMagicAlchemyItem.Potentia.name=效能粉末 +item.sanguineHelmet.name=血红头盔 +item.itemSeerSigil.name=见解印记 +item.itemFluidSigil.name= +item.multiTool.name=法术权杖 #Creative Tab itemGroup.tabBloodMagic=血魔法 @@ -171,3 +180,5 @@ itemGroup.tabBloodMagic=血魔法 bm.string.consume=使用 bm.string.drain=消耗 bm.string.tier=层数 +bm.string.crafting.orb.shaped=特定血宝珠合成 +bm.string.crafting.orb.shapeless=不定血宝珠合成 diff --git a/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang b/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang new file mode 100644 index 00000000..86d296f8 --- /dev/null +++ b/1.7.10/main/resources/assets/alchemicalwizardry/lang/zh_TW.lang @@ -0,0 +1,184 @@ +#Block Localization +tile.bloodAltar.name=血之祭壇 +tile.bloodRune.blank.name=氣血符文 +tile.bloodRune.fill.name=增容符文 +tile.bloodRune.empty.name=轉位符文 +tile.bloodRune.orb.name=寶珠符文 +tile.bloodRune.betterCapacity.name=超容符文 +tile.speedRune.name=速度符文 +tile.efficiencyRune.name=效率符文 +tile.runeOfSacrifice.name=獻祭符文 +tile.runeOfSelfSacrifice.name=犧牲符文 +tile.ritualStone.name=儀式石 +tile.blockMasterStone.name=主儀式石 +tile.bloodSocket.name=滿的血插槽 +tile.imperfectRitualStone.name=不完善的儀式石 +tile.armourForge.name=靈魂裝甲鍛造石 +tile.emptySocket.name=空的血插槽 +tile.bloodStoneBrick.name=血石磚 +tile.largeBloodStoneBrick.name=大血石磚 +tile.blockWritingTable.name=煉金術臺 +tile.blockHomHeart.name=符咒桌 +tile.bloodPedestal.name=奧術基座 +tile.bloodPlinth.name=奧術基柱 +tile.bloodTeleposer.name=傳送器 +tile.blockConduit.name=法術管道 +tile.blockSpellParadigm.projectile.name=拋射法術基架 +tile.blockSpellParadigm.self.name=自體法術基架 +tile.blockSpellParadigm.melee.name=格鬥法術基架 +tile.blockSpellParadigm.tool.name=工具法術基架 +tile.blockSpellEnhancement.power1.name=[不穩定]法術附屬：力量 +tile.blockSpellEnhancement.power2.name=[標準]法術附屬：力量 +tile.blockSpellEnhancement.power3.name=[加強]法術附屬：力量 +tile.blockSpellEnhancement.power4.name=[灌輸]法術附屬：力量 +tile.blockSpellEnhancement.power5.name=[惡魔]法術附屬：力量 +tile.blockSpellEnhancement.cost1.name=[不穩定]法術附屬：代價 +tile.blockSpellEnhancement.cost2.name=[標準]法術附屬：代價 +tile.blockSpellEnhancement.cost3.name=[加強]法術附屬：代價 +tile.blockSpellEnhancement.cost4.name=[灌輸]法術附屬：代價 +tile.blockSpellEnhancement.cost5.name=[惡魔]法術附屬：代價 +tile.blockSpellEnhancement.potency1.name=[不穩定]法術附屬：效能 +tile.blockSpellEnhancement.potency2.name=[標準]法術附屬：效能 +tile.blockSpellEnhancement.potency3.name=[加強]法術附屬：效能 +tile.blockSpellEnhancement.potency4.name=[灌輸]法術附屬：效能 +tile.blockSpellEnhancement.potency5.name=[惡魔]法術附屬：效能 +tile.blockSpellModifier.default.name=法術修飾符：默認 +tile.blockSpellModifier.offensive.name=法術修飾符：攻勢 +tile.blockSpellModifier.defensive.name=法術修飾符：防守 +tile.blockSpellModifier.environmental.name=法術修飾符：環境 +tile.blockSpellEffect.fire.name=火焰效應器 +tile.blockSpellEffect.ice.name=冰霜效應器 +tile.blockSpellEffect.wind.name=風暴效應器 +tile.blockSpellEffect.earth.name=塵土效應器 + +#Item Localization +item.weakBloodOrb.name=虛弱氣血寶珠 +item.apprenticeBloodOrb.name=學徒氣血寶珠 +item.magicianBloodOrb.name=法師的氣血寶珠 +item.masterBloodOrb.name=導師氣血寶珠 +item.archmageBloodOrb.name=大法師的氣血寶珠 +item.energyBlast.name=能源爆破槍 +item.energySword.name=約束之劍 +item.lavaCrystal.name=熔岩晶體 +item.waterSigil.name=水之印記 +item.lavaSigil.name=熔岩印記 +item.voidSigil.name=虛空印記 +item.blankSlate.name=空白的石板 +item.reinforcedSlate.name=加強的石板 +item.sacrificialDagger.name=犧牲匕首 +item.daggerOfSacrifice.name=獻祭刀 +item.airSigil.name=空氣印記 +item.sigilOfTheFastMiner.name=速掘印記 +item.sigilOfElementalAffinity.name=元素印記 +item.sigilOfHaste.name=急速印記 +item.sigilOfHolding.name=集合印記 +item.divinationSigil.name=占卜印記 +item.waterScribeTool.name=元素銘文：水 +item.fireScribeTool.name=元素銘文：火 +item.earthScribeTool.name=元素銘文：地 +item.airScribeTool.name=元素銘文：風 +item.duskScribeTool.name=元素銘文： 幽暗 +item.activationCrystalWeak.name=[低等]激活水晶 +item.activationCrystalAwakened.name=[覺醒]激活水晶 +item.boundPickaxe.name=約束之鎬 +item.boundAxe.name=約束之斧 +item.boundShovel.name=約束之鍬 +item.boundHelmet.name=約束頭盔 +item.boundPlate.name=約束胸甲 +item.boundLeggings.name=約束護腿 +item.boundBoots.name=約束靴子 +item.weakBloodShard.name=虛弱氣血碎片 +item.growthSigil.name=綠叢印記 +item.blankSpell.name=未綁定的水晶 +item.alchemyFlask.name=藥瓶 +item.standardBindingAgent.name=[標準的]粘合劑 +item.mundanePowerCatalyst.name=[平凡的]功率催化劑 +item.averagePowerCatalyst.name=[普通的]功率催化劑 +item.greaterPowerCatalyst.name=[更好的]功率催化劑 +item.mundaneLengtheningCatalyst.name=[平凡的]延時催化劑 +item.averageLengtheningCatalyst.name=[普通的]延時催化劑 +item.greaterLengtheningCatalyst.name=[更好的]延時催化劑 +item.incendium.name=火焰粉末 +item.magicales.name=魔法粉末 +item.sanctus.name=神聖粉末 +item.aether.name=以太元素 +item.simpleCatalyst.name=簡單的催化劑 +item.crepitous.name=捻音粉末 +item.crystallos.name=冰晶粉末 +item.terrae.name=泥土粉末 +item.aquasalus.name=液之粉末 +item.tennebrae.name=暗黑粉末 +item.demonBloodShard.name=惡魔氣血碎片 +item.sigilOfWind.name=旋風印記 +item.telepositionFocus.name=傳送方位核心 +item.enhancedTelepositionFocus.name=[加強]傳送方位核心 +item.reinforcedTelepositionFocus.name=[強化]傳送方位核心 +item.demonicTelepositionFocus.name=[惡魔]傳送方位核心 +item.imbuedSlate.name=灌輸石板 +item.demonicSlate.name=惡魔石板 +item.sigilOfTheBridge.name=影橋印記 +item.armourInhibitor.name=裝甲約束者 +item.cheatyItem.name=測試寶珠 +item.weakFillingAgent.name=[虚弱的]填充劑 +item.standardFillingAgent.name=[標準的]填充劑 +item.enhancedFillingAgent.name=[加強的]填充劑 +item.weakBindingAgent.name=[虚弱的]粘合劑 +item.ritualDiviner.name=儀式推測仗 +item.sigilOfMagnetism.name=磁引印記 +item.itemDiabloKey.name=約束鑰匙 +item.energyBazooka.name=能源火箭筒 +item.bloodLightSigil.name=血光印記 +item.itemComplexSpellCrystal.name=複雜的法術水晶 +item.itemSigilOfSupression.name=抑液印記 +item.itemSigilOfEnderSeverance.name=Sigil of Ender Severance +item.bucketLive.name=生命之桶 +item.bloodMagicBaseItem.QuartzRod.name=石英棍 +item.bloodMagicBaseItem.EmptyCore.name=空白核心 +item.bloodMagicBaseItem.MagicalesCable.name=魔法線纜 +item.bloodMagicBaseItem.WoodBrace.name=木支架 +item.bloodMagicBaseItem.StoneBrace.name=石支架 +item.bloodMagicBaseItem.ProjectileCore.name=拋射核心 +item.bloodMagicBaseItem.SelfCore.name=自體核心 +item.bloodMagicBaseItem.MeleeCore.name=格鬥核心 +item.bloodMagicBaseItem.ToolCore.name=工具核心 +item.bloodMagicBaseItem.ParadigmBackPlate.name=範式板 +item.bloodMagicBaseItem.OutputCable.name=法術線纜：輸出 +item.bloodMagicBaseItem.InputCable.name=法術線纜：輸入 +item.bloodMagicBaseItem.FlameCore.name=火焰核心 +item.bloodMagicBaseItem.IcyCore.name=冰霜核心 +item.bloodMagicBaseItem.GustCore.name=風暴核心 +item.bloodMagicBaseItem.EarthenCore.name=塵土核心 +item.bloodMagicBaseItem.CrackedRunicPlate.name=[裂損]古碑文板 +item.bloodMagicBaseItem.RunicPlate.name=古碑文板 +item.bloodMagicBaseItem.ScribedRunicPlate.name=[灌輸]古碑文板 +item.bloodMagicBaseItem.DefaultCore.name=未鑒核心 +item.bloodMagicBaseItem.OffensiveCore.name=攻勢核心 +item.bloodMagicBaseItem.DefensiveCore.name=防守核心 +item.bloodMagicBaseItem.EnvironmentalCore.name=環境核心 +item.bloodMagicBaseItem.PowerCore.name=力量核心 +item.bloodMagicBaseItem.CostCore.name=代價核心 +item.bloodMagicBaseItem.PotencyCore.name=效能核心 +item.bloodMagicBaseItem.ObsidianBrace.name=黑曜石支架 +item.bloodMagicAlchemyItem.Offensa.name=攻勢粉末 +item.bloodMagicAlchemyItem.Praesidium.name=防守粉末 +item.bloodMagicAlchemyItem.OrbisTerrae.name=環境粉末 +item.bloodMagicAlchemyItem.StrengthenedCatalyst.name=[加強]催化劑 +item.bloodMagicAlchemyItem.ConcentratedCatalyst.name=[濃縮]催化劑 +item.bloodMagicAlchemyItem.FracturedBone.name=斷裂的骨頭 +item.bloodMagicAlchemyItem.Virtus.name=力量粉末 +item.bloodMagicAlchemyItem.Reductus.name=代價粉末 +item.bloodMagicAlchemyItem.Potentia.name=效能粉末 +item.sanguineHelmet.name=血紅頭盔 +item.itemSeerSigil.name=見解印記 +item.itemFluidSigil.name= +item.multiTool.name=法術權杖 + +#Creative Tab +itemGroup.tabBloodMagic=血魔法 + +#Extra Strings +bm.string.consume=使用 +bm.string.drain=消耗 +bm.string.tier=層數 +bm.string.crafting.orb.shaped=特定血寶珠合成 +bm.string.crafting.orb.shapeless=不定血寶珠合成