diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index 9e37561..05f396d 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -8,11 +8,17 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; 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.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.gui.GooeyHandler; import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @Mod(modid = "Avaritia", name = "Avaritia", dependencies = "after:Thaumcraft;after:AWWayofTime;after:Botania") @@ -23,6 +29,21 @@ public class Avaritia { @SidedProxy(serverSide = "fox.spiteful.avaritia.CommonProxy", clientSide = "fox.spiteful.avaritia.ClientProxy") public static CommonProxy proxy; + public static CreativeTabs tab = new CreativeTabs("avaritia"){ + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem(){ + return LudicrousItems.resource; + } + + @Override + @SideOnly(Side.CLIENT) + public int func_151243_f() + { + return 5; + } + }; + @EventHandler public void earlyGame(FMLPreInitializationEvent event){ instance = this; diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 86fec37..2d67810 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import fox.spiteful.avaritia.items.LudicrousItems; +import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; @@ -10,7 +11,9 @@ 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.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.apache.logging.log4j.Level; @@ -79,4 +82,17 @@ public class LudicrousEvents { world.spawnEntityInWorld(entityitem); } + @SubscribeEvent + public void onTooltip(ItemTooltipEvent event) { + if (event.itemStack.getItem() instanceof ItemSwordInfinity) { + for(int x = 0;x < event.toolTip.size();x++){ + if(event.toolTip.get(x).contains(StatCollector.translateToLocal("attribute.name.generic.attackDamage")) + || event.toolTip.get(x).contains(StatCollector.translateToLocal("Attack Damage"))){ + event.toolTip.set(x, StatCollector.translateToLocal("plus.infinity") + StatCollector.translateToLocal("attribute.name.generic.attackDamage")); + return; + } + } + } + } + } diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java index f20dc4e..b3d160f 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockCrystalMatrix.java @@ -1,5 +1,6 @@ package fox.spiteful.avaritia.blocks; +import fox.spiteful.avaritia.Avaritia; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; @@ -14,6 +15,7 @@ public class BlockCrystalMatrix extends Block { setBlockName("block_crystal_matrix"); setHarvestLevel("pickaxe", 3); setBlockTextureName("avaritia:block_crystal_matrix"); + setCreativeTab(Avaritia.tab); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java index 5012f32..7871c9d 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockDireCrafting.java @@ -20,6 +20,7 @@ public class BlockDireCrafting extends Block { setResistance(2000.0F); setBlockName("dire_crafting"); setHarvestLevel("pickaxe", 3); + setCreativeTab(Avaritia.tab); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockDoubleCraft.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockDoubleCraft.java index d672dea..fb48207 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockDoubleCraft.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockDoubleCraft.java @@ -16,6 +16,7 @@ public class BlockDoubleCraft extends Block { setBlockName("compressed_workbench"); setStepSound(Block.soundTypeWood); setBlockTextureName("avaritia:double_craft"); + setCreativeTab(Avaritia.tab); } diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java index 5bfb60e..fd933bc 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockNeutronCollector.java @@ -33,6 +33,7 @@ public class BlockNeutronCollector extends BlockContainer { setHardness(20.0F); setBlockName("neutron_collector"); setHarvestLevel("pickaxe", 3); + setCreativeTab(Avaritia.tab); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java index bf8db47..c296128 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockResource.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,7 +17,7 @@ import java.util.List; public class BlockResource extends Block { - public static final String[] types = new String[]{"neutronium", "infinity", "gaia"}; + public static final String[] types = new String[]{"neutronium", "infinity"}; private IIcon[] icons; public BlockResource(){ @@ -26,6 +27,7 @@ public class BlockResource extends Block { setResistance(2000.0F); setBlockName("avaritia_resource"); setHarvestLevel("pickaxe", 3); + setCreativeTab(Avaritia.tab); } /** diff --git a/src/main/java/fox/spiteful/avaritia/blocks/BlockTripleCraft.java b/src/main/java/fox/spiteful/avaritia/blocks/BlockTripleCraft.java index 01c8214..25b270d 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/BlockTripleCraft.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/BlockTripleCraft.java @@ -16,6 +16,7 @@ public class BlockTripleCraft extends Block { setBlockName("very_compressed_workbench"); setStepSound(Block.soundTypeWood); setBlockTextureName("avaritia:triple_craft"); + setCreativeTab(Avaritia.tab); } diff --git a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java index 745c9a5..a06719c 100644 --- a/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java +++ b/src/main/java/fox/spiteful/avaritia/blocks/LudicrousBlocks.java @@ -13,6 +13,8 @@ public class LudicrousBlocks { public static Block dire_crafting; public static Block neutron_collector; + public static Block infinitato; + public static void voxelize(){ double_craft = GameRegistry.registerBlock(new BlockDoubleCraft(), "Double_Craft"); triple_craft = GameRegistry.registerBlock(new BlockTripleCraft(), "Triple_Craft"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Compat.java b/src/main/java/fox/spiteful/avaritia/compat/Compat.java index 3e53215..c74a092 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Compat.java +++ b/src/main/java/fox/spiteful/avaritia/compat/Compat.java @@ -3,7 +3,7 @@ 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.blocks.LudicrousBlocks; +import fox.spiteful.avaritia.compat.botania.Tsundere; import fox.spiteful.avaritia.crafting.Grinder; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -24,6 +24,7 @@ public class Compat { public static boolean lolDargon = false; public static boolean bigReactors = false; public static boolean ticon = false; + public static boolean pe = false; public static void census(){ nei = Loader.isModLoaded("NotEnoughItems"); @@ -38,6 +39,7 @@ public class Compat { lolDargon = Loader.isModLoaded("DraconicEvolution"); bigReactors = Loader.isModLoaded("BigReactors"); ticon = Loader.isModLoaded("TConstruct"); + pe = Loader.isModLoaded("ProjectE"); } public static void compatify(){ @@ -186,9 +188,9 @@ public class Compat { Grinder.catalyst.recipeItems.add(ludicrite); } catch (Exception e){ - Lumberjack.log(Level.INFO, "Avaritia was distracted by a giant glowing sphere."); + Lumberjack.log(Level.INFO, "Avaritia decided it just didn't need all that RF."); e.printStackTrace(); - lolDargon = false; + bigReactors = false; } } @@ -201,7 +203,20 @@ public class Compat { catch (Exception e){ Lumberjack.log(Level.INFO, "Avaritia fell in the smeltery."); e.printStackTrace(); - lolDargon = false; + ticon = false; + } + } + + if(pe){ + try { + Item matter = getItem("ProjectE", "item.pe_matter"); + ItemStack red = new ItemStack(matter, 1, 1); + Grinder.catalyst.recipeItems.add(red); + } + catch (Exception 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/CompatClient.java b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java index af2f64d..8735263 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java +++ b/src/main/java/fox/spiteful/avaritia/compat/CompatClient.java @@ -2,9 +2,9 @@ package fox.spiteful.avaritia.compat; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import fox.spiteful.avaritia.compat.tsundere.RenderInfinitato; -import fox.spiteful.avaritia.compat.tsundere.RenderTileInfinitato; -import fox.spiteful.avaritia.compat.tsundere.TileInfinitato; +import fox.spiteful.avaritia.compat.botania.RenderInfinitato; +import fox.spiteful.avaritia.compat.botania.RenderTileInfinitato; +import fox.spiteful.avaritia.compat.botania.TileInfinitato; public class CompatClient { diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java similarity index 98% rename from src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java index af1cc54..eb926f8 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/tsundere/BlockInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/BlockInfinitato.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat.tsundere; +package fox.spiteful.avaritia.compat.botania; import net.minecraft.block.BlockContainer; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/fox/spiteful/avaritia/compat/LudicrousLexicon.java b/src/main/java/fox/spiteful/avaritia/compat/botania/LudicrousLexicon.java similarity index 93% rename from src/main/java/fox/spiteful/avaritia/compat/LudicrousLexicon.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/LudicrousLexicon.java index a4ab7cc..992ac6f 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/LudicrousLexicon.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/LudicrousLexicon.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat; +package fox.spiteful.avaritia.compat.botania; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.IAddonEntry; diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/ModelInfinitato.java similarity index 90% rename from src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/ModelInfinitato.java index 1bcc734..8133c87 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/tsundere/ModelInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/ModelInfinitato.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat.tsundere; +package fox.spiteful.avaritia.compat.botania; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderInfinitato.java similarity index 96% rename from src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/RenderInfinitato.java index 588d0d6..eedc13c 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderInfinitato.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat.tsundere; +package fox.spiteful.avaritia.compat.botania; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java similarity index 99% rename from src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java index 6fa5248..835edf9 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/tsundere/RenderTileInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/RenderTileInfinitato.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat.tsundere; +package fox.spiteful.avaritia.compat.botania; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/fox/spiteful/avaritia/compat/Signature.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Signature.java similarity index 94% rename from src/main/java/fox/spiteful/avaritia/compat/Signature.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/Signature.java index dab2231..14d3f3e 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Signature.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Signature.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat; +package fox.spiteful.avaritia.compat.botania; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; diff --git a/src/main/java/fox/spiteful/avaritia/compat/SubTileCheaty.java b/src/main/java/fox/spiteful/avaritia/compat/botania/SubTileCheaty.java similarity index 95% rename from src/main/java/fox/spiteful/avaritia/compat/SubTileCheaty.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/SubTileCheaty.java index eb702ab..8c3c6da 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/SubTileCheaty.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/SubTileCheaty.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat; +package fox.spiteful.avaritia.compat.botania; import net.minecraft.util.IIcon; import vazkii.botania.api.BotaniaAPI; diff --git a/src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java b/src/main/java/fox/spiteful/avaritia/compat/botania/TileInfinitato.java similarity index 94% rename from src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/TileInfinitato.java index ef3cf95..45a671c 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/tsundere/TileInfinitato.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/TileInfinitato.java @@ -1,4 +1,4 @@ -package fox.spiteful.avaritia.compat.tsundere; +package fox.spiteful.avaritia.compat.botania; import fox.spiteful.avaritia.tile.TileLudicrous; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java similarity index 73% rename from src/main/java/fox/spiteful/avaritia/compat/Tsundere.java rename to src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java index 254d8ca..b9fb9d0 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -1,9 +1,8 @@ -package fox.spiteful.avaritia.compat; +package fox.spiteful.avaritia.compat.botania; import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.blocks.LudicrousBlocks; -import fox.spiteful.avaritia.compat.tsundere.BlockInfinitato; -import fox.spiteful.avaritia.compat.tsundere.TileInfinitato; +import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.items.LudicrousItems; @@ -16,22 +15,14 @@ import vazkii.botania.api.BotaniaAPI; public class Tsundere { - public static Block potato; - public static Block infinitato; - public static void baka() throws Compat.ItemNotFoundException { Item resource = Compat.getItem("Botania", "manaResource"); - ItemStack gaia = new ItemStack(resource, 1, 14); - GameRegistry.addShapedRecipe(new ItemStack(LudicrousBlocks.resource_block, 1, 2), new Object[]{ - "XXX", - "XXX", - "XXX", - 'X', gaia - }); - GameRegistry.addShapedRecipe(new ItemStack(resource, 9, 14), new Object[]{ - "X", 'X', new ItemStack(LudicrousBlocks.resource_block, 1, 2) - }); - Grinder.catalyst.recipeItems.add(new ItemStack(LudicrousBlocks.resource_block, 1, 2)); + Block storage = Compat.getBlock("Botania", "storage"); + ItemStack terra = new ItemStack(storage, 1, 1); + ItemStack gaia = new ItemStack(resource, 1, 5); + + Grinder.catalyst.recipeItems.add(terra); + Grinder.catalyst.recipeItems.add(gaia); BotaniaAPI.registerSubTile("asgardandelion", SubTileCheaty.class); BotaniaAPI.registerSubTileSignature(SubTileCheaty.class, new Signature("asgardandelion")); @@ -58,14 +49,13 @@ public class Tsundere { 'N', new ItemStack(LudicrousItems.resource, 1, 4), 'n', new ItemStack(LudicrousItems.resource, 1, 3), }); - - infinitato = new BlockInfinitato(); - GameRegistry.registerBlock(infinitato, "infinitato"); + + LudicrousBlocks.infinitato = GameRegistry.registerBlock(new BlockInfinitato(), "infinitato"); GameRegistry.registerTileEntity(TileInfinitato.class, "Avaritia_Infinitato"); - - potato = Compat.getBlock("Botania", "tinyPotato"); - - ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(infinitato), new Object[]{ + + Block potato = Compat.getBlock("Botania", "tinyPotato"); + + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousBlocks.infinitato), new Object[]{ "IIIIIIIII", "IIIIIIIII", "IIISISIII", diff --git a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java index 7bd7079..64ffe71 100644 --- a/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java +++ b/src/main/java/fox/spiteful/avaritia/crafting/Grinder.java @@ -51,11 +51,11 @@ public class Grinder { "NXCCXCCXN", "NCXXCXXCN", "NNNNNNNNN", - 'X', new ItemStack(LudicrousItems.resource, 1, 1), + 'C', new ItemStack(LudicrousItems.resource, 1, 1), 'N', new ItemStack(LudicrousItems.resource, 1, 4), - 'C', new ItemStack(LudicrousItems.resource, 1, 5)}); + 'X', new ItemStack(LudicrousItems.resource, 1, 5)}); - catalyst = ExtremeCraftingManager.getInstance().addShapelessRecipe(new ItemStack(LudicrousItems.resource, 1, 5), new Object[]{ + catalyst = ExtremeCraftingManager.getInstance().addShapelessRecipe(new ItemStack(LudicrousItems.resource, 2, 5), new Object[]{ new ItemStack(Blocks.emerald_block, 1), new ItemStack(LudicrousItems.singularity, 1, 0), new ItemStack(LudicrousItems.singularity, 1, 1), new ItemStack(LudicrousItems.singularity, 1, 2), new ItemStack(LudicrousItems.singularity, 1, 3), @@ -76,6 +76,21 @@ public class Grinder { 'I', new ItemStack(LudicrousItems.resource, 1, 6), 'N', new ItemStack(LudicrousItems.resource, 1, 4)}); + ExtremeCraftingManager.getInstance().addRecipe(new ItemStack(LudicrousItems.infinity_sword), new Object[]{ + " II", + " III", + " III ", + " III ", + " C III ", + " CII ", + " NC ", + " N C ", + "X ", + 'I', new ItemStack(LudicrousItems.resource, 1, 6), + 'X', new ItemStack(LudicrousItems.resource, 1, 5), + 'C', new ItemStack(LudicrousItems.resource, 1, 1), + 'N', new ItemStack(LudicrousItems.resource, 1, 4)}); + 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)); diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java index 7c77a2e..c0af6e3 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemResource.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemResource.java @@ -1,5 +1,6 @@ package fox.spiteful.avaritia.items; +import fox.spiteful.avaritia.Avaritia; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.client.renderer.texture.IIconRegister; @@ -26,6 +27,7 @@ public class ItemResource extends Item { this.setHasSubtypes(true); this.setMaxDamage(0); this.setUnlocalizedName("avaritia_resource"); + this.setCreativeTab(Avaritia.tab); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java index ab98b73..9ae1f04 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemSingularity.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; @@ -28,6 +29,7 @@ public class ItemSingularity extends Item { this.setMaxDamage(0); this.setUnlocalizedName("avaritia_singularity"); this.setTextureName("avaritia:singularity"); + this.setCreativeTab(Avaritia.tab); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index 506c8a1..92ec958 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -2,6 +2,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 net.minecraft.item.EnumRarity; import net.minecraft.item.Item; import net.minecraft.util.EnumChatFormatting; @@ -14,8 +15,7 @@ public class LudicrousItems { public static Item resource; public static Item singularity; public static Item infinity_pickaxe; - - public static ToolMaterial opPickaxe = EnumHelper.addToolMaterial("INFINITY_PICKAXE", 32, 9999, 9999F, 5.0F, 200); + public static Item infinity_sword; public static EnumRarity cosmic = EnumHelper.addRarity("COSMIC", EnumChatFormatting.DARK_RED, "Cosmic"); @@ -26,5 +26,7 @@ public class LudicrousItems { GameRegistry.registerItem(singularity, "Singularity"); infinity_pickaxe = new ItemPickaxeInfinity(); GameRegistry.registerItem(infinity_pickaxe, "Infinity_Pickaxe"); + infinity_sword = new ItemSwordInfinity(); + GameRegistry.registerItem(infinity_sword, "Infinity_Sword"); } } diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java index 941cb3f..3db97f8 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemPickaxeInfinity.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import fox.spiteful.avaritia.Avaritia; import fox.spiteful.avaritia.items.LudicrousItems; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; @@ -11,15 +12,19 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeHooks; +import net.minecraftforge.common.util.EnumHelper; import java.util.List; public class ItemPickaxeInfinity extends ItemPickaxe { + private static final ToolMaterial opPickaxe = EnumHelper.addToolMaterial("INFINITY_PICKAXE", 32, 9999, 9999F, 5.0F, 200); + public ItemPickaxeInfinity(){ - super(LudicrousItems.opPickaxe); + super(opPickaxe); setUnlocalizedName("infinity_pickaxe"); setTextureName("avaritia:infinity_pickaxe"); + setCreativeTab(Avaritia.tab); } @Override diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java new file mode 100644 index 0000000..cb652de --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java @@ -0,0 +1,52 @@ +package fox.spiteful.avaritia.items.tools; + +import com.google.common.collect.Multimap; +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; +import net.minecraftforge.common.util.EnumHelper; + +public class ItemSwordInfinity extends ItemSword { + + private static final ToolMaterial opSword = EnumHelper.addToolMaterial("INFINITY_SWORD", 32, 9999, 9999F, 9995.0F, 200); + + public ItemSwordInfinity(){ + super(opSword); + setUnlocalizedName("infinity_sword"); + setTextureName("avaritia:infinity_sword"); + 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) + { + victim.setHealth(0); + victim.onDeath(new EntityDamageSource("player", player)); + return true; + } + + @Override + public EnumRarity getRarity(ItemStack stack) + { + return LudicrousItems.cosmic; + } + + @Override + public void setDamage(ItemStack stack, int damage){ + super.setDamage(stack, 0); + } +} diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index 063e749..72aedb6 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -17,6 +17,7 @@ item.singularity_tin.name=Tin Singularity item.singularity_lead.name=Leaden Singularity item.singularity_silver.name=Silver Singularity item.infinity_pickaxe.name=Infinity Pickaxe +item.infinity_sword.name=Infinity Sword # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -30,6 +31,7 @@ tile.neutron_collector.name=Neutron Collector tile.infinitato.name=Infinitato # # Misc +itemGroup.avaritia=Avaritia container.neutron_collector=Neutron Collector tc.aspect.terminus=The End of Games, Apocalypse, Grindstones crafting.extreme=Xtreme Crafting @@ -37,4 +39,5 @@ crafting.extreme.shapeless=Xtreme Shapeless avaritia.flower.asgardandelion.name=Asgardandelion tile.avaritia.flower.asgardandelion.lore=Watered with Vazkii's tears :c avaritia.lexicon.asgardandelion=Asgardandelion -avaritia.lexicon.asgardandelion.0=Rumors abound of some kind of godlike flower that can produce a neverending torrent of mana. Attempting to create such a flower would be a fool's errand, however.
&oStill not a SAO reference.&r \ No newline at end of file +avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a neverending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reasoning.
&oStill not a SAO reference.&r +plus.infinity=+Infinity \ No newline at end of file diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_sword.png b/src/main/resources/assets/avaritia/textures/items/infinity_sword.png new file mode 100644 index 0000000..8d6fdad Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_sword.png differ diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_sword.png.mcmeta b/src/main/resources/assets/avaritia/textures/items/infinity_sword.png.mcmeta new file mode 100644 index 0000000..4a650b1 --- /dev/null +++ b/src/main/resources/assets/avaritia/textures/items/infinity_sword.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 5 + } +} diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_sword_clean.png b/src/main/resources/assets/avaritia/textures/items/infinity_sword_clean.png new file mode 100644 index 0000000..06fbf80 Binary files /dev/null and b/src/main/resources/assets/avaritia/textures/items/infinity_sword_clean.png differ