diff --git a/lib/BloodMagic-dev.jar b/lib/BloodMagic-dev.jar new file mode 100644 index 0000000..39e5ff9 Binary files /dev/null and b/lib/BloodMagic-dev.jar differ diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 05f396d..4364821 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.achievements.Achievements; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.Grinder; @@ -63,5 +64,6 @@ public class Avaritia { @EventHandler public void endGame(FMLPostInitializationEvent event){ Compat.compatify(); + Achievements.achieve(); } } \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/DamageSourceInfinitySword.java b/src/main/java/fox/spiteful/avaritia/DamageSourceInfinitySword.java new file mode 100644 index 0000000..60c07c0 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/DamageSourceInfinitySword.java @@ -0,0 +1,38 @@ +package fox.spiteful.avaritia; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.StatCollector; + +import java.util.Random; + +public class DamageSourceInfinitySword extends EntityDamageSource { + + private static final Random randy = new Random(); + + public DamageSourceInfinitySword(Entity source){ + super("infinity", source); + } + + public IChatComponent func_151519_b(EntityLivingBase p_151519_1_) + { + ItemStack itemstack = this.damageSourceEntity instanceof EntityLivingBase ? ((EntityLivingBase)this.damageSourceEntity).getHeldItem() : null; + String s = "death.attack.infinity"; + int rando = randy.nextInt(5); + if(rando != 0) + s = s + "." + rando; + return new ChatComponentTranslation(s, new Object[] {p_151519_1_.func_145748_c_(), this.damageSourceEntity.func_145748_c_()}); + } + + @Override + public boolean isDifficultyScaled() + { + return false; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 2d67810..af249c5 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -6,13 +6,18 @@ import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.logging.log4j.Level; @@ -95,4 +100,29 @@ public class LudicrousEvents { } } + @SubscribeEvent + public void onGetHurt(LivingHurtEvent event){ + if(!(event.entityLiving instanceof EntityPlayer)) + return; + EntityPlayer player = (EntityPlayer)event.entityLiving; + if(player.getHeldItem() != null && player.getHeldItem().getItem() == LudicrousItems.infinity_sword && player.isUsingItem()) + event.setCanceled(true); + } + + @SubscribeEvent + public void onLivingDrops(LivingDropsEvent event) { + if(event.recentlyHit && event.entityLiving instanceof EntitySkeleton && event.source.getEntity() instanceof EntityPlayer){ + EntityPlayer player = (EntityPlayer)event.source.getEntity(); + if(player.getHeldItem() != null && player.getHeldItem().getItem() == LudicrousItems.skull_sword){ + addDrop(event, new ItemStack(Items.skull, 1, 1)); + } + } + } + + private void addDrop(LivingDropsEvent event, ItemStack drop) { + EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, drop); + entityitem.delayBeforeCanPickup = 10; + event.drops.add(entityitem); + } + } diff --git a/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java b/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java new file mode 100644 index 0000000..01f3825 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/achievements/AchievementTrigger.java @@ -0,0 +1,53 @@ +package fox.spiteful.avaritia.achievements; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; +import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class AchievementTrigger { + + /*@SubscribeEvent + public void onItemPickedUp(PlayerEvent.ItemPickupEvent event) { + ItemStack stack = event.pickedUp.getEntityItem(); + + }*/ + + @SubscribeEvent + public void onItemCrafted(PlayerEvent.ItemCraftedEvent event) { + if(event.crafting != null){ + + if(event.crafting.getItem() == LudicrousItems.resource){ + switch(event.crafting.getItemDamage()){ + case 1: + event.player.addStat(Achievements.crystal_matrix, 1); + return; + case 4: + event.player.addStat(Achievements.neutronium, 1); + return; + case 5: + event.player.addStat(Achievements.catalyst, 1); + return; + case 6: + event.player.addStat(Achievements.infinity, 1); + return; + } + } + else if(event.crafting.getItem() == Item.getItemFromBlock(LudicrousBlocks.dire_crafting)){ + event.player.addStat(Achievements.dire_crafting, 1); + } + else if(event.crafting.getItem() == Item.getItemFromBlock(LudicrousBlocks.neutron_collector)){ + event.player.addStat(Achievements.collector, 1); + } + else if(event.crafting.getItem() == LudicrousItems.singularity){ + event.player.addStat(Achievements.singularity, 1); + } + else if(Compat.blood && event.crafting.getItem() == LudicrousItems.armok_orb){ + event.player.addStat(Achievements.armok, 1); + } + } + } +} diff --git a/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java new file mode 100644 index 0000000..bf30ffc --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/achievements/Achievements.java @@ -0,0 +1,41 @@ +package fox.spiteful.avaritia.achievements; + +import cpw.mods.fml.common.FMLCommonHandler; +import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraftforge.common.AchievementPage; + +public class Achievements { + + public static AchievementPage page; + + public static Achievement crystal_matrix; + public static Achievement dire_crafting; + public static Achievement collector; + public static Achievement neutronium; + public static Achievement singularity; + public static Achievement catalyst; + public static Achievement infinity; + public static Achievement armok; + + public static void achieve(){ + crystal_matrix = new LudicrousAchievement("crystal_matrix", 0, 0, new ItemStack(LudicrousItems.resource, 1, 1), null); + dire_crafting = new LudicrousAchievement("dire_crafting", 1, 1, new ItemStack(LudicrousBlocks.dire_crafting), crystal_matrix); + collector = new LudicrousAchievement("collector", 2, 2, new ItemStack(LudicrousBlocks.neutron_collector), dire_crafting); + neutronium = new LudicrousAchievement("neutronium", 4, 1, new ItemStack(LudicrousItems.resource, 1, 4), collector); + singularity = new LudicrousAchievement("singularity", 6, 3, new ItemStack(LudicrousItems.singularity, 1, 0), neutronium); + catalyst = new LudicrousAchievement("catalyst", 6, -3, new ItemStack(LudicrousItems.resource, 1, 5), singularity).setSpecial(); + infinity = new LudicrousAchievement("infinity", 4, -6, new ItemStack(LudicrousItems.resource, 1, 6), neutronium).setSpecial(); + + if(Compat.blood) + armok = new LudicrousAchievement("armok", 2, -5, LudicrousItems.armok_orb, infinity); + + page = new AchievementPage("Avaritia", LudicrousAchievement.achievements.toArray(new Achievement[LudicrousAchievement.achievements.size()])); + AchievementPage.registerAchievementPage(page); + + FMLCommonHandler.instance().bus().register(new AchievementTrigger()); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/achievements/LudicrousAchievement.java b/src/main/java/fox/spiteful/avaritia/achievements/LudicrousAchievement.java new file mode 100644 index 0000000..3b4623f --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/achievements/LudicrousAchievement.java @@ -0,0 +1,28 @@ +package fox.spiteful.avaritia.achievements; + +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; + +import java.util.ArrayList; +import java.util.List; + +public class LudicrousAchievement extends Achievement { + + public static List achievements = new ArrayList(); + + public LudicrousAchievement(String name, int x, int y, ItemStack icon, Achievement parent) { + super("achievement.avaritia:" + name, "avaritia:" + name, x, y, icon, parent); + achievements.add(this); + registerStat(); + } + + public LudicrousAchievement(String name, int x, int y, Item icon, Achievement parent) { + this(name, x, y, new ItemStack(icon), parent); + } + + public LudicrousAchievement(String name, int x, int y, Block icon, Achievement parent) { + this(name, x, y, new ItemStack(icon), parent); + } +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index c74a092..b47c63c 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -3,7 +3,9 @@ package fox.spiteful.avaritia.compat; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.Lumberjack; +import fox.spiteful.avaritia.compat.bloodmagic.Bloody; import fox.spiteful.avaritia.compat.botania.Tsundere; +import fox.spiteful.avaritia.compat.thaumcraft.Lucrum; import fox.spiteful.avaritia.crafting.Grinder; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -54,7 +56,7 @@ public class Compat { api.getMethod("registerRecipeHandler", Class.forName("codechicken.nei.recipe.ICraftingHandler")).invoke(null, handler2.newInstance()); api.getMethod("registerUsageHandler", Class.forName("codechicken.nei.recipe.IUsageHandler")).invoke(null, handler2.newInstance()); } - catch(Exception e) + catch(Throwable e) { e.printStackTrace(); } @@ -78,7 +80,7 @@ public class Compat { ItemStack galg = new ItemStack(resource, 1, 2); Grinder.catalyst.recipeItems.add(galg); } - catch(Exception e){ + catch(Throwable e){ Lumberjack.log(Level.INFO, "Avaritia died of old age while trying to craft the Galgadorian Drill."); e.printStackTrace(); sc2 = false; @@ -93,7 +95,7 @@ public class Compat { Grinder.catalyst.recipeItems.add(cell); Grinder.catalyst.recipeItems.add(singularity); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia couldn't figure out how channels work."); e.printStackTrace(); ae2 = false; @@ -109,7 +111,7 @@ public class Compat { Grinder.catalyst.recipeItems.add(bed); Grinder.catalyst.recipeItems.add(unstable); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia was unable to stop Lavos."); e.printStackTrace(); exu = false; @@ -124,7 +126,7 @@ public class Compat { ItemStack osmir = new ItemStack(resource, 1, 8682); Grinder.catalyst.recipeItems.add(osmir); } - catch(Exception e){ + catch(Throwable e){ Lumberjack.log(Level.INFO, "Avaritia got sick of only getting 2 planks per log."); e.printStackTrace(); gt = false; @@ -137,7 +139,7 @@ public class Compat { Grinder.catalyst.recipeItems.add(plate); } } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia blew up the macerator."); e.printStackTrace(); ic2 = false; @@ -148,7 +150,7 @@ public class Compat { try { Tsundere.baka(); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia is wondering where all the dayblooms went."); e.printStackTrace(); botan = false; @@ -157,11 +159,9 @@ public class Compat { if(blood){ try { - Block crystal = getBlock("AWWayofTime", "blockCrystal"); - ItemStack cluster = new ItemStack(crystal, 1, 0); - Grinder.catalyst.recipeItems.add(cluster); + Bloody.bloodlett(); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia decided to use a Fallen Kanade instead."); e.printStackTrace(); blood = false; @@ -174,7 +174,7 @@ public class Compat { ItemStack lol = new ItemStack(dargon, 1, 0); Grinder.catalyst.recipeItems.add(lol); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia was distracted by a giant glowing sphere."); e.printStackTrace(); lolDargon = false; @@ -187,7 +187,7 @@ public class Compat { ItemStack ludicrite = new ItemStack(ingot, 1, 8); Grinder.catalyst.recipeItems.add(ludicrite); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia decided it just didn't need all that RF."); e.printStackTrace(); bigReactors = false; @@ -200,7 +200,7 @@ public class Compat { ItemStack menomena = new ItemStack(metal, 1, 2); Grinder.catalyst.recipeItems.add(menomena); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia fell in the smeltery."); e.printStackTrace(); ticon = false; @@ -213,7 +213,7 @@ public class Compat { ItemStack red = new ItemStack(matter, 1, 1); Grinder.catalyst.recipeItems.add(red); } - catch (Exception e){ + catch (Throwable e){ Lumberjack.log(Level.INFO, "Avaritia got tired of abusing the blaze rod exploit."); e.printStackTrace(); pe = false; diff --git a/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java deleted file mode 100644 index c997313..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/Lucrum.java +++ /dev/null @@ -1,24 +0,0 @@ -package fox.spiteful.avaritia.compat; - -import fox.spiteful.avaritia.blocks.LudicrousBlocks; -import fox.spiteful.avaritia.items.LudicrousItems; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class Lucrum { - - public static Aspect ULTRA_DEATH; - - public static void abracadabra(){ - ULTRA_DEATH = new Aspect("terminus", 0xb90000, new Aspect[] { Aspect.GREED, Aspect.ELDRITCH }, new ResourceLocation("avaritia", "textures/misc/terminus.png"), 771); - - ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 1), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.ENERGY, 8).add(Aspect.CRYSTAL, 32)); - ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 4), new AspectList().add(ULTRA_DEATH, 2).add(Aspect.METAL, 12).add(Aspect.ENERGY, 12)); - ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousBlocks.neutron_collector, 1, OreDictionary.WILDCARD_VALUE), new AspectList().add(ULTRA_DEATH, 5).add(Aspect.METAL, 64).add(Aspect.ENERGY, 64).add(Aspect.MECHANISM, 64)); - } - -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java new file mode 100644 index 0000000..de7b488 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/Bloody.java @@ -0,0 +1,38 @@ +package fox.spiteful.avaritia.compat.bloodmagic; + +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.compat.Compat; +import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; +import fox.spiteful.avaritia.crafting.Grinder; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class Bloody { + + public static void bloodlett() throws Compat.ItemNotFoundException { + Block crystal = Compat.getBlock("AWWayofTime", "blockCrystal"); + ItemStack cluster = new ItemStack(crystal, 1, 0); + Grinder.catalyst.recipeItems.add(cluster); + + LudicrousItems.armok_orb = new ItemOrbArmok(); + GameRegistry.registerItem(LudicrousItems.armok_orb, "Orb_Armok"); + + Item transorb = Compat.getItem("AWWayofTime", "transcendentBloodOrb"); + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.armok_orb, 1), new Object[]{ + " III ", + " IOIOI ", + " IIXII ", + " NIOIOIN ", + "NNNIIINNN", + " NNNNNNN ", + " NNN ", + 'I', new ItemStack(LudicrousItems.resource, 1, 6), + 'X', new ItemStack(LudicrousItems.resource, 1, 5), + 'N', new ItemStack(LudicrousItems.resource, 1, 4), + 'O', new ItemStack(transorb) + }); + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java new file mode 100644 index 0000000..af74dd3 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java @@ -0,0 +1,91 @@ +package fox.spiteful.avaritia.compat.bloodmagic; + +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +public class ItemOrbArmok extends Item implements IBloodOrb, IBindable { + + public ItemOrbArmok(){ + setMaxStackSize(1); + this.setUnlocalizedName("orb_armok"); + this.setTextureName("avaritia:orb_armok"); + setCreativeTab(Avaritia.tab); + AltarRecipeRegistry.registerAltarOrbRecipe(new ItemStack(this), 1, 140); + } + + @Override + public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer player) { + if (!world.isRemote) + SoulNetworkHandler.checkAndSetItemOwner(itemstack, player); + + return itemstack; + } + + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) { + if(!world.isRemote && entity instanceof EntityPlayer){ + NBTTagCompound itemTag = stack.stackTagCompound; + if (itemTag == null || itemTag.getString("ownerName").equals("")) + return; + + SoulNetworkHandler.setCurrentEssence(itemTag.getString("ownerName"), getMaxEssence()); + } + } + + @Override + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) + { + tooltip.add(StatCollector.translateToLocal("tooltip.armok.desc")); + if (item.getTagCompound() != null) + { + tooltip.add(StatCollector.translateToLocal("tooltip.owner.currentowner") + " " + item.getTagCompound().getString("ownerName")); + } + } + + @Override + public int getMaxEssence() { + return 1000000000; + } + + @Override + public int getOrbLevel() { + return 6; + } + + @Override + public EnumRarity getRarity(ItemStack itemstack) { + return LudicrousItems.cosmic; + } + @Override + public boolean hasContainerItem() + { + return true; + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + { + return false; + } + + @Override + public ItemStack getContainerItem(ItemStack itemStack) + { + return itemStack; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java index eb926f8..da5a461 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java @@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import java.util.ArrayList; +import java.util.List; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -106,4 +107,5 @@ public class BlockInfinitato extends BlockContainer implements ILexiconable { public LexiconEntry getEntry(World world, int x, int y, int z, EntityPlayer player, ItemStack lexicon) { return lexiconEntry; } + } diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemAkashicRecord.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemAkashicRecord.java new file mode 100644 index 0000000..c711259 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemAkashicRecord.java @@ -0,0 +1,37 @@ +package fox.spiteful.avaritia.compat.thaumcraft; + +import fox.spiteful.avaritia.Avaritia; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.Thaumcraft; +import thaumcraft.common.lib.network.PacketHandler; +import thaumcraft.common.lib.network.playerdata.PacketAspectPool; + +public class ItemAkashicRecord extends Item { + + public ItemAkashicRecord(){ + setUnlocalizedName("akashic_record"); + setTextureName("avaritia:akashic_record"); + setCreativeTab(Avaritia.tab); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(world.isRemote) + return stack; + + for(Aspect aspect : Aspect.aspects.values()) { + Thaumcraft.proxy.playerKnowledge.addAspectPool(player.getCommandSenderName(), aspect, (short) 999); + PacketHandler.INSTANCE.sendTo(new PacketAspectPool(aspect.getTag(), (short)999, Short.valueOf(Thaumcraft.proxy.playerKnowledge.getAspectPoolFor(player.getCommandSenderName(), aspect))), (EntityPlayerMP) player); + } + if(--stack.stackSize <= 0) + return null; + else + return stack; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java new file mode 100644 index 0000000..c3d9ff0 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java @@ -0,0 +1,42 @@ +package fox.spiteful.avaritia.compat.thaumcraft; + +import cpw.mods.fml.common.registry.GameRegistry; +import fox.spiteful.avaritia.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.OreDictionary; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; + +public class Lucrum { + + public static Aspect ULTRA_DEATH; + + public static void abracadabra(){ + ULTRA_DEATH = new Aspect("terminus", 0xb90000, new Aspect[] { Aspect.GREED, Aspect.ELDRITCH }, new ResourceLocation("avaritia", "textures/misc/terminus.png"), 771); + + LudicrousItems.akashic_record = new ItemAkashicRecord(); + GameRegistry.registerItem(LudicrousItems.akashic_record, "Akashic_Record"); + + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 1), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.ENERGY, 8).add(Aspect.CRYSTAL, 32)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 4), new AspectList().add(ULTRA_DEATH, 2).add(Aspect.METAL, 12).add(Aspect.ENERGY, 12)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 5), new AspectList().add(ULTRA_DEATH, 5).add(Aspect.EXCHANGE, 12)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 6), new AspectList().add(ULTRA_DEATH, 16).add(Aspect.ELDRITCH, 64)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousBlocks.neutron_collector, 1, OreDictionary.WILDCARD_VALUE), new AspectList().add(ULTRA_DEATH, 5).add(Aspect.METAL, 64).add(Aspect.ENERGY, 64).add(Aspect.MECHANISM, 64)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 0), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 1), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100).add(Aspect.GREED, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 2), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.SENSES, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 3), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.MECHANISM, 100).add(Aspect.ENERGY, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 4), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.CRYSTAL, 100).add(Aspect.ORDER, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 5), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 6), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 7), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.singularity, 1, 8), new AspectList().add(ULTRA_DEATH, 3).add(Aspect.METAL, 100)); + ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.infinity_sword), new AspectList().add(ULTRA_DEATH, 60).add(Aspect.WEAPON, 999).add(Aspect.DEATH, 999).add(Aspect.ELDRITCH, 100)); + ThaumcraftApi.registerComplexObjectTag(new ItemStack(LudicrousItems.skull_sword), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.FIRE, 2).add(Aspect.CRYSTAL, 16).add(Aspect.DEATH, 4)); + + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java index 5658809..19296a4 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/ExtremeCraftingManager.java @@ -102,6 +102,12 @@ public class ExtremeCraftingManager { return shapedrecipes; } + public ExtremeShapedOreRecipe addExtremeShapedOreRecipe(ItemStack result, Object[] recipe){ + ExtremeShapedOreRecipe craft = new ExtremeShapedOreRecipe(result, recipe); + recipes.add(craft); + return craft; + } + public ExtremeShapedRecipe addSingularityRecipe(ItemStack result, ItemStack single){ return addRecipe(result, new Object[]{ "IIIIIIIII", diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 64ffe71..dc1b7da 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -91,11 +91,28 @@ public class Grinder { 'C', new ItemStack(LudicrousItems.resource, 1, 1), 'N', new ItemStack(LudicrousItems.resource, 1, 4)}); + ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe(new ItemStack(LudicrousItems.skull_sword), new Object[]{ + " IX", + " IXI", + " IXI ", + " IXI ", + " B IXI ", + " BXI ", + " WB ", + " W B ", + "D ", + 'I', new ItemStack(LudicrousItems.resource, 1, 1), + 'X', new ItemStack(Items.blaze_powder), + 'B', new ItemStack(Items.bone), + 'D', new ItemStack(Items.nether_star), + 'W', "logWood"}); + ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 0), new ItemStack(Blocks.iron_block, 1)); ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 1), new ItemStack(Blocks.gold_block, 1)); ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 2), new ItemStack(Blocks.lapis_block, 1)); ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 3), new ItemStack(Blocks.redstone_block, 1)); ExtremeCraftingManager.getInstance().addSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 4), new ItemStack(Blocks.quartz_block, 1)); + if(!OreDictionary.getOres("blockCopper").isEmpty()){ ExtremeCraftingManager.getInstance().addOreSingularityRecipe(new ItemStack(LudicrousItems.singularity, 1, 5), "blockCopper"); catalyst.recipeItems.add(new ItemStack(LudicrousItems.singularity, 1, 5)); diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index c0af6e3..2201c07 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia.items; import fox.spiteful.avaritia.Avaritia; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,6 +11,7 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.StatCollector; import java.util.List; @@ -43,6 +45,22 @@ public class ItemResource extends Item { halo[1] = ir.registerIcon("avaritia:halonoise"); } + @Override + public void addInformation(ItemStack item, EntityPlayer player, List tooltip, boolean wut) { + + switch(item.getItemDamage()) { + case 1: + tooltip.add(StatCollector.translateToLocal("tooltip.crystal_matrix.desc")); + break; + case 2: + tooltip.add(StatCollector.translateToLocal("tooltip.neutron_pile.desc")); + break; + case 4: + tooltip.add(StatCollector.translateToLocal("tooltip.neutronium.desc")); + break; + } + } + @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int dam) { return this.icons[dam % icons.length]; diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index 92ec958..03ac564 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.items.tools.ItemPickaxeInfinity; import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; +import fox.spiteful.avaritia.items.tools.ItemSwordSkulls; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.util.EnumChatFormatting; @@ -16,6 +17,10 @@ public class LudicrousItems { public static Item singularity; public static Item infinity_pickaxe; public static Item infinity_sword; + public static Item skull_sword; + + public static Item akashic_record; + public static Item armok_orb; public static EnumRarity cosmic = EnumHelper.addRarity("COSMIC", EnumChatFormatting.DARK_RED, "Cosmic"); @@ -28,5 +33,7 @@ public class LudicrousItems { GameRegistry.registerItem(infinity_pickaxe, "Infinity_Pickaxe"); infinity_sword = new ItemSwordInfinity(); GameRegistry.registerItem(infinity_sword, "Infinity_Sword"); + skull_sword = new ItemSwordSkulls(); + GameRegistry.registerItem(skull_sword, "Skull_Sword"); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java index cd23104..9660af1 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java @@ -1,16 +1,13 @@ package fox.spiteful.avaritia.items.tools; -import com.google.common.collect.Multimap; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.DamageSourceInfinitySword; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.ICosmicRenderItem; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -18,35 +15,26 @@ import net.minecraft.item.ItemSword; import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.EnumHelper; public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem { private static final ToolMaterial opSword = EnumHelper.addToolMaterial("INFINITY_SWORD", 32, 9999, 9999F, -3.0F, 200); private IIcon cosmicMask; - + public ItemSwordInfinity(){ super(opSword); setUnlocalizedName("infinity_sword"); - //setTextureName("avaritia:infinity_sword"); - setTextureName("minecraft:diamond_sword"); + setTextureName("avaritia:infinity_sword_clean"); setCreativeTab(Avaritia.tab); } - /*public Multimap getItemAttributeModifiers() - { - Multimap multimap = super.getItemAttributeModifiers(); - multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)this.field_150934_a, 0)); - return multimap; - }*/ - @Override public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase player) { if(player.worldObj.isRemote) return true; - victim.func_110142_aN().func_94547_a(new EntityDamageSource("infinity", player), victim.getHealth(), victim.getHealth()); + victim.func_110142_aN().func_94547_a(new DamageSourceInfinitySword(player), victim.getHealth(), victim.getHealth()); victim.setHealth(0); victim.onDeath(new EntityDamageSource("infinity", player)); return true; @@ -63,16 +51,16 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem { super.setDamage(stack, 0); } - @Override - public IIcon getMaskTexture(ItemStack stack) { - return cosmicMask; - } - - @SideOnly(Side.CLIENT) - @Override + @Override + public IIcon getMaskTexture(ItemStack stack) { + return cosmicMask; + } + + @SideOnly(Side.CLIENT) + @Override public void registerIcons(IIconRegister ir) { - super.registerIcons(ir); - - this.cosmicMask = ir.registerIcon("avaritia:infinity_sword_mask"); - } + super.registerIcons(ir); + + this.cosmicMask = ir.registerIcon("avaritia:infinity_sword_mask"); + } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordSkulls.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordSkulls.java new file mode 100644 index 0000000..fb249bf --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordSkulls.java @@ -0,0 +1,24 @@ +package fox.spiteful.avaritia.items.tools; + +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; + +public class ItemSwordSkulls extends ItemSword { + + public ItemSwordSkulls(){ + super(ToolMaterial.EMERALD); + setUnlocalizedName("skullfire_sword"); + setTextureName("avaritia:skull_sword"); + setCreativeTab(Avaritia.tab); + } + + @Override + public EnumRarity getRarity(ItemStack stack) + { + return EnumRarity.epic; + } +} diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 72f06a9..95657be 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -18,6 +18,9 @@ item.singularity_lead.name=Leaden Singularity item.singularity_silver.name=Silver Singularity item.infinity_pickaxe.name=Infinity Pickaxe item.infinity_sword.name=Infinity Sword +item.skullfire_sword.name=Skullfire Sword +item.akashic_record.name=Akashic Records +item.orb_armok.name=Blood Orb of Armok # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -30,6 +33,30 @@ tile.dire_crafting.name=Dire Crafting Table tile.neutron_collector.name=Neutron Collector tile.infinitato.name=Infinitato # +# Tooltips +tooltip.armok.desc=Stores unlimited Life Essence while held +tooltip.crystal_matrix.desc=This isn't even its final form. +tooltip.neutron_pile.desc=Try not to think about it. +tooltip.neutronium.desc=The dense heart of a star in convenient ingot form. +# +# Achievements +achievement.avaritia:crystal_matrix=The Beginning of the End +achievement.avaritia:crystal_matrix.desc=Create your first Crystal Matrix Ingot +achievement.avaritia:dire_crafting=HELLO, EVERYONE! +achievement.avaritia:dire_crafting.desc=Use a regular Crafting Table to craft a Dire Crafting Table +achievement.avaritia:collector=Now We Play The Waiting Game +achievement.avaritia:collector.desc=Create your first Neutron Collector and get ready to chunkload +achievement.avaritia:neutronium=Waiting Game Sucks +achievement.avaritia:neutronium.desc=Create the first of many Neutronium Ingots +achievement.avaritia:singularity=Event Horizon +achievement.avaritia:singularity.desc=Craft your first Singularity +achievement.avaritia:catalyst=All The Kitchen Sinks +achievement.avaritia:catalyst.desc=Craft your first Infinity Catalyst +achievement.avaritia:infinity=INFINITE POWER! +achievement.avaritia:infinity.desc=Craft your first Infinity Ingot +achievement.avaritia:armok=☺♦ +achievement.avaritia:armok.desc=Craft the Blood Orb of Armok +# # Misc itemGroup.avaritia=Avaritia container.neutron_collector=Neutron Collector @@ -39,6 +66,10 @@ crafting.extreme.shapeless=Xtreme Shapeless plus.infinity=+Infinity death.attack.infinity=%1$s was sliced to ribbons by %2$s death.attack.infinity.item=%1$s was sliced to ribbons by %2$s +death.attack.infinity.1=%1$s was obliterated by %2$s +death.attack.infinity.2=%1$s was excised from existence by %2$s +death.attack.infinity.3=%1$s was overkilled by %2$s +death.attack.infinity.4=%1$s was annihilated by %2$s # # Botania avaritia.flower.asgardandelion.name=Asgardandelion diff --git a/src/main/resources/assets/avaritia/textures/items/akashic_record.png b/src/main/resources/assets/avaritia/textures/items/akashic_record.png new file mode 100644 index 0000000..eed417f Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/akashic_record.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/orb_armok.png b/src/main/resources/assets/avaritia/textures/items/orb_armok.png new file mode 100644 index 0000000..a80b832 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/orb_armok.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/orb_armok.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/orb_armok.png.mcmeta new file mode 100644 index 0000000..8e55e43 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/orb_armok.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/orb_armok_clean.png b/src/main/resources/assets/avaritia/textures/items/orb_armok_clean.png new file mode 100644 index 0000000..3d9942b Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/orb_armok_clean.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/skull_sword.png b/src/main/resources/assets/avaritia/textures/items/skull_sword.png new file mode 100644 index 0000000..75bc95d Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/skull_sword.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/skull_sword.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/skull_sword.png.mcmeta new file mode 100644 index 0000000..24f9c2f --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/skull_sword.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 1 + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/skull_sword_clean.png b/src/main/resources/assets/avaritia/textures/items/skull_sword_clean.png new file mode 100644 index 0000000..f49d388 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/skull_sword_clean.png differ