diff --git a/build.gradle b/build.gradle index ab61651e8..40278755d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ buildscript { apply plugin: 'forge' -version = "1.7.10-0.0.1" -group = "ellpeck.someprettyrandomstuff" -archivesBaseName = "SomePrettyRandomStuff" +version = "1.7.10-0.0.1.1" +group = "ellpeck.actuallyadditions" +archivesBaseName = "ActuallyAdditions" minecraft { version = "1.7.10-10.13.2.1291" diff --git a/src/main/java/ellpeck/someprettyrandomstuff/SomePrettyRandomStuff.java b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java similarity index 59% rename from src/main/java/ellpeck/someprettyrandomstuff/SomePrettyRandomStuff.java rename to src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java index 63abdb1ed..08b1e3324 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/SomePrettyRandomStuff.java +++ b/src/main/java/ellpeck/actuallyadditions/ActuallyAdditions.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff; +package ellpeck.actuallyadditions; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -7,28 +7,28 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import ellpeck.someprettyrandomstuff.achievement.InitAchievements; -import ellpeck.someprettyrandomstuff.blocks.InitBlocks; -import ellpeck.someprettyrandomstuff.config.ConfigurationHandler; -import ellpeck.someprettyrandomstuff.crafting.InitCrafting; -import ellpeck.someprettyrandomstuff.event.InitEvents; -import ellpeck.someprettyrandomstuff.gen.OreGen; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.material.InitItemMaterials; -import ellpeck.someprettyrandomstuff.network.PacketHandler; -import ellpeck.someprettyrandomstuff.oredict.OreDictRegistry; -import ellpeck.someprettyrandomstuff.proxy.IProxy; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.achievement.InitAchievements; +import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.config.ConfigurationHandler; +import ellpeck.actuallyadditions.crafting.InitCrafting; +import ellpeck.actuallyadditions.event.InitEvents; +import ellpeck.actuallyadditions.gen.OreGen; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.material.InitItemMaterials; +import ellpeck.actuallyadditions.network.PacketHandler; +import ellpeck.actuallyadditions.oredict.OreDictRegistry; +import ellpeck.actuallyadditions.proxy.IProxy; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.util.Util; @Mod(modid = Util.MOD_ID, name = Util.NAME, version = Util.VERSION) -public class SomePrettyRandomStuff{ +public class ActuallyAdditions{ @Instance(Util.MOD_ID) - public static SomePrettyRandomStuff instance; + public static ActuallyAdditions instance; - @SidedProxy(clientSide = "ellpeck.someprettyrandomstuff.proxy.ClientProxy", serverSide = "ellpeck.someprettyrandomstuff.proxy.ServerProxy") + @SidedProxy(clientSide = "ellpeck.actuallyadditions.proxy.ClientProxy", serverSide = "ellpeck.actuallyadditions.proxy.ServerProxy") public static IProxy proxy; @EventHandler() diff --git a/src/main/java/ellpeck/someprettyrandomstuff/achievement/AchievementSPRS.java b/src/main/java/ellpeck/actuallyadditions/achievement/AchievementAA.java similarity index 60% rename from src/main/java/ellpeck/someprettyrandomstuff/achievement/AchievementSPRS.java rename to src/main/java/ellpeck/actuallyadditions/achievement/AchievementAA.java index 457a11d09..c8f99ffcc 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/achievement/AchievementSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/achievement/AchievementAA.java @@ -1,12 +1,12 @@ -package ellpeck.someprettyrandomstuff.achievement; +package ellpeck.actuallyadditions.achievement; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; -public class AchievementSPRS extends Achievement{ +public class AchievementAA extends Achievement{ - public AchievementSPRS(String name, int x, int y, ItemStack displayStack, Achievement hasToHaveBefore){ + public AchievementAA(String name, int x, int y, ItemStack displayStack, Achievement hasToHaveBefore){ super("achievement." + Util.MOD_ID_LOWER +"." + Util.MOD_ID_LOWER + "." + name, Util.MOD_ID_LOWER + "." + name, x, y, displayStack, hasToHaveBefore); InitAchievements.achievementList.add(this); if(hasToHaveBefore == null) this.initIndependentStat(); diff --git a/src/main/java/ellpeck/actuallyadditions/achievement/InitAchievements.java b/src/main/java/ellpeck/actuallyadditions/achievement/InitAchievements.java new file mode 100644 index 000000000..fbe71ec2e --- /dev/null +++ b/src/main/java/ellpeck/actuallyadditions/achievement/InitAchievements.java @@ -0,0 +1,60 @@ +package ellpeck.actuallyadditions.achievement; + +import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.Util; +import net.minecraft.item.ItemStack; +import net.minecraft.stats.Achievement; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.AchievementPage; + +import java.util.ArrayList; + +public class InitAchievements{ + + public static AchievementPage theAchievementPage; + public static ArrayList achievementList = new ArrayList(); + + public static Achievement achievementCraftKnifeBlade; + public static Achievement achievementCraftKnife; + + public static Achievement achievementCraftDough; + public static Achievement achievementSmeltBaguette; + public static Achievement achievementCraftSubSandwich; + + public static Achievement achievementCraftMashedFood; + public static Achievement achievementCraftCompost; + public static Achievement achievementCraftFertilizer; + + public static Achievement achievementCraftPaperCone; + public static Achievement achievementCraftFrenchFry; + public static Achievement achievementCraftFrenchFries; + public static Achievement achievementCraftFishNChips; + + public static void init(){ + Util.logInfo("Initializing Achievements..."); + + achievementCraftKnifeBlade = new AchievementAA("craftKnifeBlade", -2, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), null); + achievementCraftKnife = new AchievementAA("craftKnife", 0, 0, new ItemStack(InitItems.itemKnife), achievementCraftKnifeBlade); + + achievementCraftDough = new AchievementAA("craftDough", 0, -3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), achievementCraftKnife); + achievementSmeltBaguette = new AchievementAA("smeltBaguette", 2, -3, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), achievementCraftDough); + achievementCraftSubSandwich = new AchievementAA("craftSubSandwich", 4, -3, new ItemStack(InitItems.itemFoods, 1, TheFoods.SUBMARINE_SANDWICH.ordinal()), achievementSmeltBaguette); + + achievementCraftMashedFood = new AchievementAA("craftMashedFood", 3, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.MASHED_FOOD.ordinal()), achievementCraftKnife); + achievementCraftCompost = new AchievementAA("craftCompost", 5, 0, new ItemStack(InitBlocks.blockCompost), achievementCraftMashedFood); + achievementCraftFertilizer = new AchievementAA("craftFertilizer", 7, 0, new ItemStack(InitItems.itemFertilizer), achievementCraftCompost); + + achievementCraftPaperCone = new AchievementAA("craftPaperCone", 0, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), achievementCraftKnife); + achievementCraftFrenchFry = new AchievementAA("craftFrenchFry", 2, 3, new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()), achievementCraftPaperCone); + achievementCraftFrenchFries = new AchievementAA("craftFrenchFries", 4, 4, new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRIES.ordinal()), achievementCraftFrenchFry); + achievementCraftFishNChips = new AchievementAA("craftFishNChips", 4, 2, new ItemStack(InitItems.itemFoods, 1, TheFoods.FISH_N_CHIPS.ordinal()), achievementCraftFrenchFry); + + + theAchievementPage = new AchievementPage(StatCollector.translateToLocal("achievement.page." + Util.MOD_ID_LOWER), achievementList.toArray(new Achievement[achievementList.size()])); + AchievementPage.registerAchievementPage(theAchievementPage); + } + +} diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java similarity index 92% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockCompost.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java index d41e8b54a..df63a3bbd 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockCompost.java @@ -1,16 +1,16 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.achievement.InitAchievements; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.ItemFertilizer; -import ellpeck.someprettyrandomstuff.items.ItemMisc; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.tile.TileEntityCompost; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.achievement.InitAchievements; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.ItemFertilizer; +import ellpeck.actuallyadditions.items.ItemMisc; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.tile.TileEntityCompost; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java index 03c4f6e19..f7000482d 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockContainerBase.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; -import ellpeck.someprettyrandomstuff.tile.TileEntityInventoryBase; +import ellpeck.actuallyadditions.tile.TileEntityInventoryBase; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFeeder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFeeder.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java index 6926ad3fc..6b2f0e931 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFeeder.java @@ -1,14 +1,13 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder; -import ellpeck.someprettyrandomstuff.util.IInformation; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.tile.TileEntityFeeder; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -23,7 +22,7 @@ import net.minecraft.world.World; import java.util.List; -public class BlockFeeder extends BlockContainerBase implements IName, IInformation{ +public class BlockFeeder extends BlockContainerBase implements IName{ private IIcon topIcon; @@ -57,7 +56,7 @@ public class BlockFeeder extends BlockContainerBase implements IName, IInformati public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityFeeder feeder = (TileEntityFeeder)world.getTileEntity(x, y, z); - if (feeder != null) player.openGui(SomePrettyRandomStuff.instance, GuiHandler.FEEDER_ID, world, x, y, z); + if (feeder != null) player.openGui(ActuallyAdditions.instance, GuiHandler.FEEDER_ID, world, x, y, z); return true; } return true; @@ -74,11 +73,6 @@ public class BlockFeeder extends BlockContainerBase implements IName, IInformati return "blockFeeder"; } - @Override - public String[] getInformationString(){ - return new String[]{"This is a thing and it is a test and bla bla bla"}; - } - public static class TheItemBlock extends ItemBlock{ private Block theBlock; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFurnaceDouble.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java index 4570b3379..befc5764b 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockFurnaceDouble.java @@ -1,13 +1,13 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -103,7 +103,7 @@ public class BlockFurnaceDouble extends BlockContainerBase implements IName{ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble)world.getTileEntity(x, y, z); - if (furnace != null) player.openGui(SomePrettyRandomStuff.instance, GuiHandler.FURNACE_DOUBLE_ID, world, x, y, z); + if (furnace != null) player.openGui(ActuallyAdditions.instance, GuiHandler.FURNACE_DOUBLE_ID, world, x, y, z); return true; } return true; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGiantChest.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java similarity index 86% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGiantChest.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java index db6879e77..57bf5e808 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGiantChest.java @@ -1,13 +1,13 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.tile.TileEntityGiantChest; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -56,7 +56,7 @@ public class BlockGiantChest extends BlockContainerBase implements IName{ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityGiantChest chest = (TileEntityGiantChest)world.getTileEntity(x, y, z); - if (chest != null) player.openGui(SomePrettyRandomStuff.instance, GuiHandler.GIANT_CHEST_ID, world, x, y, z); + if (chest != null) player.openGui(ActuallyAdditions.instance, GuiHandler.GIANT_CHEST_ID, world, x, y, z); return true; } return true; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGrinder.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGrinder.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java index 5bfb0411e..a82dd3579 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockGrinder.java @@ -1,13 +1,13 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.tile.TileEntityGrinder; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -89,7 +89,7 @@ public class BlockGrinder extends BlockContainerBase implements IName{ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){ if(!world.isRemote){ TileEntityGrinder grinder = (TileEntityGrinder)world.getTileEntity(x, y, z); - if (grinder != null) player.openGui(SomePrettyRandomStuff.instance, this.isDouble ? GuiHandler.GRINDER_DOUBLE_ID : GuiHandler.GRINDER_ID, world, x, y, z); + if (grinder != null) player.openGui(ActuallyAdditions.instance, this.isDouble ? GuiHandler.GRINDER_DOUBLE_ID : GuiHandler.GRINDER_ID, world, x, y, z); return true; } return true; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockMisc.java b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java similarity index 74% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockMisc.java rename to src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java index 2843c45ad..333eef1d3 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/BlockMisc.java @@ -1,13 +1,11 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.blocks.metalists.TheMiscBlocks; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -21,7 +19,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import java.util.List; -import java.util.Random; public class BlockMisc extends Block implements IName{ @@ -37,24 +34,14 @@ public class BlockMisc extends Block implements IName{ @SuppressWarnings("all") @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs tab, List list){ - for (int j = 0; j < allMiscBlocks.length; ++j){ + for (int j = 0; j < allMiscBlocks.length; j++){ list.add(new ItemStack(item, 1, j)); } } - @Override - public Item getItemDropped(int meta, Random rand, int par3){ - return meta == TheMiscBlocks.ORE_QUARTZ.ordinal() ? InitItems.itemMisc : super.getItemDropped(meta, rand, par3); - } - @Override public int damageDropped(int meta){ - return meta == TheMiscBlocks.ORE_QUARTZ.ordinal() ? TheMiscItems.QUARTZ.ordinal() : super.damageDropped(meta); - } - - @Override - public int quantityDropped(int meta, int fortune, Random random){ - return meta == TheMiscBlocks.ORE_QUARTZ.ordinal() ? 1+random.nextInt(2)+fortune : 1; + return meta; } @Override diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java rename to src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java index 3d8f43b95..29a583a57 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/InitBlocks.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.blocks; +package ellpeck.actuallyadditions.blocks; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; public class InitBlocks{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/metalists/TheMiscBlocks.java b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java similarity index 84% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/metalists/TheMiscBlocks.java rename to src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java index ec7591d08..13001ca0e 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/metalists/TheMiscBlocks.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/metalists/TheMiscBlocks.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.blocks.metalists; +package ellpeck.actuallyadditions.blocks.metalists; -import ellpeck.someprettyrandomstuff.util.IName; +import ellpeck.actuallyadditions.util.IName; import net.minecraft.item.EnumRarity; public enum TheMiscBlocks implements IName{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelBaseSPRS.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java similarity index 59% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelBaseSPRS.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java index 1704b444e..a8b698739 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelBaseSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelBaseAA.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.blocks.render; +package ellpeck.actuallyadditions.blocks.render; import net.minecraft.client.model.ModelBase; -public class ModelBaseSPRS extends ModelBase{ +public class ModelBaseAA extends ModelBase{ public void render(float f){ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelCompost.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelCompost.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java index 4152cf357..ac84d2e22 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/ModelCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/ModelCompost.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.blocks.render; +package ellpeck.actuallyadditions.blocks.render; import net.minecraft.client.model.ModelRenderer; -public class ModelCompost extends ModelBaseSPRS{ +public class ModelCompost extends ModelBaseAA{ public ModelRenderer floor; public ModelRenderer wallOne; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderItems.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderItems.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java index 40fa7e57f..d6d9f8f84 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderItems.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderItems.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.blocks.render; +package ellpeck.actuallyadditions.blocks.render; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -9,10 +9,10 @@ import org.lwjgl.opengl.GL11; public class RenderItems implements IItemRenderer{ - ModelBaseSPRS theModel; + ModelBaseAA theModel; ResourceLocation theTexture; - public RenderItems(ModelBaseSPRS model){ + public RenderItems(ModelBaseAA model){ this.theModel = model; this.theTexture = new ResourceLocation(Util.MOD_ID_LOWER, "textures/blocks/models/" + this.theModel.getName() + ".png"); } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderTileEntity.java b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderTileEntity.java rename to src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java index a6cf9c312..358f06179 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/render/RenderTileEntity.java +++ b/src/main/java/ellpeck/actuallyadditions/blocks/render/RenderTileEntity.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.blocks.render; +package ellpeck.actuallyadditions.blocks.render; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; @@ -8,9 +8,9 @@ import org.lwjgl.opengl.GL11; public class RenderTileEntity extends TileEntitySpecialRenderer{ - ModelBaseSPRS theModel; + ModelBaseAA theModel; - public RenderTileEntity(ModelBaseSPRS model){ + public RenderTileEntity(ModelBaseAA model){ this.theModel = model; } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/config/ConfigValues.java b/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java similarity index 98% rename from src/main/java/ellpeck/someprettyrandomstuff/config/ConfigValues.java rename to src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java index fa8dbc600..18456226d 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/config/ConfigValues.java +++ b/src/main/java/ellpeck/actuallyadditions/config/ConfigValues.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.config; +package ellpeck.actuallyadditions.config; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraftforge.common.config.Configuration; public class ConfigValues{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/config/ConfigurationHandler.java b/src/main/java/ellpeck/actuallyadditions/config/ConfigurationHandler.java similarity index 91% rename from src/main/java/ellpeck/someprettyrandomstuff/config/ConfigurationHandler.java rename to src/main/java/ellpeck/actuallyadditions/config/ConfigurationHandler.java index 4db277db2..8a3390135 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/config/ConfigurationHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/config/ConfigurationHandler.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.config; +package ellpeck.actuallyadditions.config; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraftforge.common.config.Configuration; import java.io.File; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java similarity index 87% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/BlockCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index 958e823a8..dfd6092c8 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.blocks.InitBlocks; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/FoodCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java similarity index 95% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/FoodCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java index 29c03e1c2..173ec6482 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/FoodCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/FoodCrafting.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/GrinderCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java similarity index 87% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/GrinderCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java index 439470d9c..66864de28 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/GrinderCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheDusts; -import ellpeck.someprettyrandomstuff.recipe.GrinderRecipes; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheDusts; +import ellpeck.actuallyadditions.recipe.GrinderRecipes; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -18,7 +18,7 @@ public class GrinderCrafting{ GrinderRecipes.instance().registerRecipe(new ItemStack(Blocks.iron_ore), new ItemStack(InitItems.itemDust, 2, TheDusts.IRON.ordinal()), new ItemStack(InitItems.itemDust, 1, TheDusts.GOLD.ordinal()), 10); GrinderRecipes.instance().registerRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 10), null, 0); - GrinderRecipes.instance().registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(Items.dye, 15, 4), null, 0); + GrinderRecipes.instance().registerRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(InitItems.itemDust, 12, TheDusts.LAPIS.ordinal()), null, 0); registerFinally(); } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/InitCrafting.java similarity index 76% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/InitCrafting.java index e644b2f0e..0ceaa24da 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/InitCrafting.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; public class InitCrafting { diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java similarity index 59% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/ItemCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 75781897b..5d27361b5 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -1,10 +1,11 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheDusts; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -32,6 +33,18 @@ public class ItemCrafting{ if(ConfigValues.enabledMiscRecipes[TheMiscItems.MASHED_FOOD.ordinal()]) initMashedFoodRecipes(); + + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheDusts.IRON.ordinal()), + new ItemStack(Items.iron_ingot), 1F); + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheDusts.GOLD.ordinal()), + new ItemStack(Items.gold_ingot), 1F); + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheDusts.DIAMOND.ordinal()), + new ItemStack(Items.diamond), 1F); + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheDusts.EMERALD.ordinal()), + new ItemStack(Items.emerald), 1F); + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheDusts.LAPIS.ordinal()), + new ItemStack(Items.dye, 1, 4), 1F); + } public static void initMashedFoodRecipes(){ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/MiscCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java similarity index 86% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/MiscCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java index 662d56ff7..686a53ea8 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/MiscCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/MiscCrafting.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/ToolCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/crafting/ToolCrafting.java rename to src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java index c7e3d047b..51470baee 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/crafting/ToolCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ToolCrafting.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.crafting; +package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java similarity index 71% rename from src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java rename to src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java index 428059eec..c5479dd91 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java +++ b/src/main/java/ellpeck/actuallyadditions/creative/CreativeTab.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.creative; +package ellpeck.actuallyadditions.creative; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/event/CraftEvent.java b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java similarity index 87% rename from src/main/java/ellpeck/someprettyrandomstuff/event/CraftEvent.java rename to src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java index 9c0f5ad9b..2be836190 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/event/CraftEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/CraftEvent.java @@ -1,12 +1,12 @@ -package ellpeck.someprettyrandomstuff.event; +package ellpeck.actuallyadditions.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import ellpeck.someprettyrandomstuff.achievement.InitAchievements; -import ellpeck.someprettyrandomstuff.blocks.InitBlocks; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.achievement.InitAchievements; +import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.item.Item; public class CraftEvent{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/event/InitEvents.java b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java similarity index 73% rename from src/main/java/ellpeck/someprettyrandomstuff/event/InitEvents.java rename to src/main/java/ellpeck/actuallyadditions/event/InitEvents.java index fb7ac885c..f746dc286 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/event/InitEvents.java +++ b/src/main/java/ellpeck/actuallyadditions/event/InitEvents.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.event; +package ellpeck.actuallyadditions.event; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; public class InitEvents{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/event/KilledEvent.java b/src/main/java/ellpeck/actuallyadditions/event/KilledEvent.java similarity index 88% rename from src/main/java/ellpeck/someprettyrandomstuff/event/KilledEvent.java rename to src/main/java/ellpeck/actuallyadditions/event/KilledEvent.java index f282babfc..6771581b5 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/event/KilledEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/KilledEvent.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.event; +package ellpeck.actuallyadditions.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheSpecialDrops; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/event/SmeltEvent.java b/src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java similarity index 66% rename from src/main/java/ellpeck/someprettyrandomstuff/event/SmeltEvent.java rename to src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java index 65535cf77..2f010c2eb 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/event/SmeltEvent.java +++ b/src/main/java/ellpeck/actuallyadditions/event/SmeltEvent.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.event; +package ellpeck.actuallyadditions.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; -import ellpeck.someprettyrandomstuff.achievement.InitAchievements; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; +import ellpeck.actuallyadditions.achievement.InitAchievements; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheFoods; public class SmeltEvent{ @SubscribeEvent diff --git a/src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java rename to src/main/java/ellpeck/actuallyadditions/gen/OreGen.java index efc8af309..0c6cc3258 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java +++ b/src/main/java/ellpeck/actuallyadditions/gen/OreGen.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.gen; +package ellpeck.actuallyadditions.gen; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -10,6 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import java.util.Random; +@SuppressWarnings("unused") public class OreGen implements IWorldGenerator{ @Override diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerCrafter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java similarity index 98% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerCrafter.java rename to src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java index c104e025f..bc6cba5c8 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerCrafter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFeeder.java rename to src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java index e3e2d1d0c..2b8c8f933 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityFeeder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFurnaceDouble.java rename to src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java index 77b007c42..34060b20a 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.inventory.slot.SlotOutput; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble; +import ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java similarity index 88% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGiantChest.java rename to src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java index e0297b626..9708534ff 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityGiantChest; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityGiantChest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGrinder.java rename to src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java index 8b0a0c4dc..9185bcc14 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/ContainerGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.inventory.slot.SlotOutput; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder; +import ellpeck.actuallyadditions.inventory.slot.SlotOutput; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityGrinder; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiCrafter.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiCrafter.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiCrafter.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiCrafter.java index ae9be67c7..a9f94cc28 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiCrafter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiCrafter.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiFeeder.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFeeder.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiFeeder.java index 3291b275f..b3a66dda1 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiFeeder.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityFeeder; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiFurnaceDouble.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFurnaceDouble.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiFurnaceDouble.java index f43e8ddac..828c58e20 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiFurnaceDouble.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiGiantChest.java similarity index 87% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGiantChest.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiGiantChest.java index 3a8ace54b..d7d2d7681 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiGiantChest.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiGrinder.java similarity index 91% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGrinder.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiGrinder.java index e91b37c09..47d0b9c99 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiGrinder.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityGrinder; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java b/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java rename to src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java index b29cf6f9c..b073452c2 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/GuiHandler.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.inventory; +package ellpeck.actuallyadditions.inventory; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.tile.TileEntityBase; -import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.tile.TileEntityBase; +import ellpeck.actuallyadditions.tile.TileEntityGrinder; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -70,6 +70,6 @@ public class GuiHandler implements IGuiHandler{ public static void init(){ Util.logInfo("Initializing GuiHandler..."); - NetworkRegistry.INSTANCE.registerGuiHandler(SomePrettyRandomStuff.instance, new GuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(ActuallyAdditions.instance, new GuiHandler()); } } \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettyrandomstuff/inventory/slot/SlotOutput.java b/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java similarity index 86% rename from src/main/java/ellpeck/someprettyrandomstuff/inventory/slot/SlotOutput.java rename to src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java index 033b42dd7..e1c4b66c3 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/inventory/slot/SlotOutput.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/slot/SlotOutput.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.inventory.slot; +package ellpeck.actuallyadditions.inventory.slot; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java similarity index 53% rename from src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java rename to src/main/java/ellpeck/actuallyadditions/items/InitItems.java index f68c46082..badfbb8f6 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/InitItems.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; -import ellpeck.someprettyrandomstuff.items.tools.*; -import ellpeck.someprettyrandomstuff.material.InitItemMaterials; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.items.tools.*; +import ellpeck.actuallyadditions.material.InitItemMaterials; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; @@ -52,18 +52,18 @@ public class InitItems{ itemSpecialDrop = new ItemSpecialDrop(); Util.register(itemSpecialDrop); - itemPickaxeEmerald = new ItemPickaxeSPRS(InitItemMaterials.toolMaterialEmerald, "itemPickaxeEmerald", EnumRarity.rare); - itemAxeEmerald = new ItemAxeSPRS(InitItemMaterials.toolMaterialEmerald, "itemAxeEmerald", EnumRarity.rare); - itemShovelEmerald = new ItemShovelSPRS(InitItemMaterials.toolMaterialEmerald, "itemShovelEmerald", EnumRarity.rare); - itemSwordEmerald = new ItemSwordSPRS(InitItemMaterials.toolMaterialEmerald, "itemSwordEmerald", EnumRarity.rare); - itemHoeEmerald = new ItemHoeSPRS(InitItemMaterials.toolMaterialEmerald, "itemHoeEmerald", EnumRarity.rare); + itemPickaxeEmerald = new ItemPickaxeAA(InitItemMaterials.toolMaterialEmerald, "itemPickaxeEmerald", EnumRarity.rare); + itemAxeEmerald = new ItemAxeAA(InitItemMaterials.toolMaterialEmerald, "itemAxeEmerald", EnumRarity.rare); + itemShovelEmerald = new ItemShovelAA(InitItemMaterials.toolMaterialEmerald, "itemShovelEmerald", EnumRarity.rare); + itemSwordEmerald = new ItemSwordAA(InitItemMaterials.toolMaterialEmerald, "itemSwordEmerald", EnumRarity.rare); + itemHoeEmerald = new ItemHoeAA(InitItemMaterials.toolMaterialEmerald, "itemHoeEmerald", EnumRarity.rare); Util.registerItems(new Item[]{itemPickaxeEmerald, itemAxeEmerald, itemShovelEmerald, itemSwordEmerald, itemHoeEmerald}); - itemPickaxeObsidian = new ItemPickaxeSPRS(InitItemMaterials.toolMaterialObsidian, "itemPickaxeObsidian", EnumRarity.uncommon); - itemAxeObsidian = new ItemAxeSPRS(InitItemMaterials.toolMaterialObsidian, "itemAxeObsidian", EnumRarity.uncommon); - itemShovelObsidian = new ItemShovelSPRS(InitItemMaterials.toolMaterialObsidian, "itemShovelObsidian", EnumRarity.uncommon); - itemSwordObsidian = new ItemSwordSPRS(InitItemMaterials.toolMaterialObsidian, "itemSwordObsidian", EnumRarity.uncommon); - itemHoeObsidian = new ItemHoeSPRS(InitItemMaterials.toolMaterialObsidian, "itemHoeObsidian", EnumRarity.uncommon); + itemPickaxeObsidian = new ItemPickaxeAA(InitItemMaterials.toolMaterialObsidian, "itemPickaxeObsidian", EnumRarity.uncommon); + itemAxeObsidian = new ItemAxeAA(InitItemMaterials.toolMaterialObsidian, "itemAxeObsidian", EnumRarity.uncommon); + itemShovelObsidian = new ItemShovelAA(InitItemMaterials.toolMaterialObsidian, "itemShovelObsidian", EnumRarity.uncommon); + itemSwordObsidian = new ItemSwordAA(InitItemMaterials.toolMaterialObsidian, "itemSwordObsidian", EnumRarity.uncommon); + itemHoeObsidian = new ItemHoeAA(InitItemMaterials.toolMaterialObsidian, "itemHoeObsidian", EnumRarity.uncommon); Util.registerItems(new Item[]{itemPickaxeObsidian, itemAxeObsidian, itemShovelObsidian, itemSwordObsidian, itemHoeObsidian}); } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemCrafterOnAStick.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java similarity index 75% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemCrafterOnAStick.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java index 5cdefc279..81f173f44 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemCrafterOnAStick.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCrafterOnAStick.java @@ -1,12 +1,12 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.inventory.GuiHandler; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.ActuallyAdditions; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.inventory.GuiHandler; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -45,7 +45,7 @@ public class ItemCrafterOnAStick extends Item implements IName{ @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){ - if(!world.isRemote) player.openGui(SomePrettyRandomStuff.instance, GuiHandler.CRAFTER_ID, world, (int)player.posX, (int)player.posY, (int)player.posZ); + if(!world.isRemote) player.openGui(ActuallyAdditions.instance, GuiHandler.CRAFTER_ID, world, (int)player.posX, (int)player.posY, (int)player.posZ); return stack; } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemDust.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemDust.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemDust.java index 9000780f3..10101493d 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemDust.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDust.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.metalists.TheDusts; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.metalists.TheDusts; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java index fdf3651d6..30815ca2d 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFertilizer.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java index aa83156db..31bb04bc7 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemFoods.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.metalists.TheFoods; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemKnife.java b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java similarity index 75% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemKnife.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java index 91ef7a4b8..ed914bbea 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemKnife.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemKnife.java @@ -1,12 +1,11 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IInformation; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -16,7 +15,7 @@ import net.minecraft.util.IIcon; import java.util.List; -public class ItemKnife extends Item implements IName, IInformation{ +public class ItemKnife extends Item implements IName{ public ItemKnife(){ this.setUnlocalizedName(Util.setUnlocalizedName(this)); @@ -66,9 +65,4 @@ public class ItemKnife extends Item implements IName, IInformation{ public String getName(){ return "itemKnife"; } - - @Override - public String[] getInformationString(){ - return new String[]{"This is a test too but it's more cool senn se assa"}; - } } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java index c34067712..d63824eb9 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemMisc.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemSpecialDrop.java b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java similarity index 89% rename from src/main/java/ellpeck/someprettyrandomstuff/items/ItemSpecialDrop.java rename to src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java index 85cedff8f..2945a8408 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/ItemSpecialDrop.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemSpecialDrop.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.items; +package ellpeck.actuallyadditions.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.items.metalists.TheSpecialDrops; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheDusts.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java similarity index 86% rename from src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheDusts.java rename to src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java index e2fabed7c..5fd8dd657 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheDusts.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheDusts.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.items.metalists; +package ellpeck.actuallyadditions.items.metalists; -import ellpeck.someprettyrandomstuff.util.IName; +import ellpeck.actuallyadditions.util.IName; import net.minecraft.item.EnumRarity; public enum TheDusts implements IName{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java similarity index 93% rename from src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java rename to src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java index 6272afd39..d78dbbb19 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheFoods.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.items.metalists; +package ellpeck.actuallyadditions.items.metalists; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.util.IName; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.util.IName; import net.minecraft.init.Items; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java similarity index 85% rename from src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java rename to src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java index 7dd0229fe..76324b8da 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheMiscItems.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.items.metalists; +package ellpeck.actuallyadditions.items.metalists; -import ellpeck.someprettyrandomstuff.util.IName; +import ellpeck.actuallyadditions.util.IName; import net.minecraft.item.EnumRarity; public enum TheMiscItems implements IName{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheSpecialDrops.java b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java similarity index 91% rename from src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheSpecialDrops.java rename to src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java index 0113f5e27..1e338ee24 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheSpecialDrops.java +++ b/src/main/java/ellpeck/actuallyadditions/items/metalists/TheSpecialDrops.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.items.metalists; +package ellpeck.actuallyadditions.items.metalists; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.util.IName; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.util.IName; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPRS.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPRS.java rename to src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java index c1d3dba87..c1138390b 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAxeAA.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items.tools; +package ellpeck.actuallyadditions.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemAxeSPRS extends ItemAxe implements IName{ +public class ItemAxeAA extends ItemAxe implements IName{ private String name; private EnumRarity rarity; - public ItemAxeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ + public ItemAxeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.name = unlocalizedName; this.rarity = rarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPRS.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPRS.java rename to src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java index b329bf949..45aa831ed 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemHoeAA.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items.tools; +package ellpeck.actuallyadditions.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemHoeSPRS extends ItemHoe implements IName{ +public class ItemHoeAA extends ItemHoe implements IName{ private String name; private EnumRarity rarity; - public ItemHoeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ + public ItemHoeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.name = unlocalizedName; this.rarity = rarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPRS.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPRS.java rename to src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java index a438b771f..93e654e77 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemPickaxeAA.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items.tools; +package ellpeck.actuallyadditions.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemPickaxeSPRS extends ItemPickaxe implements IName{ +public class ItemPickaxeAA extends ItemPickaxe implements IName{ private String name; private EnumRarity rarity; - public ItemPickaxeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ + public ItemPickaxeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.name = unlocalizedName; this.rarity = rarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPRS.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPRS.java rename to src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java index bb2952209..4be088285 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemShovelAA.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items.tools; +package ellpeck.actuallyadditions.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemShovelSPRS extends ItemSpade implements IName{ +public class ItemShovelAA extends ItemSpade implements IName{ private String name; private EnumRarity rarity; - public ItemShovelSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ + public ItemShovelAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.name = unlocalizedName; this.rarity = rarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPRS.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPRS.java rename to src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java index 50186577d..b4eb8dae9 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPRS.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemSwordAA.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.items.tools; +package ellpeck.actuallyadditions.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.creative.CreativeTab; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.creative.CreativeTab; +import ellpeck.actuallyadditions.util.IName; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector; import java.util.List; -public class ItemSwordSPRS extends ItemSword implements IName{ +public class ItemSwordAA extends ItemSword implements IName{ private String name; private EnumRarity rarity; - public ItemSwordSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ + public ItemSwordAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){ super(toolMat); this.name = unlocalizedName; this.rarity = rarity; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/material/InitItemMaterials.java b/src/main/java/ellpeck/actuallyadditions/material/InitItemMaterials.java similarity index 69% rename from src/main/java/ellpeck/someprettyrandomstuff/material/InitItemMaterials.java rename to src/main/java/ellpeck/actuallyadditions/material/InitItemMaterials.java index 638c9a35d..b02444705 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/material/InitItemMaterials.java +++ b/src/main/java/ellpeck/actuallyadditions/material/InitItemMaterials.java @@ -1,11 +1,8 @@ -package ellpeck.someprettyrandomstuff.material; +package ellpeck.actuallyadditions.material; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.util.Util; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.EnumHelper; public class InitItemMaterials{ @@ -16,8 +13,8 @@ public class InitItemMaterials{ public static void init(){ Util.logInfo("Initializing Materials..."); - toolMaterialEmerald = EnumHelper.addToolMaterial("toolMaterialEmerald", ConfigValues.toolEmeraldHarvestLevel, ConfigValues.toolEmeraldMaxUses, ConfigValues.toolEmeraldEfficiency, ConfigValues.toolEmeraldDamage, ConfigValues.toolEmeraldEnchantability).setRepairItem(new ItemStack(Items.emerald)); - toolMaterialObsidian = EnumHelper.addToolMaterial("toolMaterialObsidian", ConfigValues.toolObsidianHarvestLevel, ConfigValues.toolObsidianMaxUses, ConfigValues.toolObsidianEfficiency, ConfigValues.toolObsidianDamage, ConfigValues.toolObsidianEnchantability).setRepairItem(new ItemStack(Blocks.obsidian)); + toolMaterialEmerald = EnumHelper.addToolMaterial("toolMaterialEmerald", ConfigValues.toolEmeraldHarvestLevel, ConfigValues.toolEmeraldMaxUses, ConfigValues.toolEmeraldEfficiency, ConfigValues.toolEmeraldDamage, ConfigValues.toolEmeraldEnchantability); + toolMaterialObsidian = EnumHelper.addToolMaterial("toolMaterialObsidian", ConfigValues.toolObsidianHarvestLevel, ConfigValues.toolObsidianMaxUses, ConfigValues.toolObsidianEfficiency, ConfigValues.toolObsidianDamage, ConfigValues.toolObsidianEnchantability); } diff --git a/src/main/java/ellpeck/someprettyrandomstuff/network/PacketHandler.java b/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java similarity index 83% rename from src/main/java/ellpeck/someprettyrandomstuff/network/PacketHandler.java rename to src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java index df442296f..1ad92b988 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/network/PacketHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/network/PacketHandler.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.network; +package ellpeck.actuallyadditions.network; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; public class PacketHandler{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/network/PacketTileEntityFeeder.java b/src/main/java/ellpeck/actuallyadditions/network/PacketTileEntityFeeder.java similarity index 92% rename from src/main/java/ellpeck/someprettyrandomstuff/network/PacketTileEntityFeeder.java rename to src/main/java/ellpeck/actuallyadditions/network/PacketTileEntityFeeder.java index 16af269c9..bc0940995 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/network/PacketTileEntityFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/network/PacketTileEntityFeeder.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.network; +package ellpeck.actuallyadditions.network; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import ellpeck.someprettyrandomstuff.inventory.GuiFeeder; -import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder; +import ellpeck.actuallyadditions.inventory.GuiFeeder; +import ellpeck.actuallyadditions.tile.TileEntityFeeder; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/oredict/OreDictRegistry.java b/src/main/java/ellpeck/actuallyadditions/oredict/OreDictRegistry.java similarity index 81% rename from src/main/java/ellpeck/someprettyrandomstuff/oredict/OreDictRegistry.java rename to src/main/java/ellpeck/actuallyadditions/oredict/OreDictRegistry.java index 84f59db3f..d1d0604ef 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/oredict/OreDictRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/oredict/OreDictRegistry.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.oredict; +package ellpeck.actuallyadditions.oredict; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheDusts; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.metalists.TheDusts; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java similarity index 63% rename from src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java rename to src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java index 1f9339317..7f84ee781 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java @@ -1,12 +1,12 @@ -package ellpeck.someprettyrandomstuff.proxy; +package ellpeck.actuallyadditions.proxy; import cpw.mods.fml.client.registry.ClientRegistry; -import ellpeck.someprettyrandomstuff.blocks.InitBlocks; -import ellpeck.someprettyrandomstuff.blocks.render.ModelCompost; -import ellpeck.someprettyrandomstuff.blocks.render.RenderItems; -import ellpeck.someprettyrandomstuff.blocks.render.RenderTileEntity; -import ellpeck.someprettyrandomstuff.tile.TileEntityCompost; +import ellpeck.actuallyadditions.blocks.InitBlocks; +import ellpeck.actuallyadditions.blocks.render.ModelCompost; +import ellpeck.actuallyadditions.blocks.render.RenderItems; +import ellpeck.actuallyadditions.blocks.render.RenderTileEntity; +import ellpeck.actuallyadditions.tile.TileEntityCompost; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java similarity index 75% rename from src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java rename to src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java index e65a8eaa0..94d3d4c97 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/IProxy.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.proxy; +package ellpeck.actuallyadditions.proxy; public interface IProxy{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java similarity index 80% rename from src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java rename to src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java index 3c94b4caa..79c4073b0 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ServerProxy.java @@ -1,6 +1,6 @@ -package ellpeck.someprettyrandomstuff.proxy; +package ellpeck.actuallyadditions.proxy; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; @SuppressWarnings("unused") public class ServerProxy implements IProxy{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/recipe/GrinderRecipes.java b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java similarity index 97% rename from src/main/java/ellpeck/someprettyrandomstuff/recipe/GrinderRecipes.java rename to src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java index 30b567961..f2210abfb 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/recipe/GrinderRecipes.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.recipe; +package ellpeck.actuallyadditions.recipe; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java similarity index 95% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java index 3f0b92c15..eff473777 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityBase.java @@ -1,7 +1,7 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.someprettyrandomstuff.util.Util; +import ellpeck.actuallyadditions.util.Util; import net.minecraft.block.Block; import net.minecraft.block.BlockAir; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityCompost.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java similarity index 85% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityCompost.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java index de8cfc73f..03feb9cbe 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityCompost.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityCompost.java @@ -1,10 +1,10 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.ItemFertilizer; -import ellpeck.someprettyrandomstuff.items.ItemMisc; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.items.InitItems; +import ellpeck.actuallyadditions.items.ItemFertilizer; +import ellpeck.actuallyadditions.items.ItemMisc; +import ellpeck.actuallyadditions.items.metalists.TheMiscItems; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFeeder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFeeder.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java index 62524cb53..8e21854d1 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFeeder.java @@ -1,11 +1,11 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.network.PacketHandler; -import ellpeck.someprettyrandomstuff.network.PacketTileEntityFeeder; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.network.PacketHandler; +import ellpeck.actuallyadditions.network.PacketTileEntityFeeder; import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java similarity index 98% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFurnaceDouble.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java index 2cdd661a2..190854889 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityFurnaceDouble.java @@ -1,8 +1,8 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.config.ConfigValues; +import ellpeck.actuallyadditions.config.ConfigValues; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGiantChest.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java similarity index 97% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGiantChest.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java index ff9987dfa..730c81ec5 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGiantChest.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGrinder.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java similarity index 97% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGrinder.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java index 464ffe6e8..953601e15 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityGrinder.java @@ -1,9 +1,9 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.config.ConfigValues; -import ellpeck.someprettyrandomstuff.recipe.GrinderRecipes; +import ellpeck.actuallyadditions.config.ConfigValues; +import ellpeck.actuallyadditions.recipe.GrinderRecipes; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java similarity index 98% rename from src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java rename to src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java index 7c0036d9f..4614c6f8c 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java +++ b/src/main/java/ellpeck/actuallyadditions/tile/TileEntityInventoryBase.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.tile; +package ellpeck.actuallyadditions.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/ellpeck/someprettyrandomstuff/util/IName.java b/src/main/java/ellpeck/actuallyadditions/util/IName.java similarity index 60% rename from src/main/java/ellpeck/someprettyrandomstuff/util/IName.java rename to src/main/java/ellpeck/actuallyadditions/util/IName.java index d4f5c674d..3800cce34 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/util/IName.java +++ b/src/main/java/ellpeck/actuallyadditions/util/IName.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.util; +package ellpeck.actuallyadditions.util; public interface IName{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/util/Util.java b/src/main/java/ellpeck/actuallyadditions/util/Util.java similarity index 94% rename from src/main/java/ellpeck/someprettyrandomstuff/util/Util.java rename to src/main/java/ellpeck/actuallyadditions/util/Util.java index b7e0838ea..e4dcf6996 100644 --- a/src/main/java/ellpeck/someprettyrandomstuff/util/Util.java +++ b/src/main/java/ellpeck/actuallyadditions/util/Util.java @@ -1,4 +1,4 @@ -package ellpeck.someprettyrandomstuff.util; +package ellpeck.actuallyadditions.util; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; @@ -17,10 +17,10 @@ import org.lwjgl.input.Keyboard; @SuppressWarnings("unused") public class Util{ - public static final String VERSION = "1.7.10-0.0.1"; + public static final String VERSION = "1.7.10-0.0.1.1"; - public static final String MOD_ID = "SomePrettyRandomStuff"; - public static final String NAME = "Some Pretty Random Stuff"; + public static final String MOD_ID = "ActuallyAdditions"; + public static final String NAME = "Actually Additions"; public static final String MOD_ID_LOWER = MOD_ID.toLowerCase(); public static final Logger SPRS_LOGGER = LogManager.getLogger(MOD_ID); diff --git a/src/main/java/ellpeck/someprettyrandomstuff/achievement/InitAchievements.java b/src/main/java/ellpeck/someprettyrandomstuff/achievement/InitAchievements.java deleted file mode 100644 index 0426c2c3c..000000000 --- a/src/main/java/ellpeck/someprettyrandomstuff/achievement/InitAchievements.java +++ /dev/null @@ -1,60 +0,0 @@ -package ellpeck.someprettyrandomstuff.achievement; - -import ellpeck.someprettyrandomstuff.blocks.InitBlocks; -import ellpeck.someprettyrandomstuff.items.InitItems; -import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; -import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; -import ellpeck.someprettyrandomstuff.util.Util; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.Achievement; -import net.minecraft.util.StatCollector; -import net.minecraftforge.common.AchievementPage; - -import java.util.ArrayList; - -public class InitAchievements{ - - public static AchievementPage theAchievementPage; - public static ArrayList achievementList = new ArrayList(); - - public static Achievement achievementCraftKnifeBlade; - public static Achievement achievementCraftKnife; - - public static Achievement achievementCraftDough; - public static Achievement achievementSmeltBaguette; - public static Achievement achievementCraftSubSandwich; - - public static Achievement achievementCraftMashedFood; - public static Achievement achievementCraftCompost; - public static Achievement achievementCraftFertilizer; - - public static Achievement achievementCraftPaperCone; - public static Achievement achievementCraftFrenchFry; - public static Achievement achievementCraftFrenchFries; - public static Achievement achievementCraftFishNChips; - - public static void init(){ - Util.logInfo("Initializing Achievements..."); - - achievementCraftKnifeBlade = new AchievementSPRS("craftKnifeBlade", -2, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.KNIFE_BLADE.ordinal()), null); - achievementCraftKnife = new AchievementSPRS("craftKnife", 0, 0, new ItemStack(InitItems.itemKnife), achievementCraftKnifeBlade); - - achievementCraftDough = new AchievementSPRS("craftDough", 0, -3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), achievementCraftKnife); - achievementSmeltBaguette = new AchievementSPRS("smeltBaguette", 2, -3, new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), achievementCraftDough); - achievementCraftSubSandwich = new AchievementSPRS("craftSubSandwich", 4, -3, new ItemStack(InitItems.itemFoods, 1, TheFoods.SUBMARINE_SANDWICH.ordinal()), achievementSmeltBaguette); - - achievementCraftMashedFood = new AchievementSPRS("craftMashedFood", 3, 0, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.MASHED_FOOD.ordinal()), achievementCraftKnife); - achievementCraftCompost = new AchievementSPRS("craftCompost", 5, 0, new ItemStack(InitBlocks.blockCompost), achievementCraftMashedFood); - achievementCraftFertilizer = new AchievementSPRS("craftFertilizer", 7, 0, new ItemStack(InitItems.itemFertilizer), achievementCraftCompost); - - achievementCraftPaperCone = new AchievementSPRS("craftPaperCone", 0, 3, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal()), achievementCraftKnife); - achievementCraftFrenchFry = new AchievementSPRS("craftFrenchFry", 2, 3, new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRY.ordinal()), achievementCraftPaperCone); - achievementCraftFrenchFries = new AchievementSPRS("craftFrenchFries", 4, 4, new ItemStack(InitItems.itemFoods, 1, TheFoods.FRENCH_FRIES.ordinal()), achievementCraftFrenchFry); - achievementCraftFishNChips = new AchievementSPRS("craftFishNChips", 4, 2, new ItemStack(InitItems.itemFoods, 1, TheFoods.FISH_N_CHIPS.ordinal()), achievementCraftFrenchFry); - - - theAchievementPage = new AchievementPage(StatCollector.translateToLocal("achievement.page." + Util.MOD_ID_LOWER), achievementList.toArray(new Achievement[achievementList.size()])); - AchievementPage.registerAchievementPage(theAchievementPage); - } - -} diff --git a/src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java deleted file mode 100644 index a83885b4d..000000000 --- a/src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java +++ /dev/null @@ -1,37 +0,0 @@ -package ellpeck.someprettyrandomstuff.blocks; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettyrandomstuff.util.IName; -import ellpeck.someprettyrandomstuff.util.Util; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; - -import java.util.List; - -public class DefaultItemBlock extends ItemBlock{ - - Block theBlock; - - public DefaultItemBlock(Block block){ - super(block); - this.theBlock = block; - this.setHasSubtypes(false); - } - - @Override - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName(); - } - - @Override - @SuppressWarnings("unchecked") - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { - if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + Util.MOD_ID_LOWER + "." + ((IName)theBlock).getName() + ".desc")); - else list.add(Util.shiftForInfo()); - } -} diff --git a/src/main/java/ellpeck/someprettyrandomstuff/util/IInformation.java b/src/main/java/ellpeck/someprettyrandomstuff/util/IInformation.java deleted file mode 100644 index 554cf3fed..000000000 --- a/src/main/java/ellpeck/someprettyrandomstuff/util/IInformation.java +++ /dev/null @@ -1,7 +0,0 @@ -package ellpeck.someprettyrandomstuff.util; - -public interface IInformation{ - - public abstract String[] getInformationString(); - -} diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang new file mode 100644 index 000000000..d3380d987 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -0,0 +1,167 @@ +itemGroup.actuallyadditions=Actually Additions +achievement.page.actuallyadditions=Actually Additions + +tile.actuallyadditions.blockCompost.name=Compost +tile.actuallyadditions.blockMiscOreBlackQuartz.name=Black Quartz Ore +tile.actuallyadditions.blockMiscBlackQuartz.name=Block of Black Quartz +tile.actuallyadditions.blockMiscBlackQuartzChiseled.name=Chiseled Block of Black Quartz +tile.actuallyadditions.blockMiscBlackQuartzPillar.name=Pillar of Black Quartz +tile.actuallyadditions.blockFeeder.name=Automatic Feeder +tile.actuallyadditions.blockGiantChest.name=Giant Chest +tile.actuallyadditions.blockGrinder.name=Crusher +tile.actuallyadditions.blockGrinderDouble.name=Double Crusher +tile.actuallyadditions.blockFurnaceDouble.name=Double Furnace + +item.actuallyadditions.itemMiscMashedFood.name=Mashed Food +item.actuallyadditions.itemFertilizer.name=Fertilizer +item.actuallyadditions.itemMiscDough.name=Dough +item.actuallyadditions.itemMiscPaperCone.name=Paper Cone +item.actuallyadditions.itemMiscKnifeBlade.name=Knife Blade +item.actuallyadditions.itemMiscKnifeHandle.name=Knife Handle +item.actuallyadditions.itemMiscBlackQuartz.name=Black Quartz + +item.actuallyadditions.itemKnife.name=Knife +item.actuallyadditions.itemPickaxeEmerald.name=Emerald Pickaxe +item.actuallyadditions.itemAxeEmerald.name=Emerald Axe +item.actuallyadditions.itemShovelEmerald.name=Emerald Shovel +item.actuallyadditions.itemHoeEmerald.name=Emerald Hoe +item.actuallyadditions.itemSwordEmerald.name=Emerald Sword +item.actuallyadditions.itemPickaxeObsidian.name=Obsidian Pickaxe +item.actuallyadditions.itemAxeObsidian.name=Obsidian Axe +item.actuallyadditions.itemShovelObsidian.name=Obsidian Shovel +item.actuallyadditions.itemHoeObsidian.name=Obsidian Hoe +item.actuallyadditions.itemSwordObsidian.name=Obsidian Sword +item.actuallyadditions.itemCrafterOnAStick.name=Crafting Table On A Stick + +item.actuallyadditions.itemFoodBaguette.name=Baguette +item.actuallyadditions.itemFoodPizza.name=Pizza +item.actuallyadditions.itemFoodHamburger.name=Hamburger +item.actuallyadditions.itemFoodBigCookie.name=Big Cookie +item.actuallyadditions.itemFoodSubmarineSandwich.name=Submarine Sandwich +item.actuallyadditions.itemFoodToast.name=Toast +item.actuallyadditions.itemFoodChocolate.name=Chocolate +item.actuallyadditions.itemFoodChocolateCake.name=Chocolate Cake +item.actuallyadditions.itemFoodNoodle.name=Noodle +item.actuallyadditions.itemFoodSpaghetti.name=Spaghetti +item.actuallyadditions.itemFoodFrenchFry.name=French Fry +item.actuallyadditions.itemFoodFrenchFries.name=French Fries +item.actuallyadditions.itemFoodFishNChips.name=Fish 'N' Chips +item.actuallyadditions.itemFoodCarrotJuice.name=Carrot Juice +item.actuallyadditions.itemFoodPumpkinStew.name=Pumpkin Stew +item.actuallyadditions.itemFoodCheese.name=Cheese + +item.actuallyadditions.itemSpecialUnknownSubstance.name=Unknown Substance +item.actuallyadditions.itemSpecialSolidifiedExperience.name=Solidified Experience +item.actuallyadditions.itemSpecialBloodFragment.name=Blood Fragment +item.actuallyadditions.itemSpecialHeartPart.name=Part of a Heart +item.actuallyadditions.itemSpecialPearlShard.name=Ender Pearl Shard +item.actuallyadditions.itemSpecialEmeraldShard.name=Emerald Shard + +item.actuallyadditions.itemDustIron.name=Crushed Iron +item.actuallyadditions.itemDustGold.name=Crushed Gold +item.actuallyadditions.itemDustDiamond.name=Crushed Diamond +item.actuallyadditions.itemDustLapis.name=Crushed Lapis +item.actuallyadditions.itemDustEmerald.name=Crushed Emerald + +tooltip.actuallyadditions.shiftForInfo.desc=Press Shift for Info +tooltip.actuallyadditions.hunger.desc=Fills +tooltip.actuallyadditions.saturation.desc=Saturation +tooltip.actuallyadditions.durability.desc=Durability + +tooltip.actuallyadditions.blockCompost.desc.1=Used to make Fertilizer with Mashed Food +tooltip.actuallyadditions.blockCompost.desc.2=BETA INFO: Will visually contain Compost in the Future! +tooltip.actuallyadditions.blockMiscOreBlackQuartz.desc=The darkest form of Quartz. Also: You had Silk Touch! +tooltip.actuallyadditions.blockMiscBlackQuartz.desc=Black, eerie Quartz! Nice for decorating. +tooltip.actuallyadditions.blockMiscBlackQuartzChiseled.desc=Black, eerie chiseled Quartz! Nice for decorating. +tooltip.actuallyadditions.blockMiscBlackQuartzPillar.desc=Kind of a pillar. Not really, though. It's fake! Fake I say! +tooltip.actuallyadditions.blockFeeder.desc=Feeds Animals on its own! +tooltip.actuallyadditions.blockGiantChest.desc=GUI Scale on 'Auto'? That's a problem! +tooltip.actuallyadditions.blockGrinder.desc.1=Crushes Ores into Dusts! +tooltip.actuallyadditions.blockGrinder.desc.2=You get two Dusts per Ore and Extras! +tooltip.actuallyadditions.blockGrinder.desc.3=To crush two ores simultaneously, +tooltip.actuallyadditions.blockGrinder.desc.4=build the Double Crusher! +tooltip.actuallyadditions.blockGrinderDouble.desc.1=Crushes Ores into Dusts! +tooltip.actuallyadditions.blockGrinderDouble.desc.2=You get two Dusts per Ore and Extras! +tooltip.actuallyadditions.blockGrinderDouble.desc.3=Can crush two Ores simultaneously! +tooltip.actuallyadditions.blockFurnaceDouble.desc=Smelts two Things simultaneously! + +tooltip.actuallyadditions.itemMiscMashedFood.desc=Used to make Fertilizer +tooltip.actuallyadditions.itemFertilizer.desc=Om nom nom. Don't eat it. +tooltip.actuallyadditions.itemMiscDough.desc=Used to make things that involve dough. +tooltip.actuallyadditions.itemMiscPaperCone.desc=Used to store foodstuffs! +tooltip.actuallyadditions.itemMiscKnifeBlade.desc=Sharp like a tooth! A whale's tooth! +tooltip.actuallyadditions.itemMiscKnifeHandle.desc=Fits comfortably in your hand. +tooltip.actuallyadditions.itemMiscBlackQuartz.desc=Used in the Quartz Enchanter! + +tooltip.actuallyadditions.itemKnife.desc=Cuts things! Only food though, don't think of stuff... +tooltip.actuallyadditions.itemPickaxeEmerald.desc=Mines Stone. +tooltip.actuallyadditions.itemAxeEmerald.desc=Mines Wood. +tooltip.actuallyadditions.itemShovelEmerald.desc=Mines Dirt. +tooltip.actuallyadditions.itemHoeEmerald.desc=Mines... uhm... yea. +tooltip.actuallyadditions.itemSwordEmerald.desc=Mines... mobs? +tooltip.actuallyadditions.itemPickaxeObsidian.desc=Mines Stone. Slooooowly. +tooltip.actuallyadditions.itemAxeObsidian.desc=Mines Wood. Slooooowly. +tooltip.actuallyadditions.itemShovelObsidian.desc=Mines Dirt. Slooooowly. +tooltip.actuallyadditions.itemHoeObsidian.desc=Mines... uhm... yea. +tooltip.actuallyadditions.itemSwordObsidian.desc=Mines... mobs? +tooltip.actuallyadditions.itemCrafterOnAStick.desc=A Crafting Table you can carry around! + +tooltip.actuallyadditions.itemFoodBaguette.desc=It's french. It's noms. +tooltip.actuallyadditions.itemFoodPizza.desc=Who doesn't like it? +tooltip.actuallyadditions.itemFoodHamburger.desc=It's from a german city! +tooltip.actuallyadditions.itemFoodBigCookie.desc=Do you know? The Subway Thing? +tooltip.actuallyadditions.itemFoodSubmarineSandwich.desc=Just like Subway used to make! ...still does, right? +tooltip.actuallyadditions.itemFoodToast.desc="GHOSTS! GHOSTS! TOASTS!" +tooltip.actuallyadditions.itemFoodChocolate.desc=Lari likes. +tooltip.actuallyadditions.itemFoodChocolateCake.desc=Looks delicious. With redberries. Or something. +tooltip.actuallyadditions.itemFoodNoodle.desc=Just one. Like... that's not much. +tooltip.actuallyadditions.itemFoodSpaghetti.desc=The most generic food ever. So clichée. +tooltip.actuallyadditions.itemFoodFrenchFry.desc=French. Fry. +tooltip.actuallyadditions.itemFoodFrenchFries.desc=Much like French Fires, but actually taste good. +tooltip.actuallyadditions.itemFoodFishNChips.desc=It's Fish. It's Chips. Or French Fries. Whatevs. +tooltip.actuallyadditions.itemFoodCarrotJuice.desc=Carrots, but pressed! +tooltip.actuallyadditions.itemFoodPumpkinStew.desc=Like Mushroom Stew or Rabbit Stew, but pumpykinny. +tooltip.actuallyadditions.itemFoodCheese.desc=Cheese. + +tooltip.actuallyadditions.itemSpecialUnknownSubstance.desc=Dropped by Skeletons. BETA INFO: Useless as of yet. +tooltip.actuallyadditions.itemSpecialSolidifiedExperience.desc=Dropped by everyone. BETA INFO: Useless as of yet. +tooltip.actuallyadditions.itemSpecialBloodFragment.desc=Dropped by everyone. BETA INFO: Useless as of yet. +tooltip.actuallyadditions.itemSpecialHeartPart.desc=Dropped by everyone. BETA INFO: Useless as of yet. +tooltip.actuallyadditions.itemSpecialPearlShard.desc=Dropped by Endermen. BETA INFO: Useless as of yet. +tooltip.actuallyadditions.itemSpecialEmeraldShard.desc=Dropped by Creepers. BETA INFO: Useless as of yet. + +tooltip.actuallyadditions.itemDustIron.desc=Iron! Crushed in the Crusher! +tooltip.actuallyadditions.itemDustGold.desc=Gold! Crushed in the Crusher! +tooltip.actuallyadditions.itemDustDiamond.desc=Diamond! Crushed in the Crusher! +tooltip.actuallyadditions.itemDustLapis.desc=Lapis! Crushed in the Crusher! +tooltip.actuallyadditions.itemDustEmerald.desc=Emerald! Crushed in the Crusher! + +achievement.actuallyadditions.smeltBaguette=Better than Bread! +achievement.actuallyadditions.smeltBaguette.desc=Bake a Baguette +achievement.actuallyadditions.craftDough=Knead, knead! +achievement.actuallyadditions.craftDough.desc=Craft some Dough +achievement.actuallyadditions.craftCompost=Throw it all in! +achievement.actuallyadditions.craftCompost.desc=Craft a Compost +achievement.actuallyadditions.craftFertilizer=Better than Bone Meal! +achievement.actuallyadditions.craftFertilizer.desc=Make Fertilizer +achievement.actuallyadditions.craftSubSandwich=Metro, Underground, Tube, Nom! +achievement.actuallyadditions.craftSubSandwich.desc=Craft a Submarine Sandwich +achievement.actuallyadditions.craftPaperCone=Witch's hat! +achievement.actuallyadditions.craftPaperCone.desc=Craft a Paper Cone +achievement.actuallyadditions.craftFrenchFry=Just the single one... +achievement.actuallyadditions.craftFrenchFry.desc=Craft a French Fry +achievement.actuallyadditions.craftFrenchFries=French Fires? +achievement.actuallyadditions.craftFrenchFries.desc=Craft French Fries +achievement.actuallyadditions.craftFishNChips=It's Fish! It's Chips! +achievement.actuallyadditions.craftFishNChips.desc=Craft Fish 'N' Chips +achievement.actuallyadditions.craftMashedFood=Munch munch munch! +achievement.actuallyadditions.craftMashedFood.desc=Craft Mashed Food +achievement.actuallyadditions.craftKnifeBlade=Sharp! So sharp! +achievement.actuallyadditions.craftKnifeBlade.desc=Craft a Knife Blade +achievement.actuallyadditions.craftKnife=Sharper! Even sharper! +achievement.actuallyadditions.craftKnife.desc=Craft a Knife + +info.actuallyadditions.feeder.animals.desc=Animals +info.actuallyadditions.feeder.enoughToBreed.desc=Enough to breed! +info.actuallyadditions.feeder.tooMany.desc=Too many to breed! +info.actuallyadditions.feeder.notEnough.desc=Not enough to breed! \ No newline at end of file diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFeeder.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFeeder.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFeeder.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFeeder.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFeederTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFeederTop.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFeederTop.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFeederTop.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDouble.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDouble.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDouble.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDouble.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleFront.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleFront.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleFront.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleFront.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleOn.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleOn.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleTop.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockFurnaceDoubleTop.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockFurnaceDoubleTop.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGiantChest.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGiantChest.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGiantChest.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGiantChest.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGiantChestTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGiantChestTop.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGiantChestTop.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGiantChestTop.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinder.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinder.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinder.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinder.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderBottom.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderBottom.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderBottom.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderBottom.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderDouble.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderDouble.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderDouble.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderDouble.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderOn.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderOn.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderOn.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderTop.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockGrinderTop.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockGrinderTop.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartz.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartz.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartz.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartz.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartzChiseled.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartzChiseled.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartzChiseled.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartzChiseled.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartzPillar.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartzPillar.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscBlackQuartzPillar.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscBlackQuartzPillar.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscOreBlackQuartz.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscOreBlackQuartz.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/blockMiscOreBlackQuartz.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/blockMiscOreBlackQuartz.png diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/crash-2015-03-07_03.56.11-client.txt b/src/main/resources/assets/actuallyadditions/textures/blocks/crash-2015-03-07_03.56.11-client.txt new file mode 100644 index 000000000..5bd4c464d --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/textures/blocks/crash-2015-03-07_03.56.11-client.txt @@ -0,0 +1,73 @@ +---- Minecraft Crash Report ---- +// Don't do that. + +Time: 07.03.15 03:56 +Description: There was a severe problem during mod loading that has caused the game to fail + +cpw.mods.fml.common.LoaderException: java.lang.NoSuchMethodError: net.minecraft.item.Item$ToolMaterial.setRepairItem(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/Item$ToolMaterial; + at cpw.mods.fml.common.LoadController.transition(LoadController.java:162) + at cpw.mods.fml.common.Loader.preinitializeMods(Loader.java:515) + at cpw.mods.fml.client.FMLClientHandler.beginMinecraftLoading(FMLClientHandler.java:239) + at net.minecraft.client.Minecraft.func_71384_a(Minecraft.java:480) + at net.minecraft.client.Minecraft.func_99999_d(Minecraft.java:867) + at net.minecraft.client.main.Main.main(SourceFile:148) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at net.minecraft.launchwrapper.Launch.launch(Launch.java:135) + at net.minecraft.launchwrapper.Launch.main(Launch.java:28) +Caused by: java.lang.NoSuchMethodError: net.minecraft.item.Item$ToolMaterial.setRepairItem(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/Item$ToolMaterial; + at ellpeck.actuallyadditions.material.InitItemMaterials.init(InitItemMaterials.java:19) + at ellpeck.actuallyadditions.SomePrettyRandomStuff.preInit(SomePrettyRandomStuff.java:40) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at cpw.mods.fml.common.FMLModContainer.handleModStateEvent(FMLModContainer.java:513) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.sendEventToModContainer(LoadController.java:208) + at cpw.mods.fml.common.LoadController.propogateStateMessage(LoadController.java:187) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at com.google.common.eventbus.EventSubscriber.handleEvent(EventSubscriber.java:74) + at com.google.common.eventbus.SynchronizedEventSubscriber.handleEvent(SynchronizedEventSubscriber.java:47) + at com.google.common.eventbus.EventBus.dispatch(EventBus.java:322) + at com.google.common.eventbus.EventBus.dispatchQueuedEvents(EventBus.java:304) + at com.google.common.eventbus.EventBus.post(EventBus.java:275) + at cpw.mods.fml.common.LoadController.distributeStateMessage(LoadController.java:118) + at cpw.mods.fml.common.Loader.preinitializeMods(Loader.java:513) + ... 10 more + + +A detailed walkthrough of the error, its code path and all known details is as follows: +--------------------------------------------------------------------------------------- + +-- System Details -- +Details: + Minecraft Version: 1.7.10 + Operating System: Windows 7 (amd64) version 6.1 + Java Version: 1.8.0_25, Oracle Corporation + Java VM Version: Java HotSpot(TM) 64-Bit Server VM (mixed mode), Oracle Corporation + Memory: 122065264 bytes (116 MB) / 289173504 bytes (275 MB) up to 3207856128 bytes (3059 MB) + JVM Flags: 6 total; -XX:HeapDumpPath=MojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump -Xmx3G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M + AABB Pool Size: 0 (0 bytes; 0 MB) allocated, 0 (0 bytes; 0 MB) used + IntCache: cache: 0, tcache: 0, allocated: 0, tallocated: 0 + FML: MCP v9.05 FML v7.10.85.1232 Minecraft Forge 10.13.2.1232 Optifine OptiFine_1.7.10_HD_A4 7 mods loaded, 7 mods active + mcp{9.05} [Minecraft Coder Pack] (minecraft.jar) Unloaded->Constructed->Pre-initialized + FML{7.10.85.1232} [Forge Mod Loader] (forge-1.7.10-10.13.2.1232.jar) Unloaded->Constructed->Pre-initialized + Forge{10.13.2.1232} [Minecraft Forge] (forge-1.7.10-10.13.2.1232.jar) Unloaded->Constructed->Pre-initialized + AIRI{3.0.0-1.7.10} [AIRI] ([1.7.10-10.13.0.1158][3.0.0-1.7.10] AIRI.jar) Unloaded->Constructed->Pre-initialized + AliensVsPredator{3.9.14-1.7.10} [AliensVsPredator] ([Current] AliensVsPredator.jar) Unloaded->Constructed->Pre-initialized + SGCraft{1.8.4} [Greg's SG Craft] (SGCraft-1.8.4-mc1.7.10.jar) Unloaded->Constructed->Pre-initialized + SomePrettyRandomStuff{1.7.10-0.0.1} [Some Pretty Random Stuff] (SomePrettyRandomStuff-1.7.10-0.0.1.jar) Unloaded->Constructed->Errored \ No newline at end of file diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/blocks/models/modelCompost.png b/src/main/resources/assets/actuallyadditions/textures/blocks/models/modelCompost.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/blocks/models/modelCompost.png rename to src/main/resources/assets/actuallyadditions/textures/blocks/models/modelCompost.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiFeeder.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiFeeder.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiFeeder.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiFeeder.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiFurnaceDouble.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiFurnaceDouble.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiFurnaceDouble.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiFurnaceDouble.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGiantChest.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiGiantChest.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGiantChest.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiGiantChest.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGrinder.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiGrinder.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGrinder.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiGrinder.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGrinderDouble.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiGrinderDouble.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiGrinderDouble.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiGrinderDouble.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/gui/guiInventory.png b/src/main/resources/assets/actuallyadditions/textures/gui/guiInventory.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/gui/guiInventory.png rename to src/main/resources/assets/actuallyadditions/textures/gui/guiInventory.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemAxeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemAxeEmerald.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemAxeEmerald.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemAxeObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemAxeObsidian.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemAxeObsidian.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemAxeObsidian.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemCrafterOnAStick.png b/src/main/resources/assets/actuallyadditions/textures/items/itemCrafterOnAStick.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemCrafterOnAStick.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemCrafterOnAStick.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemDust.png b/src/main/resources/assets/actuallyadditions/textures/items/itemDust.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemDust.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemDust.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFertilizer.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFertilizer.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFertilizer.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFertilizer.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodBaguette.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodBaguette.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodBigCookie.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodBigCookie.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCarrotJuice.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodCarrotJuice.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodCheese.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolate.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodChocolateCake.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodFishNChips.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodFishNChips.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodFrenchFries.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodFrenchFries.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodFrenchFry.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodFrenchFry.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodHamburger.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodHamburger.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodNoodle.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodNoodle.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodPizza.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodPumpkinStew.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodPumpkinStew.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodSpaghetti.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodSpaghetti.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodSubmarineSandwich.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodSubmarineSandwich.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png b/src/main/resources/assets/actuallyadditions/textures/items/itemFoodToast.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemFoodToast.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemHoeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemHoeEmerald.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemHoeEmerald.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemHoeObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemHoeObsidian.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemHoeObsidian.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemHoeObsidian.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemKnife.png b/src/main/resources/assets/actuallyadditions/textures/items/itemKnife.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemKnife.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemKnife.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscBlackQuartz.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscBlackQuartz.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscBlackQuartz.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscBlackQuartz.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscDough.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscDough.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscKnifeBlade.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscKnifeBlade.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscKnifeBlade.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscKnifeBlade.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscKnifeHandle.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscKnifeHandle.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscKnifeHandle.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscKnifeHandle.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscMashedFood.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscMashedFood.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscMashedFood.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscMashedFood.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscPaperCone.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemMiscPaperCone.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemPickaxeEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemPickaxeEmerald.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeEmerald.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemPickaxeObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeObsidian.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemPickaxeObsidian.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemPickaxeObsidian.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemShovelEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemShovelEmerald.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemShovelEmerald.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemShovelObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemShovelObsidian.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemShovelObsidian.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemShovelObsidian.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemSwordEmerald.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemSwordEmerald.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemSwordEmerald.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemSwordObsidian.png b/src/main/resources/assets/actuallyadditions/textures/items/itemSwordObsidian.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/items/itemSwordObsidian.png rename to src/main/resources/assets/actuallyadditions/textures/items/itemSwordObsidian.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/logo.png b/src/main/resources/assets/actuallyadditions/textures/logo.png similarity index 100% rename from src/main/resources/assets/someprettyrandomstuff/textures/logo.png rename to src/main/resources/assets/actuallyadditions/textures/logo.png diff --git a/src/main/resources/assets/actuallyadditions/textures/logoBig.png b/src/main/resources/assets/actuallyadditions/textures/logoBig.png new file mode 100644 index 000000000..6668a4512 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/logoBig.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang b/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang deleted file mode 100644 index 217220c21..000000000 --- a/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang +++ /dev/null @@ -1,167 +0,0 @@ -itemGroup.someprettyrandomstuff=SomePrettyRandomStuff -achievement.page.someprettyrandomstuff=SomePrettyRandomStuff - -tile.someprettyrandomstuff.blockCompost.name=Compost -tile.someprettyrandomstuff.blockMiscOreBlackQuartz.name=Black Quartz Ore -tile.someprettyrandomstuff.blockMiscBlackQuartz.name=Block of Black Quartz -tile.someprettyrandomstuff.blockMiscBlackQuartzChiseled.name=Chiseled Block of Black Quartz -tile.someprettyrandomstuff.blockMiscBlackQuartzPillar.name=Pillar of Black Quartz -tile.someprettyrandomstuff.blockFeeder.name=Automatic Feeder -tile.someprettyrandomstuff.blockGiantChest.name=Giant Chest -tile.someprettyrandomstuff.blockGrinder.name=Crusher -tile.someprettyrandomstuff.blockGrinderDouble.name=Double Crusher -tile.someprettyrandomstuff.blockFurnaceDouble.name=Double Furnace - -item.someprettyrandomstuff.itemMiscMashedFood.name=Mashed Food -item.someprettyrandomstuff.itemFertilizer.name=Fertilizer -item.someprettyrandomstuff.itemMiscDough.name=Dough -item.someprettyrandomstuff.itemMiscPaperCone.name=Paper Cone -item.someprettyrandomstuff.itemMiscKnifeBlade.name=Knife Blade -item.someprettyrandomstuff.itemMiscKnifeHandle.name=Knife Handle -item.someprettyrandomstuff.itemMiscBlackQuartz.name=Black Quartz - -item.someprettyrandomstuff.itemKnife.name=Knife -item.someprettyrandomstuff.itemPickaxeEmerald.name=Emerald Pickaxe -item.someprettyrandomstuff.itemAxeEmerald.name=Emerald Axe -item.someprettyrandomstuff.itemShovelEmerald.name=Emerald Shovel -item.someprettyrandomstuff.itemHoeEmerald.name=Emerald Hoe -item.someprettyrandomstuff.itemSwordEmerald.name=Emerald Sword -item.someprettyrandomstuff.itemPickaxeObsidian.name=Obsidian Pickaxe -item.someprettyrandomstuff.itemAxeObsidian.name=Obsidian Axe -item.someprettyrandomstuff.itemShovelObsidian.name=Obsidian Shovel -item.someprettyrandomstuff.itemHoeObsidian.name=Obsidian Hoe -item.someprettyrandomstuff.itemSwordObsidian.name=Obsidian Sword -item.someprettyrandomstuff.itemCrafterOnAStick.name=Crafting Table On A Stick - -item.someprettyrandomstuff.itemFoodBaguette.name=Baguette -item.someprettyrandomstuff.itemFoodPizza.name=Pizza -item.someprettyrandomstuff.itemFoodHamburger.name=Hamburger -item.someprettyrandomstuff.itemFoodBigCookie.name=Big Cookie -item.someprettyrandomstuff.itemFoodSubmarineSandwich.name=Submarine Sandwich -item.someprettyrandomstuff.itemFoodToast.name=Toast -item.someprettyrandomstuff.itemFoodChocolate.name=Chocolate -item.someprettyrandomstuff.itemFoodChocolateCake.name=Chocolate Cake -item.someprettyrandomstuff.itemFoodNoodle.name=Noodle -item.someprettyrandomstuff.itemFoodSpaghetti.name=Spaghetti -item.someprettyrandomstuff.itemFoodFrenchFry.name=French Fry -item.someprettyrandomstuff.itemFoodFrenchFries.name=French Fries -item.someprettyrandomstuff.itemFoodFishNChips.name=Fish 'N' Chips -item.someprettyrandomstuff.itemFoodCarrotJuice.name=Carrot Juice -item.someprettyrandomstuff.itemFoodPumpkinStew.name=Pumpkin Stew -item.someprettyrandomstuff.itemFoodCheese.name=Cheese - -item.someprettyrandomstuff.itemSpecialUnknownSubstance.name=Unknown Substance -item.someprettyrandomstuff.itemSpecialSolidifiedExperience.name=Solidified Experience -item.someprettyrandomstuff.itemSpecialBloodFragment.name=Blood Fragment -item.someprettyrandomstuff.itemSpecialHeartPart.name=Part of a Heart -item.someprettyrandomstuff.itemSpecialPearlShard.name=Ender Pearl Shard -item.someprettyrandomstuff.itemSpecialEmeraldShard.name=Emerald Shard - -item.someprettyrandomstuff.itemDustIron.name=Crushed Iron -item.someprettyrandomstuff.itemDustGold.name=Crushed Gold -item.someprettyrandomstuff.itemDustDiamond.name=Crushed Diamond -item.someprettyrandomstuff.itemDustLapis.name=Crushed Lapis -item.someprettyrandomstuff.itemDustEmerald.name=Crushed Emerald - -tooltip.someprettyrandomstuff.shiftForInfo.desc=Press Shift for Info -tooltip.someprettyrandomstuff.hunger.desc=Fills -tooltip.someprettyrandomstuff.saturation.desc=Saturation -tooltip.someprettyrandomstuff.durability.desc=Durability - -tooltip.someprettyrandomstuff.blockCompost.desc.1=Used to make Fertilizer with Mashed Food -tooltip.someprettyrandomstuff.blockCompost.desc.2=BETA INFO: Will visually contain Compost in the Future! -tooltip.someprettyrandomstuff.blockMiscOreBlackQuartz.desc=The darkest form of Quartz. Also: You had Silk Touch! -tooltip.someprettyrandomstuff.blockMiscBlackQuartz.desc=Black, eerie Quartz! Nice for decorating. -tooltip.someprettyrandomstuff.blockMiscBlackQuartzChiseled.desc=Black, eerie chiseled Quartz! Nice for decorating. -tooltip.someprettyrandomstuff.blockMiscBlackQuartzPillar.desc=Kind of a pillar. Not really, though. It's fake! Fake I say! -tooltip.someprettyrandomstuff.blockFeeder.desc=Feeds Animals on its own! -tooltip.someprettyrandomstuff.blockGiantChest.desc=GUI Scale on 'Auto'? That's a problem! -tooltip.someprettyrandomstuff.blockGrinder.desc.1=Crushes Ores into Dusts! -tooltip.someprettyrandomstuff.blockGrinder.desc.2=You get two Dusts per Ore and Extras! -tooltip.someprettyrandomstuff.blockGrinder.desc.3=To crush two ores simultaneously, -tooltip.someprettyrandomstuff.blockGrinder.desc.4=build the Double Crusher! -tooltip.someprettyrandomstuff.blockGrinderDouble.desc.1=Crushes Ores into Dusts! -tooltip.someprettyrandomstuff.blockGrinderDouble.desc.2=You get two Dusts per Ore and Extras! -tooltip.someprettyrandomstuff.blockGrinderDouble.desc.3=Can crush two Ores simultaneously! -tooltip.someprettyrandomstuff.blockFurnaceDouble.desc=Smelts two Things simultaneously! - -tooltip.someprettyrandomstuff.itemMiscMashedFood.desc=Used to make Fertilizer -tooltip.someprettyrandomstuff.itemFertilizer.desc=Om nom nom. Don't eat it. -tooltip.someprettyrandomstuff.itemMiscDough.desc=Used to make things that involve dough. -tooltip.someprettyrandomstuff.itemMiscPaperCone.desc=Used to store foodstuffs! -tooltip.someprettyrandomstuff.itemMiscKnifeBlade.desc=Sharp like a tooth! A whale's tooth! -tooltip.someprettyrandomstuff.itemMiscKnifeHandle.desc=Fits comfortably in your hand. -tooltip.someprettyrandomstuff.itemMiscBlackQuartz.desc=Used in the Quartz Enchanter! - -tooltip.someprettyrandomstuff.itemKnife.desc=Cuts things! Only food though, don't think of stuff... -tooltip.someprettyrandomstuff.itemPickaxeEmerald.desc=Mines Stone. -tooltip.someprettyrandomstuff.itemAxeEmerald.desc=Mines Wood. -tooltip.someprettyrandomstuff.itemShovelEmerald.desc=Mines Dirt. -tooltip.someprettyrandomstuff.itemHoeEmerald.desc=Mines... uhm... yea. -tooltip.someprettyrandomstuff.itemSwordEmerald.desc=Mines... mobs? -tooltip.someprettyrandomstuff.itemPickaxeObsidian.desc=Mines Stone. Slooooowly. -tooltip.someprettyrandomstuff.itemAxeObsidian.desc=Mines Wood. Slooooowly. -tooltip.someprettyrandomstuff.itemShovelObsidian.desc=Mines Dirt. Slooooowly. -tooltip.someprettyrandomstuff.itemHoeObsidian.desc=Mines... uhm... yea. -tooltip.someprettyrandomstuff.itemSwordObsidian.desc=Mines... mobs? -tooltip.someprettyrandomstuff.itemCrafterOnAStick.desc=A Crafting Table you can carry around! - -tooltip.someprettyrandomstuff.itemFoodBaguette.desc=It's french. It's noms. -tooltip.someprettyrandomstuff.itemFoodPizza.desc=Who doesn't like it? -tooltip.someprettyrandomstuff.itemFoodHamburger.desc=It's from a german city! -tooltip.someprettyrandomstuff.itemFoodBigCookie.desc=Do you know? The Subway Thing? -tooltip.someprettyrandomstuff.itemFoodSubmarineSandwich.desc=Just like Subway used to make! ...still does, right? -tooltip.someprettyrandomstuff.itemFoodToast.desc="GHOSTS! GHOSTS! TOASTS!" -tooltip.someprettyrandomstuff.itemFoodChocolate.desc=Lari likes. -tooltip.someprettyrandomstuff.itemFoodChocolateCake.desc=Looks delicious. With redberries. Or something. -tooltip.someprettyrandomstuff.itemFoodNoodle.desc=Just one. Like... that's not much. -tooltip.someprettyrandomstuff.itemFoodSpaghetti.desc=The most generic food ever. So clichée. -tooltip.someprettyrandomstuff.itemFoodFrenchFry.desc=French. Fry. -tooltip.someprettyrandomstuff.itemFoodFrenchFries.desc=Much like French Fires, but actually taste good. -tooltip.someprettyrandomstuff.itemFoodFishNChips.desc=It's Fish. It's Chips. Or French Fries. Whatevs. -tooltip.someprettyrandomstuff.itemFoodCarrotJuice.desc=Carrots, but pressed! -tooltip.someprettyrandomstuff.itemFoodPumpkinStew.desc=Like Mushroom Stew or Rabbit Stew, but pumpykinny. -tooltip.someprettyrandomstuff.itemFoodCheese.desc=Cheese. - -tooltip.someprettyrandomstuff.itemSpecialUnknownSubstance.desc=Dropped by Skeletons. BETA INFO: Useless as of yet. -tooltip.someprettyrandomstuff.itemSpecialSolidifiedExperience.desc=Dropped by everyone. BETA INFO: Useless as of yet. -tooltip.someprettyrandomstuff.itemSpecialBloodFragment.desc=Dropped by everyone. BETA INFO: Useless as of yet. -tooltip.someprettyrandomstuff.itemSpecialHeartPart.desc=Dropped by everyone. BETA INFO: Useless as of yet. -tooltip.someprettyrandomstuff.itemSpecialPearlShard.desc=Dropped by Endermen. BETA INFO: Useless as of yet. -tooltip.someprettyrandomstuff.itemSpecialEmeraldShard.desc=Dropped by Creepers. BETA INFO: Useless as of yet. - -tooltip.someprettyrandomstuff.itemDustIron.desc=Iron! Crushed in the Crusher! -tooltip.someprettyrandomstuff.itemDustGold.desc=Gold! Crushed in the Crusher! -tooltip.someprettyrandomstuff.itemDustDiamond.desc=Diamond! Crushed in the Crusher! -tooltip.someprettyrandomstuff.itemDustLapis.desc=Lapis! Crushed in the Crusher! -tooltip.someprettyrandomstuff.itemDustEmerald.desc=Emerald! Crushed in the Crusher! - -achievement.someprettyrandomstuff.smeltBaguette=Better than Bread! -achievement.someprettyrandomstuff.smeltBaguette.desc=Bake a Baguette -achievement.someprettyrandomstuff.craftDough=Knead, knead! -achievement.someprettyrandomstuff.craftDough.desc=Craft some Dough -achievement.someprettyrandomstuff.craftCompost=Throw it all in! -achievement.someprettyrandomstuff.craftCompost.desc=Craft a Compost -achievement.someprettyrandomstuff.craftFertilizer=Better than Bone Meal! -achievement.someprettyrandomstuff.craftFertilizer.desc=Make Fertilizer -achievement.someprettyrandomstuff.craftSubSandwich=Metro, Underground, Tube, Nom! -achievement.someprettyrandomstuff.craftSubSandwich.desc=Craft a Submarine Sandwich -achievement.someprettyrandomstuff.craftPaperCone=Witch's hat! -achievement.someprettyrandomstuff.craftPaperCone.desc=Craft a Paper Cone -achievement.someprettyrandomstuff.craftFrenchFry=Just the single one... -achievement.someprettyrandomstuff.craftFrenchFry.desc=Craft a French Fry -achievement.someprettyrandomstuff.craftFrenchFries=French Fires? -achievement.someprettyrandomstuff.craftFrenchFries.desc=Craft French Fries -achievement.someprettyrandomstuff.craftFishNChips=It's Fish! It's Chips! -achievement.someprettyrandomstuff.craftFishNChips.desc=Craft Fish 'N' Chips -achievement.someprettyrandomstuff.craftMashedFood=Munch munch munch! -achievement.someprettyrandomstuff.craftMashedFood.desc=Craft Mashed Food -achievement.someprettyrandomstuff.craftKnifeBlade=Sharp! So sharp! -achievement.someprettyrandomstuff.craftKnifeBlade.desc=Craft a Knife Blade -achievement.someprettyrandomstuff.craftKnife=Sharper! Even sharper! -achievement.someprettyrandomstuff.craftKnife.desc=Craft a Knife - -info.someprettyrandomstuff.feeder.animals.desc=Animals -info.someprettyrandomstuff.feeder.enoughToBreed.desc=Enough to breed! -info.someprettyrandomstuff.feeder.tooMany.desc=Too many to breed! -info.someprettyrandomstuff.feeder.notEnough.desc=Not enough to breed! \ No newline at end of file diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 16197a4da..17e06f849 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "SomePrettyRandomStuff", "name": "Some Pretty Random Stuff", "description": "A bunch of random stuff added to your Game to make it even more fun, exciting and add some more variety!", - "version": "0.0.1", + "version": "0.0.1.1", "mcversion": "1.7.10", "url": "https://github.com/Ellpeck/SomePrettyRandomStuff", "updateUrl": "",