mirror of
https://github.com/GTNewHorizons/BloodArsenal.git
synced 2026-11-21 04:32:31 +00:00
1.2-3 Release
This commit is contained in:
1 parent
e3e6c71e6a
commit
e37470040c
22 files changed
+2093
-78
No files matched your search
@@ -160,6 +160,7 @@ public class BloodArsenal
|
||||
|
||||
if (Loader.isModLoaded("guideapi") && BloodArsenalConfig.guideAPIIntegration)
|
||||
{
|
||||
logger.info("Loaded Guide-API integration");
|
||||
BloodBurnedTome.registerTome();
|
||||
}
|
||||
|
||||
|
||||
@@ -59,6 +59,7 @@ public class BloodArsenalConfig
|
||||
public static boolean versionCheckingAllowed;
|
||||
public static boolean isRedGood;
|
||||
public static boolean cakeIsLie;
|
||||
public static boolean isGlassDangerous;
|
||||
|
||||
public static void init(File file)
|
||||
{
|
||||
@@ -103,11 +104,12 @@ public class BloodArsenalConfig
|
||||
|
||||
baublesIntegration = config.get(modSettings, "Enable Baubles integration?", true).getBoolean(baublesIntegration);
|
||||
forgeMultipartIntegration = config.get(modSettings, "Enable Forge Multipart Integration?", true).getBoolean(forgeMultipartIntegration);
|
||||
guideAPIIntegration = config.get(modSettings, "Enable the Blood Burned Tome from Guide-API?", true).getBoolean(guideAPIIntegration);
|
||||
thaumcraftIntegration = config.get(modSettings, "Enable Thaumcraft/Forbidden Magic integration?", true).getBoolean(thaumcraftIntegration);
|
||||
tinkersIntegration = config.get(modSettings, "Enable Tinker's Construct integration?", true).getBoolean(tinkersIntegration);
|
||||
researchTag = config.get(modSettings, "Add [BA] to all of Blood Arsenal's research?", true).getBoolean(researchTag);
|
||||
bloodInfusedWoodID = config.get(modSettings, "Material ID for Blood Infused Wood; Default: 250", 250).getInt(bloodInfusedWoodID);
|
||||
bloodInfusedIronID = config.get(modSettings, "Material ID for Blood Infused Iron; Defualt: 251", 251).getInt(bloodInfusedIronID);
|
||||
bloodInfusedWoodID = config.get(modSettings, "[Tinker's Construct] Material ID for Blood Infused Wood; Default: 250", 250).getInt(bloodInfusedWoodID);
|
||||
bloodInfusedIronID = config.get(modSettings, "[Tinker's Construct] Material ID for Blood Infused Iron; Default: 251", 251).getInt(bloodInfusedIronID);
|
||||
|
||||
sigilSwimmingCost = config.get(lpSettings, "Sigil of Swimming cost; Default: 150", 150).getInt(sigilSwimmingCost);
|
||||
sigilDivinityCost = config.get(lpSettings, "Sigil of Divinity cost; Default: 1000000", 1000000).getInt(sigilDivinityCost);
|
||||
@@ -119,6 +121,7 @@ public class BloodArsenalConfig
|
||||
versionCheckingAllowed = config.get(misc, "Is auto-magic version checking allowed?", true, "Allows for your version to be checked against the latest version").getBoolean();
|
||||
isRedGood = config.get(misc, "Is RED > PURPLE?", false, "Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrectly.").getBoolean(isRedGood);
|
||||
cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie").getBoolean(cakeIsLie);
|
||||
isGlassDangerous = config.get(misc, "Is glass dangerous?", true, "Breaking glass is dangerous unless you're a wimp").getBoolean(isGlassDangerous);
|
||||
|
||||
config.save();
|
||||
}
|
||||
|
||||
@@ -2,20 +2,11 @@ package com.arc.bloodarsenal.common;
|
||||
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork;
|
||||
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
|
||||
import baubles.common.container.InventoryBaubles;
|
||||
import baubles.common.lib.PlayerHandler;
|
||||
import baubles.common.network.PacketHandler;
|
||||
import baubles.common.network.PacketSyncBauble;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import com.arc.bloodarsenal.common.items.armor.GlassArmor;
|
||||
import com.arc.bloodarsenal.common.items.bauble.EmpoweredSacrificeAmulet;
|
||||
import com.arc.bloodarsenal.common.items.bauble.EmpoweredSelfSacrificeAmulet;
|
||||
import com.arc.bloodarsenal.common.items.bauble.SacrificeAmulet;
|
||||
import com.arc.bloodarsenal.common.items.bauble.SelfSacrificeAmulet;
|
||||
import cpw.mods.fml.client.event.ConfigChangedEvent;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockGlass;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -30,7 +21,6 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
@@ -76,7 +66,7 @@ public class BloodArsenalEventHooks
|
||||
// ThaumicTinkerer extends Thaumcraft's Fakeplayer, which extends EntityPlayer instead
|
||||
// of Forge's FakePlayer class. That's why the Tinkerer's table crashes here.
|
||||
// With this sanity check any crashes related to that problem should be gone
|
||||
if (entityAttacked instanceof EntityPlayerMP)
|
||||
if (GameRegistry.findItem(BloodArsenal.MODID, "glass_helmet") != null && GameRegistry.findItem(BloodArsenal.MODID, "glass_chestplate") != null && GameRegistry.findItem(BloodArsenal.MODID, "glass_leggings") != null && GameRegistry.findItem(BloodArsenal.MODID, "glass_boots") != null && entityAttacked instanceof EntityPlayerMP)
|
||||
{
|
||||
EntityPlayerMP player = (EntityPlayerMP) entityAttacked;
|
||||
|
||||
@@ -113,11 +103,12 @@ public class BloodArsenalEventHooks
|
||||
int duration = entityLiving.getActivePotionEffect(BloodArsenal.bleeding).getDuration();
|
||||
int damage = (rand.nextInt(2) * (amplifier + 1) + rand.nextInt(2));
|
||||
|
||||
entityLiving.addPotionEffect(new PotionEffect(Potion.blindness.id, duration, 1));
|
||||
if (entityLiving.worldObj.getWorldTime() % (60 / (amplifier + 1)) == 0)
|
||||
{
|
||||
entityLiving.attackEntityFrom(BloodArsenal.deathFromBlood, damage);
|
||||
entityLiving.addPotionEffect(new PotionEffect(Potion.blindness.id, duration, 1));
|
||||
// entityLiving.hurtResistantTime = Math.min(entityLiving.hurtResistantTime, 60 / (amplifier + 1));
|
||||
entityLiving.hurtResistantTime = Math.min(entityLiving.hurtResistantTime, 60 / (amplifier + 1));
|
||||
entityLiving.onEntityUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,24 +202,39 @@ public class BloodArsenalEventHooks
|
||||
@SubscribeEvent
|
||||
public void harvestEvent(BlockEvent.HarvestDropsEvent event)
|
||||
{
|
||||
Block block = event.block;
|
||||
EntityPlayer player = event.harvester;
|
||||
Random random = new Random();
|
||||
|
||||
if (!event.world.isRemote && !event.isSilkTouching)
|
||||
if (GameRegistry.findItem(BloodArsenal.MODID, "glass_shard") != null)
|
||||
{
|
||||
if (player != null)
|
||||
Block block = event.block;
|
||||
EntityPlayer player = event.harvester;
|
||||
Random random = new Random();
|
||||
|
||||
if (player != null && player instanceof EntityPlayerMP)
|
||||
{
|
||||
if (block != null && block instanceof BlockGlass)
|
||||
if (!event.world.isRemote && !event.isSilkTouching)
|
||||
{
|
||||
if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint)
|
||||
if (block != null && block instanceof BlockGlass)
|
||||
{
|
||||
event.drops.add(new ItemStack(ModItems.glass_shard));
|
||||
if (random.nextInt() + 5 < 8)
|
||||
if (player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.flint)
|
||||
{
|
||||
event.drops.add(new ItemStack(ModItems.glass_shard));
|
||||
if (random.nextInt() + 5 < 8)
|
||||
{
|
||||
event.drops.add(new ItemStack(ModItems.glass_shard));
|
||||
}
|
||||
|
||||
event.dropChance = 0.25F;
|
||||
if (BloodArsenalConfig.isGlassDangerous && random.nextInt(5) > 3)
|
||||
{
|
||||
player.addPotionEffect(new PotionEffect(BloodArsenal.bleeding.id, 4 * 20, random.nextInt(2)));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (BloodArsenalConfig.isGlassDangerous && random.nextInt(3) == 2)
|
||||
{
|
||||
player.addPotionEffect(new PotionEffect(BloodArsenal.bleeding.id, 8 * 20, random.nextInt(3)));
|
||||
}
|
||||
}
|
||||
event.dropChance = 0.25F;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.arc.bloodarsenal.common.block;
|
||||
|
||||
import com.arc.bloodarsenal.common.entity.EntityBloodTNT;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -99,7 +100,7 @@ public class BlockBloodTNT extends BlockTNT
|
||||
@Override
|
||||
public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5, int par6, float par7, float par8, float par9)
|
||||
{
|
||||
if (par5.getCurrentEquippedItem() != null && par5.getCurrentEquippedItem().getItem() == Items.flint_and_steel)
|
||||
if (par5.getCurrentEquippedItem() != null && (par5.getCurrentEquippedItem().getItem() == Items.flint_and_steel || par5.getCurrentEquippedItem().getItem() == ModItems.bound_igniter))
|
||||
{
|
||||
spawnTNT(par1World, par2, par3, par4, 1, par5);
|
||||
par1World.setBlockToAir(par2, par3, par4);
|
||||
|
||||
@@ -1,7 +1,9 @@
|
||||
package com.arc.bloodarsenal.common.entity;
|
||||
|
||||
import com.arc.bloodarsenal.common.BloodArsenal;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.entity.monster.EntityZombie;
|
||||
import net.minecraft.entity.passive.EntityVillager;
|
||||
import net.minecraft.entity.passive.EntityWolf;
|
||||
@@ -10,55 +12,61 @@ import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class ModLivingDropsEvent
|
||||
{
|
||||
public static double rand;
|
||||
|
||||
@SubscribeEvent
|
||||
public void onEntityDrop(LivingDropsEvent event)
|
||||
{
|
||||
rand = Math.random();
|
||||
Random random = new Random();
|
||||
|
||||
if (event.source.getDamageType().equals("player"))
|
||||
if (GameRegistry.findItem(BloodArsenal.MODID, "heart") != null)
|
||||
{
|
||||
PotionEffect effect = event.entityLiving.getActivePotionEffect(Potion.weakness);
|
||||
|
||||
if (event.entityLiving instanceof EntityZombie)
|
||||
if (event.source.getDamageType().equals("player"))
|
||||
{
|
||||
if (effect != null)
|
||||
PotionEffect effect = event.entityLiving.getActivePotionEffect(Potion.weakness);
|
||||
|
||||
if (event.entityLiving instanceof EntityZombie)
|
||||
{
|
||||
if (rand < 0.01F)
|
||||
if (effect != null)
|
||||
{
|
||||
if (random.nextFloat() < 0.01F)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.heart, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityVillager)
|
||||
{
|
||||
if (effect != null)
|
||||
{
|
||||
if (random.nextFloat() < 0.25F)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.heart, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityPlayer)
|
||||
{
|
||||
if (effect != null)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.heart, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityVillager)
|
||||
{
|
||||
if (effect != null)
|
||||
{
|
||||
if (rand < 0.25F)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.heart, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityPlayer)
|
||||
{
|
||||
if (effect != null)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.heart, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (event.entityLiving instanceof EntityWolf)
|
||||
if (GameRegistry.findItem(BloodArsenal.MODID, "wolf_hide") != null)
|
||||
{
|
||||
if (rand < 0.4F)
|
||||
if (event.entityLiving instanceof EntityWolf)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.wolf_hide, 1);
|
||||
if (random.nextFloat() < 0.4F)
|
||||
{
|
||||
event.entityLiving.dropItem(ModItems.wolf_hide, 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import com.arc.bloodarsenal.common.items.sigil.*;
|
||||
import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding;
|
||||
import com.arc.bloodarsenal.common.items.tool.*;
|
||||
import com.arc.bloodarsenal.common.thaumcraft.*;
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemReed;
|
||||
@@ -163,15 +164,17 @@ public class ModItems
|
||||
bound_diamond_shard = registerItem(new ItemBoundDiamondShards(), "bound_diamond_shard");
|
||||
}
|
||||
|
||||
@Optional.Method(modid = "Baubles")
|
||||
public static void registerBaubles()
|
||||
{
|
||||
vampire_ring = registerItem(new VampireRing(), "vampire_ring");
|
||||
self_sacrifice_amulet = registerItem(new SelfSacrificeAmulet(), "self_sacrifice_amulet");
|
||||
sacrifice_amulet = registerItem(new SacrificeAmulet(), "sacrifice_amulet");
|
||||
empowered_sacrifice_amulet = registerItem(new EmpoweredSacrificeAmulet(), "empowered_self_sacrifice_amulet");
|
||||
empowered_self_sacrifice_amulet = registerItem(new EmpoweredSelfSacrificeAmulet(), "empowered_sacrifice_amulet");
|
||||
empowered_sacrifice_amulet = registerItem(new EmpoweredSacrificeAmulet(), "empowered_sacrifice_amulet");
|
||||
empowered_self_sacrifice_amulet = registerItem(new EmpoweredSelfSacrificeAmulet(), "empowered_self_sacrifice_amulet");
|
||||
}
|
||||
|
||||
@Optional.Method(modid = "Thaumcraft")
|
||||
public static void registerThaumcraftItems()
|
||||
{
|
||||
wandCore = (new ItemWandCores()).setUnlocalizedName("wand_cores");
|
||||
|
||||
@@ -3,11 +3,23 @@ package com.arc.bloodarsenal.common.items.book;
|
||||
import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe;
|
||||
import amerifrance.guideapi.api.GuideRegistry;
|
||||
import amerifrance.guideapi.api.abstraction.CategoryAbstract;
|
||||
import amerifrance.guideapi.api.abstraction.EntryAbstract;
|
||||
import amerifrance.guideapi.api.abstraction.IPage;
|
||||
import amerifrance.guideapi.api.base.Book;
|
||||
import amerifrance.guideapi.api.util.BookBuilder;
|
||||
import amerifrance.guideapi.api.util.PageHelper;
|
||||
import amerifrance.guideapi.categories.CategoryItemStack;
|
||||
import amerifrance.guideapi.entries.EntryUniText;
|
||||
import amerifrance.guideapi.pages.PageIRecipe;
|
||||
import amerifrance.guideapi.pages.PageUnlocImage;
|
||||
import com.arc.bloodarsenal.common.items.ModItems;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.IRecipe;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import java.util.ArrayList;
|
||||
@@ -16,15 +28,131 @@ import java.util.List;
|
||||
public class BloodBurnedTome
|
||||
{
|
||||
public static Book burnedTome;
|
||||
public static List<CategoryAbstract> categories = new ArrayList();
|
||||
public static List<CategoryAbstract> categories = new ArrayList<CategoryAbstract>();
|
||||
private final static String R_LOC = "BloodArsenal:book/images/";
|
||||
|
||||
public static void registerTome()
|
||||
{
|
||||
registerLifebringer();
|
||||
|
||||
BookBuilder bookBuilder = new BookBuilder();
|
||||
bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodArsenal.book.title").setUnlocWelcomeMessage("guide.bloodArsenal.book.welcomeMessage").setUnlocDisplayName("guide.bloodArsenal.book.name").setAuthor("An Arc Mage").setItemTexture("BloodArsenal:textures/items/burned_tome");
|
||||
bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodarsenal.book.title").setUnlocWelcomeMessage("guide.bloodarsenal.book.welcomeMessage").setUnlocDisplayName("guide.bloodarsenal.book.name").setAuthor("-An Arc Mage").setItemTexture("BloodArsenal:burned_tome");
|
||||
burnedTome = bookBuilder.build();
|
||||
GuideRegistry.registerBook(burnedTome);
|
||||
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(GuideRegistry.getItemStackForBook(burnedTome), ModItems.glass_shard, new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE)));
|
||||
GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(GuideRegistry.getItemStackForBook(burnedTome), ModItems.glass_shard, Items.writable_book, new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE)));
|
||||
RecipeHolder.init();
|
||||
}
|
||||
|
||||
private static void registerLifebringer()
|
||||
{
|
||||
List<EntryAbstract> lifeBringerEntries = new ArrayList<EntryAbstract>();
|
||||
|
||||
{
|
||||
//A Different Backstory
|
||||
ArrayList<IPage> backstoryPages = new ArrayList<IPage>();
|
||||
makePage(lifeBringerEntries, backstoryPages, "backstory");
|
||||
}
|
||||
|
||||
{
|
||||
//Glass Is Dangerous
|
||||
ArrayList<IPage> glass = new ArrayList<IPage>();
|
||||
makePage(lifeBringerEntries, glass, "glass");
|
||||
}
|
||||
|
||||
categories.add(new CategoryItemStack(lifeBringerEntries, "guide.bloodarsenal.category.lifeBringer", new ItemStack(ModItems.bound_bow)));
|
||||
}
|
||||
|
||||
private static void makePage(List<EntryAbstract> entries, ArrayList<IPage> pages, String name, Object... others)
|
||||
{
|
||||
pages.addAll(PageHelper.pagesForLongText(replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + name))));
|
||||
|
||||
if (others != null)
|
||||
{
|
||||
for (Object code : others)
|
||||
{
|
||||
if (code instanceof IPage)
|
||||
{
|
||||
pages.add((IPage) code);
|
||||
}
|
||||
|
||||
if (code instanceof Object[])
|
||||
{
|
||||
Object[] objects = (Object[]) code;
|
||||
for (Object object : objects)
|
||||
{
|
||||
pages.add((IPage) object);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
entries.add(new EntryUniText(pages, "guide.bloodarsenal.entryTitles." + name));
|
||||
}
|
||||
|
||||
private static Object[] s(String pageName)
|
||||
{
|
||||
if (pageName != null)
|
||||
{
|
||||
return PageHelper.pagesForLongText(replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.entry." + pageName))).toArray();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Object[] r(IRecipe... recipes)
|
||||
{
|
||||
if (recipes != null)
|
||||
{
|
||||
ArrayList<PageIRecipe> pageIRecipes = new ArrayList<PageIRecipe>();
|
||||
for (IRecipe recipe : recipes)
|
||||
{
|
||||
pageIRecipes.add(new PageIRecipe(recipe));
|
||||
}
|
||||
return pageIRecipes.toArray();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Object[] i(String... names)
|
||||
{
|
||||
if (names != null)
|
||||
{
|
||||
ArrayList<PageUnlocImage> images = new ArrayList<PageUnlocImage>();
|
||||
for (String name : names)
|
||||
{
|
||||
images.add(new PageUnlocImage(replaceColors(StatCollector.translateToLocal("guide.bloodarsenal.caption." + name)), new ResourceLocation(R_LOC + name + ".png"), true));
|
||||
}
|
||||
|
||||
return images.toArray();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
protected static String replaceColors(String text)
|
||||
{
|
||||
if (text != null)
|
||||
{
|
||||
return text.replace("@BLD@", EnumChatFormatting.BOLD.toString())
|
||||
.replace("@UND@", EnumChatFormatting.UNDERLINE.toString())
|
||||
.replace("@ITC@", EnumChatFormatting.ITALIC.toString())
|
||||
|
||||
.replace("@AQA@", EnumChatFormatting.AQUA.toString())
|
||||
.replace("@GLD@", EnumChatFormatting.GOLD.toString())
|
||||
.replace("@DRED@", EnumChatFormatting.DARK_RED.toString())
|
||||
.replace("@RED@", EnumChatFormatting.RED.toString())
|
||||
.replace("@LPRP@", EnumChatFormatting.LIGHT_PURPLE.toString())
|
||||
.replace("@PRP@", EnumChatFormatting.DARK_PURPLE.toString())
|
||||
.replace("@GRN@", EnumChatFormatting.GREEN.toString())
|
||||
.replace("@DGRN@", EnumChatFormatting.DARK_GREEN.toString())
|
||||
.replace("@BLU@", EnumChatFormatting.BLUE.toString())
|
||||
.replace("@DBLU@", EnumChatFormatting.DARK_BLUE.toString())
|
||||
.replace("@GRY@", EnumChatFormatting.GRAY.toString())
|
||||
.replace("@DGRY@", EnumChatFormatting.DARK_GRAY.toString())
|
||||
.replace("@RST@", EnumChatFormatting.RESET.toString())
|
||||
.replace("@END@", EnumChatFormatting.BLACK.toString());
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -13,9 +13,9 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import thaumcraft.api.ItemApi;
|
||||
import thaumcraft.api.wands.WandCap;
|
||||
import thaumcraft.api.wands.WandRod;
|
||||
import thaumcraft.common.config.ConfigItems;
|
||||
import thaumcraft.common.items.wands.ItemWandCasting;
|
||||
|
||||
import java.util.List;
|
||||
@@ -61,13 +61,13 @@ public class ItemWandCores extends Item
|
||||
}
|
||||
|
||||
ItemStack var5;
|
||||
var5 = new ItemStack(ConfigItems.itemWandCasting, 1, 84);
|
||||
((ItemWandCasting)var5.getItem()).setCap(var5, (WandCap)WandCap.caps.get("blood_iron"));
|
||||
((ItemWandCasting)var5.getItem()).setRod(var5, (WandRod) WandRod.rods.get("blood_wood"));
|
||||
var5 = ItemApi.getItem("itemWandCasting", 84);
|
||||
((ItemWandCasting) var5.getItem()).setCap(var5, WandCap.caps.get("blood_iron"));
|
||||
((ItemWandCasting)var5.getItem()).setRod(var5, WandRod.rods.get("blood_wood"));
|
||||
list.add(var5);
|
||||
var5 = new ItemStack(ConfigItems.itemWandCasting, 1, 168);
|
||||
((ItemWandCasting)var5.getItem()).setCap(var5, (WandCap)WandCap.caps.get("blood_iron"));
|
||||
((ItemWandCasting)var5.getItem()).setRod(var5, (WandRod)WandRod.rods.get("blood_wood_staff"));
|
||||
var5 = ItemApi.getItem("itemWandCasting", 168);
|
||||
((ItemWandCasting)var5.getItem()).setCap(var5, WandCap.caps.get("blood_iron"));
|
||||
((ItemWandCasting)var5.getItem()).setRod(var5, WandRod.rods.get("blood_wood_staff"));
|
||||
list.add(var5);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user