Renaaaaaame! \o/
|
@ -17,9 +17,9 @@ buildscript {
|
||||||
|
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
|
|
||||||
version = "1.7.10-0.0.1"
|
version = "1.7.10-0.0.1.1"
|
||||||
group = "ellpeck.someprettyrandomstuff"
|
group = "ellpeck.actuallyadditions"
|
||||||
archivesBaseName = "SomePrettyRandomStuff"
|
archivesBaseName = "ActuallyAdditions"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.7.10-10.13.2.1291"
|
version = "1.7.10-10.13.2.1291"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff;
|
package ellpeck.actuallyadditions;
|
||||||
|
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
import cpw.mods.fml.common.Mod.EventHandler;
|
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.FMLInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||||
import ellpeck.someprettyrandomstuff.achievement.InitAchievements;
|
import ellpeck.actuallyadditions.achievement.InitAchievements;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.InitBlocks;
|
import ellpeck.actuallyadditions.blocks.InitBlocks;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigurationHandler;
|
import ellpeck.actuallyadditions.config.ConfigurationHandler;
|
||||||
import ellpeck.someprettyrandomstuff.crafting.InitCrafting;
|
import ellpeck.actuallyadditions.crafting.InitCrafting;
|
||||||
import ellpeck.someprettyrandomstuff.event.InitEvents;
|
import ellpeck.actuallyadditions.event.InitEvents;
|
||||||
import ellpeck.someprettyrandomstuff.gen.OreGen;
|
import ellpeck.actuallyadditions.gen.OreGen;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.material.InitItemMaterials;
|
import ellpeck.actuallyadditions.material.InitItemMaterials;
|
||||||
import ellpeck.someprettyrandomstuff.network.PacketHandler;
|
import ellpeck.actuallyadditions.network.PacketHandler;
|
||||||
import ellpeck.someprettyrandomstuff.oredict.OreDictRegistry;
|
import ellpeck.actuallyadditions.oredict.OreDictRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.proxy.IProxy;
|
import ellpeck.actuallyadditions.proxy.IProxy;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
|
|
||||||
@Mod(modid = Util.MOD_ID, name = Util.NAME, version = Util.VERSION)
|
@Mod(modid = Util.MOD_ID, name = Util.NAME, version = Util.VERSION)
|
||||||
public class SomePrettyRandomStuff{
|
public class ActuallyAdditions{
|
||||||
|
|
||||||
@Instance(Util.MOD_ID)
|
@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;
|
public static IProxy proxy;
|
||||||
|
|
||||||
@EventHandler()
|
@EventHandler()
|
|
@ -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.item.ItemStack;
|
||||||
import net.minecraft.stats.Achievement;
|
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);
|
super("achievement." + Util.MOD_ID_LOWER +"." + Util.MOD_ID_LOWER + "." + name, Util.MOD_ID_LOWER + "." + name, x, y, displayStack, hasToHaveBefore);
|
||||||
InitAchievements.achievementList.add(this);
|
InitAchievements.achievementList.add(this);
|
||||||
if(hasToHaveBefore == null) this.initIndependentStat();
|
if(hasToHaveBefore == null) this.initIndependentStat();
|
|
@ -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<Achievement> achievementList = new ArrayList<Achievement>();
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -1,16 +1,16 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.achievement.InitAchievements;
|
import ellpeck.actuallyadditions.achievement.InitAchievements;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.ItemFertilizer;
|
import ellpeck.actuallyadditions.items.ItemFertilizer;
|
||||||
import ellpeck.someprettyrandomstuff.items.ItemMisc;
|
import ellpeck.actuallyadditions.items.ItemMisc;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityCompost;
|
import ellpeck.actuallyadditions.tile.TileEntityCompost;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
|
@ -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.BlockContainer;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
|
@ -1,14 +1,13 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder;
|
import ellpeck.actuallyadditions.tile.TileEntityFeeder;
|
||||||
import ellpeck.someprettyrandomstuff.util.IInformation;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
|
@ -23,7 +22,7 @@ import net.minecraft.world.World;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class BlockFeeder extends BlockContainerBase implements IName, IInformation{
|
public class BlockFeeder extends BlockContainerBase implements IName{
|
||||||
|
|
||||||
private IIcon topIcon;
|
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){
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
|
||||||
if(!world.isRemote){
|
if(!world.isRemote){
|
||||||
TileEntityFeeder feeder = (TileEntityFeeder)world.getTileEntity(x, y, z);
|
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;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
@ -74,11 +73,6 @@ public class BlockFeeder extends BlockContainerBase implements IName, IInformati
|
||||||
return "blockFeeder";
|
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{
|
public static class TheItemBlock extends ItemBlock{
|
||||||
|
|
||||||
private Block theBlock;
|
private Block theBlock;
|
|
@ -1,13 +1,13 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble;
|
import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
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){
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
|
||||||
if(!world.isRemote){
|
if(!world.isRemote){
|
||||||
TileEntityFurnaceDouble furnace = (TileEntityFurnaceDouble)world.getTileEntity(x, y, z);
|
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;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
|
@ -1,13 +1,13 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGiantChest;
|
import ellpeck.actuallyadditions.tile.TileEntityGiantChest;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
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){
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
|
||||||
if(!world.isRemote){
|
if(!world.isRemote){
|
||||||
TileEntityGiantChest chest = (TileEntityGiantChest)world.getTileEntity(x, y, z);
|
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;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
|
@ -1,13 +1,13 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder;
|
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
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){
|
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9){
|
||||||
if(!world.isRemote){
|
if(!world.isRemote){
|
||||||
TileEntityGrinder grinder = (TileEntityGrinder)world.getTileEntity(x, y, z);
|
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;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
|
@ -1,13 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks;
|
package ellpeck.actuallyadditions.blocks;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.metalists.TheMiscBlocks;
|
import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
|
@ -21,7 +19,6 @@ import net.minecraft.util.IIcon;
|
||||||
import net.minecraft.util.StatCollector;
|
import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
public class BlockMisc extends Block implements IName{
|
public class BlockMisc extends Block implements IName{
|
||||||
|
|
||||||
|
@ -37,24 +34,14 @@ public class BlockMisc extends Block implements IName{
|
||||||
@SuppressWarnings("all")
|
@SuppressWarnings("all")
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void getSubBlocks(Item item, CreativeTabs tab, List list){
|
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));
|
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
|
@Override
|
||||||
public int damageDropped(int meta){
|
public int damageDropped(int meta){
|
||||||
return meta == TheMiscBlocks.ORE_QUARTZ.ordinal() ? TheMiscItems.QUARTZ.ordinal() : super.damageDropped(meta);
|
return meta;
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public int quantityDropped(int meta, int fortune, Random random){
|
|
||||||
return meta == TheMiscBlocks.ORE_QUARTZ.ordinal() ? 1+random.nextInt(2)+fortune : 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -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;
|
import net.minecraft.block.Block;
|
||||||
|
|
||||||
public class InitBlocks{
|
public class InitBlocks{
|
|
@ -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;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
|
||||||
public enum TheMiscBlocks implements IName{
|
public enum TheMiscBlocks implements IName{
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks.render;
|
package ellpeck.actuallyadditions.blocks.render;
|
||||||
|
|
||||||
import net.minecraft.client.model.ModelBase;
|
import net.minecraft.client.model.ModelBase;
|
||||||
|
|
||||||
public class ModelBaseSPRS extends ModelBase{
|
public class ModelBaseAA extends ModelBase{
|
||||||
|
|
||||||
public void render(float f){
|
public void render(float f){
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.blocks.render;
|
package ellpeck.actuallyadditions.blocks.render;
|
||||||
|
|
||||||
import net.minecraft.client.model.ModelRenderer;
|
import net.minecraft.client.model.ModelRenderer;
|
||||||
|
|
||||||
public class ModelCompost extends ModelBaseSPRS{
|
public class ModelCompost extends ModelBaseAA{
|
||||||
|
|
||||||
public ModelRenderer floor;
|
public ModelRenderer floor;
|
||||||
public ModelRenderer wallOne;
|
public ModelRenderer wallOne;
|
|
@ -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.client.Minecraft;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
@ -9,10 +9,10 @@ import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
public class RenderItems implements IItemRenderer{
|
public class RenderItems implements IItemRenderer{
|
||||||
|
|
||||||
ModelBaseSPRS theModel;
|
ModelBaseAA theModel;
|
||||||
ResourceLocation theTexture;
|
ResourceLocation theTexture;
|
||||||
|
|
||||||
public RenderItems(ModelBaseSPRS model){
|
public RenderItems(ModelBaseAA model){
|
||||||
this.theModel = model;
|
this.theModel = model;
|
||||||
this.theTexture = new ResourceLocation(Util.MOD_ID_LOWER, "textures/blocks/models/" + this.theModel.getName() + ".png");
|
this.theTexture = new ResourceLocation(Util.MOD_ID_LOWER, "textures/blocks/models/" + this.theModel.getName() + ".png");
|
||||||
}
|
}
|
|
@ -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.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
@ -8,9 +8,9 @@ import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
public class RenderTileEntity extends TileEntitySpecialRenderer{
|
public class RenderTileEntity extends TileEntitySpecialRenderer{
|
||||||
|
|
||||||
ModelBaseSPRS theModel;
|
ModelBaseAA theModel;
|
||||||
|
|
||||||
public RenderTileEntity(ModelBaseSPRS model){
|
public RenderTileEntity(ModelBaseAA model){
|
||||||
this.theModel = model;
|
this.theModel = model;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.config;
|
package ellpeck.actuallyadditions.config;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import net.minecraftforge.common.config.Configuration;
|
import net.minecraftforge.common.config.Configuration;
|
||||||
|
|
||||||
public class ConfigValues{
|
public class ConfigValues{
|
|
@ -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 net.minecraftforge.common.config.Configuration;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.InitBlocks;
|
import ellpeck.actuallyadditions.blocks.InitBlocks;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,9 +1,9 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheDusts;
|
import ellpeck.actuallyadditions.items.metalists.TheDusts;
|
||||||
import ellpeck.someprettyrandomstuff.recipe.GrinderRecipes;
|
import ellpeck.actuallyadditions.recipe.GrinderRecipes;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
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.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.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();
|
registerFinally();
|
||||||
}
|
}
|
|
@ -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 {
|
public class InitCrafting {
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheDusts;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
@ -32,6 +33,18 @@ public class ItemCrafting{
|
||||||
if(ConfigValues.enabledMiscRecipes[TheMiscItems.MASHED_FOOD.ordinal()])
|
if(ConfigValues.enabledMiscRecipes[TheMiscItems.MASHED_FOOD.ordinal()])
|
||||||
initMashedFoodRecipes();
|
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(){
|
public static void initMashedFoodRecipes(){
|
|
@ -1,9 +1,9 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.crafting;
|
package ellpeck.actuallyadditions.crafting;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.creative;
|
package ellpeck.actuallyadditions.creative;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,12 +1,12 @@
|
||||||
package ellpeck.someprettyrandomstuff.event;
|
package ellpeck.actuallyadditions.event;
|
||||||
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
||||||
import ellpeck.someprettyrandomstuff.achievement.InitAchievements;
|
import ellpeck.actuallyadditions.achievement.InitAchievements;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.InitBlocks;
|
import ellpeck.actuallyadditions.blocks.InitBlocks;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
public class CraftEvent{
|
public class CraftEvent{
|
|
@ -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{
|
public class InitEvents{
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.event;
|
package ellpeck.actuallyadditions.event;
|
||||||
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheSpecialDrops;
|
import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
|
||||||
import net.minecraft.entity.EntityCreature;
|
import net.minecraft.entity.EntityCreature;
|
||||||
import net.minecraft.entity.monster.EntityMob;
|
import net.minecraft.entity.monster.EntityMob;
|
||||||
import net.minecraft.entity.passive.EntityAnimal;
|
import net.minecraft.entity.passive.EntityAnimal;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.event;
|
package ellpeck.actuallyadditions.event;
|
||||||
|
|
||||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||||
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
||||||
import ellpeck.someprettyrandomstuff.achievement.InitAchievements;
|
import ellpeck.actuallyadditions.achievement.InitAchievements;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
|
|
||||||
public class SmeltEvent{
|
public class SmeltEvent{
|
||||||
@SubscribeEvent
|
@SubscribeEvent
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.gen;
|
package ellpeck.actuallyadditions.gen;
|
||||||
|
|
||||||
import cpw.mods.fml.common.IWorldGenerator;
|
import cpw.mods.fml.common.IWorldGenerator;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
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.Block;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.chunk.IChunkProvider;
|
import net.minecraft.world.chunk.IChunkProvider;
|
||||||
|
@ -10,6 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
|
@SuppressWarnings("unused")
|
||||||
public class OreGen implements IWorldGenerator{
|
public class OreGen implements IWorldGenerator{
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
|
@ -1,9 +1,9 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder;
|
import ellpeck.actuallyadditions.tile.TileEntityFeeder;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.slot.SlotOutput;
|
import ellpeck.actuallyadditions.inventory.slot.SlotOutput;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble;
|
import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGiantChest;
|
import ellpeck.actuallyadditions.tile.TileEntityGiantChest;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.slot.SlotOutput;
|
import ellpeck.actuallyadditions.inventory.slot.SlotOutput;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder;
|
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.inventory.Container;
|
import net.minecraft.inventory.Container;
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder;
|
import ellpeck.actuallyadditions.tile.TileEntityFeeder;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFurnaceDouble;
|
import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
|
@ -1,9 +1,9 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory;
|
package ellpeck.actuallyadditions.inventory;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder;
|
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
import net.minecraft.entity.player.InventoryPlayer;
|
import net.minecraft.entity.player.InventoryPlayer;
|
||||||
import net.minecraft.util.ResourceLocation;
|
import net.minecraft.util.ResourceLocation;
|
|
@ -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.IGuiHandler;
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityBase;
|
import ellpeck.actuallyadditions.tile.TileEntityBase;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityGrinder;
|
import ellpeck.actuallyadditions.tile.TileEntityGrinder;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
||||||
|
@ -70,6 +70,6 @@ public class GuiHandler implements IGuiHandler{
|
||||||
|
|
||||||
public static void init(){
|
public static void init(){
|
||||||
Util.logInfo("Initializing GuiHandler...");
|
Util.logInfo("Initializing GuiHandler...");
|
||||||
NetworkRegistry.INSTANCE.registerGuiHandler(SomePrettyRandomStuff.instance, new GuiHandler());
|
NetworkRegistry.INSTANCE.registerGuiHandler(ActuallyAdditions.instance, new GuiHandler());
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.inventory.slot;
|
package ellpeck.actuallyadditions.inventory.slot;
|
||||||
|
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import net.minecraft.inventory.Slot;
|
import net.minecraft.inventory.Slot;
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.tools.*;
|
import ellpeck.actuallyadditions.items.tools.*;
|
||||||
import ellpeck.someprettyrandomstuff.material.InitItemMaterials;
|
import ellpeck.actuallyadditions.material.InitItemMaterials;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
|
||||||
|
@ -52,18 +52,18 @@ public class InitItems{
|
||||||
itemSpecialDrop = new ItemSpecialDrop();
|
itemSpecialDrop = new ItemSpecialDrop();
|
||||||
Util.register(itemSpecialDrop);
|
Util.register(itemSpecialDrop);
|
||||||
|
|
||||||
itemPickaxeEmerald = new ItemPickaxeSPRS(InitItemMaterials.toolMaterialEmerald, "itemPickaxeEmerald", EnumRarity.rare);
|
itemPickaxeEmerald = new ItemPickaxeAA(InitItemMaterials.toolMaterialEmerald, "itemPickaxeEmerald", EnumRarity.rare);
|
||||||
itemAxeEmerald = new ItemAxeSPRS(InitItemMaterials.toolMaterialEmerald, "itemAxeEmerald", EnumRarity.rare);
|
itemAxeEmerald = new ItemAxeAA(InitItemMaterials.toolMaterialEmerald, "itemAxeEmerald", EnumRarity.rare);
|
||||||
itemShovelEmerald = new ItemShovelSPRS(InitItemMaterials.toolMaterialEmerald, "itemShovelEmerald", EnumRarity.rare);
|
itemShovelEmerald = new ItemShovelAA(InitItemMaterials.toolMaterialEmerald, "itemShovelEmerald", EnumRarity.rare);
|
||||||
itemSwordEmerald = new ItemSwordSPRS(InitItemMaterials.toolMaterialEmerald, "itemSwordEmerald", EnumRarity.rare);
|
itemSwordEmerald = new ItemSwordAA(InitItemMaterials.toolMaterialEmerald, "itemSwordEmerald", EnumRarity.rare);
|
||||||
itemHoeEmerald = new ItemHoeSPRS(InitItemMaterials.toolMaterialEmerald, "itemHoeEmerald", EnumRarity.rare);
|
itemHoeEmerald = new ItemHoeAA(InitItemMaterials.toolMaterialEmerald, "itemHoeEmerald", EnumRarity.rare);
|
||||||
Util.registerItems(new Item[]{itemPickaxeEmerald, itemAxeEmerald, itemShovelEmerald, itemSwordEmerald, itemHoeEmerald});
|
Util.registerItems(new Item[]{itemPickaxeEmerald, itemAxeEmerald, itemShovelEmerald, itemSwordEmerald, itemHoeEmerald});
|
||||||
|
|
||||||
itemPickaxeObsidian = new ItemPickaxeSPRS(InitItemMaterials.toolMaterialObsidian, "itemPickaxeObsidian", EnumRarity.uncommon);
|
itemPickaxeObsidian = new ItemPickaxeAA(InitItemMaterials.toolMaterialObsidian, "itemPickaxeObsidian", EnumRarity.uncommon);
|
||||||
itemAxeObsidian = new ItemAxeSPRS(InitItemMaterials.toolMaterialObsidian, "itemAxeObsidian", EnumRarity.uncommon);
|
itemAxeObsidian = new ItemAxeAA(InitItemMaterials.toolMaterialObsidian, "itemAxeObsidian", EnumRarity.uncommon);
|
||||||
itemShovelObsidian = new ItemShovelSPRS(InitItemMaterials.toolMaterialObsidian, "itemShovelObsidian", EnumRarity.uncommon);
|
itemShovelObsidian = new ItemShovelAA(InitItemMaterials.toolMaterialObsidian, "itemShovelObsidian", EnumRarity.uncommon);
|
||||||
itemSwordObsidian = new ItemSwordSPRS(InitItemMaterials.toolMaterialObsidian, "itemSwordObsidian", EnumRarity.uncommon);
|
itemSwordObsidian = new ItemSwordAA(InitItemMaterials.toolMaterialObsidian, "itemSwordObsidian", EnumRarity.uncommon);
|
||||||
itemHoeObsidian = new ItemHoeSPRS(InitItemMaterials.toolMaterialObsidian, "itemHoeObsidian", EnumRarity.uncommon);
|
itemHoeObsidian = new ItemHoeAA(InitItemMaterials.toolMaterialObsidian, "itemHoeObsidian", EnumRarity.uncommon);
|
||||||
Util.registerItems(new Item[]{itemPickaxeObsidian, itemAxeObsidian, itemShovelObsidian, itemSwordObsidian, itemHoeObsidian});
|
Util.registerItems(new Item[]{itemPickaxeObsidian, itemAxeObsidian, itemShovelObsidian, itemSwordObsidian, itemHoeObsidian});
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,12 +1,12 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.SomePrettyRandomStuff;
|
import ellpeck.actuallyadditions.ActuallyAdditions;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiHandler;
|
import ellpeck.actuallyadditions.inventory.GuiHandler;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -45,7 +45,7 @@ public class ItemCrafterOnAStick extends Item implements IName{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player){
|
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;
|
return stack;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheDusts;
|
import ellpeck.actuallyadditions.items.metalists.TheDusts;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheFoods;
|
import ellpeck.actuallyadditions.items.metalists.TheFoods;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
|
@ -1,12 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IInformation;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -16,7 +15,7 @@ import net.minecraft.util.IIcon;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemKnife extends Item implements IName, IInformation{
|
public class ItemKnife extends Item implements IName{
|
||||||
|
|
||||||
public ItemKnife(){
|
public ItemKnife(){
|
||||||
this.setUnlocalizedName(Util.setUnlocalizedName(this));
|
this.setUnlocalizedName(Util.setUnlocalizedName(this));
|
||||||
|
@ -66,9 +65,4 @@ public class ItemKnife extends Item implements IName, IInformation{
|
||||||
public String getName(){
|
public String getName(){
|
||||||
return "itemKnife";
|
return "itemKnife";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public String[] getInformationString(){
|
|
||||||
return new String[]{"This is a test too but it's more cool senn se assa"};
|
|
||||||
}
|
|
||||||
}
|
}
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.items;
|
package ellpeck.actuallyadditions.items;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheSpecialDrops;
|
import ellpeck.actuallyadditions.items.metalists.TheSpecialDrops;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.creativetab.CreativeTabs;
|
import net.minecraft.creativetab.CreativeTabs;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
|
@ -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;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
|
||||||
public enum TheDusts implements IName{
|
public enum TheDusts implements IName{
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.items.metalists;
|
package ellpeck.actuallyadditions.items.metalists;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -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;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
|
||||||
public enum TheMiscItems implements IName{
|
public enum TheMiscItems implements IName{
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.items.metalists;
|
package ellpeck.actuallyadditions.items.metalists;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import net.minecraft.entity.EntityCreature;
|
import net.minecraft.entity.EntityCreature;
|
||||||
import net.minecraft.entity.monster.EntityCreeper;
|
import net.minecraft.entity.monster.EntityCreeper;
|
||||||
import net.minecraft.entity.monster.EntityEnderman;
|
import net.minecraft.entity.monster.EntityEnderman;
|
|
@ -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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemAxeSPRS extends ItemAxe implements IName{
|
public class ItemAxeAA extends ItemAxe implements IName{
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private EnumRarity rarity;
|
private EnumRarity rarity;
|
||||||
|
|
||||||
public ItemAxeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
public ItemAxeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
||||||
super(toolMat);
|
super(toolMat);
|
||||||
this.name = unlocalizedName;
|
this.name = unlocalizedName;
|
||||||
this.rarity = rarity;
|
this.rarity = rarity;
|
|
@ -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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemHoeSPRS extends ItemHoe implements IName{
|
public class ItemHoeAA extends ItemHoe implements IName{
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private EnumRarity rarity;
|
private EnumRarity rarity;
|
||||||
|
|
||||||
public ItemHoeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
public ItemHoeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
||||||
super(toolMat);
|
super(toolMat);
|
||||||
this.name = unlocalizedName;
|
this.name = unlocalizedName;
|
||||||
this.rarity = rarity;
|
this.rarity = rarity;
|
|
@ -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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemPickaxeSPRS extends ItemPickaxe implements IName{
|
public class ItemPickaxeAA extends ItemPickaxe implements IName{
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private EnumRarity rarity;
|
private EnumRarity rarity;
|
||||||
|
|
||||||
public ItemPickaxeSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
public ItemPickaxeAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
||||||
super(toolMat);
|
super(toolMat);
|
||||||
this.name = unlocalizedName;
|
this.name = unlocalizedName;
|
||||||
this.rarity = rarity;
|
this.rarity = rarity;
|
|
@ -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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemShovelSPRS extends ItemSpade implements IName{
|
public class ItemShovelAA extends ItemSpade implements IName{
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private EnumRarity rarity;
|
private EnumRarity rarity;
|
||||||
|
|
||||||
public ItemShovelSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
public ItemShovelAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
||||||
super(toolMat);
|
super(toolMat);
|
||||||
this.name = unlocalizedName;
|
this.name = unlocalizedName;
|
||||||
this.rarity = rarity;
|
this.rarity = rarity;
|
|
@ -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.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.creative.CreativeTab;
|
import ellpeck.actuallyadditions.creative.CreativeTab;
|
||||||
import ellpeck.someprettyrandomstuff.util.IName;
|
import ellpeck.actuallyadditions.util.IName;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.item.EnumRarity;
|
import net.minecraft.item.EnumRarity;
|
||||||
|
@ -15,12 +15,12 @@ import net.minecraft.util.StatCollector;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class ItemSwordSPRS extends ItemSword implements IName{
|
public class ItemSwordAA extends ItemSword implements IName{
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
private EnumRarity rarity;
|
private EnumRarity rarity;
|
||||||
|
|
||||||
public ItemSwordSPRS(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
public ItemSwordAA(ToolMaterial toolMat, String unlocalizedName, EnumRarity rarity){
|
||||||
super(toolMat);
|
super(toolMat);
|
||||||
this.name = unlocalizedName;
|
this.name = unlocalizedName;
|
||||||
this.rarity = rarity;
|
this.rarity = rarity;
|
|
@ -1,11 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.material;
|
package ellpeck.actuallyadditions.material;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
import net.minecraft.init.Blocks;
|
|
||||||
import net.minecraft.init.Items;
|
|
||||||
import net.minecraft.item.Item.ToolMaterial;
|
import net.minecraft.item.Item.ToolMaterial;
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
import net.minecraftforge.common.util.EnumHelper;
|
import net.minecraftforge.common.util.EnumHelper;
|
||||||
|
|
||||||
public class InitItemMaterials{
|
public class InitItemMaterials{
|
||||||
|
@ -16,8 +13,8 @@ public class InitItemMaterials{
|
||||||
public static void init(){
|
public static void init(){
|
||||||
Util.logInfo("Initializing Materials...");
|
Util.logInfo("Initializing Materials...");
|
||||||
|
|
||||||
toolMaterialEmerald = EnumHelper.addToolMaterial("toolMaterialEmerald", ConfigValues.toolEmeraldHarvestLevel, ConfigValues.toolEmeraldMaxUses, ConfigValues.toolEmeraldEfficiency, ConfigValues.toolEmeraldDamage, ConfigValues.toolEmeraldEnchantability).setRepairItem(new ItemStack(Items.emerald));
|
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).setRepairItem(new ItemStack(Blocks.obsidian));
|
toolMaterialObsidian = EnumHelper.addToolMaterial("toolMaterialObsidian", ConfigValues.toolObsidianHarvestLevel, ConfigValues.toolObsidianMaxUses, ConfigValues.toolObsidianEfficiency, ConfigValues.toolObsidianDamage, ConfigValues.toolObsidianEnchantability);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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.NetworkRegistry;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
|
|
||||||
public class PacketHandler{
|
public class PacketHandler{
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.network;
|
package ellpeck.actuallyadditions.network;
|
||||||
|
|
||||||
import cpw.mods.fml.client.FMLClientHandler;
|
import cpw.mods.fml.client.FMLClientHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||||
import ellpeck.someprettyrandomstuff.inventory.GuiFeeder;
|
import ellpeck.actuallyadditions.inventory.GuiFeeder;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityFeeder;
|
import ellpeck.actuallyadditions.tile.TileEntityFeeder;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import net.minecraft.client.Minecraft;
|
import net.minecraft.client.Minecraft;
|
||||||
import net.minecraft.entity.passive.EntityAnimal;
|
import net.minecraft.entity.passive.EntityAnimal;
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.oredict;
|
package ellpeck.actuallyadditions.oredict;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheDusts;
|
import ellpeck.actuallyadditions.items.metalists.TheDusts;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.oredict.OreDictionary;
|
import net.minecraftforge.oredict.OreDictionary;
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package ellpeck.someprettyrandomstuff.proxy;
|
package ellpeck.actuallyadditions.proxy;
|
||||||
|
|
||||||
|
|
||||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.InitBlocks;
|
import ellpeck.actuallyadditions.blocks.InitBlocks;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.render.ModelCompost;
|
import ellpeck.actuallyadditions.blocks.render.ModelCompost;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.render.RenderItems;
|
import ellpeck.actuallyadditions.blocks.render.RenderItems;
|
||||||
import ellpeck.someprettyrandomstuff.blocks.render.RenderTileEntity;
|
import ellpeck.actuallyadditions.blocks.render.RenderTileEntity;
|
||||||
import ellpeck.someprettyrandomstuff.tile.TileEntityCompost;
|
import ellpeck.actuallyadditions.tile.TileEntityCompost;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraftforge.client.MinecraftForgeClient;
|
import net.minecraftforge.client.MinecraftForgeClient;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.proxy;
|
package ellpeck.actuallyadditions.proxy;
|
||||||
|
|
||||||
public interface IProxy{
|
public interface IProxy{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package ellpeck.someprettyrandomstuff.proxy;
|
package ellpeck.actuallyadditions.proxy;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.util.Util;
|
import ellpeck.actuallyadditions.util.Util;
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public class ServerProxy implements IProxy{
|
public class ServerProxy implements IProxy{
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.recipe;
|
package ellpeck.actuallyadditions.recipe;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
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.Block;
|
||||||
import net.minecraft.block.BlockAir;
|
import net.minecraft.block.BlockAir;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,10 +1,10 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.items.InitItems;
|
import ellpeck.actuallyadditions.items.InitItems;
|
||||||
import ellpeck.someprettyrandomstuff.items.ItemFertilizer;
|
import ellpeck.actuallyadditions.items.ItemFertilizer;
|
||||||
import ellpeck.someprettyrandomstuff.items.ItemMisc;
|
import ellpeck.actuallyadditions.items.ItemMisc;
|
||||||
import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems;
|
import ellpeck.actuallyadditions.items.metalists.TheMiscItems;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import cpw.mods.fml.common.network.NetworkRegistry;
|
import cpw.mods.fml.common.network.NetworkRegistry;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.network.PacketHandler;
|
import ellpeck.actuallyadditions.network.PacketHandler;
|
||||||
import ellpeck.someprettyrandomstuff.network.PacketTileEntityFeeder;
|
import ellpeck.actuallyadditions.network.PacketTileEntityFeeder;
|
||||||
import net.minecraft.entity.passive.EntityAnimal;
|
import net.minecraft.entity.passive.EntityAnimal;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,8 +1,8 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
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.ItemStack;
|
||||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,9 +1,9 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
import ellpeck.someprettyrandomstuff.config.ConfigValues;
|
import ellpeck.actuallyadditions.config.ConfigValues;
|
||||||
import ellpeck.someprettyrandomstuff.recipe.GrinderRecipes;
|
import ellpeck.actuallyadditions.recipe.GrinderRecipes;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntityFurnace;
|
import net.minecraft.tileentity.TileEntityFurnace;
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.tile;
|
package ellpeck.actuallyadditions.tile;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ISidedInventory;
|
import net.minecraft.inventory.ISidedInventory;
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.util;
|
package ellpeck.actuallyadditions.util;
|
||||||
|
|
||||||
public interface IName{
|
public interface IName{
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package ellpeck.someprettyrandomstuff.util;
|
package ellpeck.actuallyadditions.util;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLCommonHandler;
|
import cpw.mods.fml.common.FMLCommonHandler;
|
||||||
import cpw.mods.fml.common.registry.GameRegistry;
|
import cpw.mods.fml.common.registry.GameRegistry;
|
||||||
|
@ -17,10 +17,10 @@ import org.lwjgl.input.Keyboard;
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
public class Util{
|
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 MOD_ID = "ActuallyAdditions";
|
||||||
public static final String NAME = "Some Pretty Random Stuff";
|
public static final String NAME = "Actually Additions";
|
||||||
public static final String MOD_ID_LOWER = MOD_ID.toLowerCase();
|
public static final String MOD_ID_LOWER = MOD_ID.toLowerCase();
|
||||||
|
|
||||||
public static final Logger SPRS_LOGGER = LogManager.getLogger(MOD_ID);
|
public static final Logger SPRS_LOGGER = LogManager.getLogger(MOD_ID);
|
|
@ -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<Achievement> achievementList = new ArrayList<Achievement>();
|
|
||||||
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -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());
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,7 +0,0 @@
|
||||||
package ellpeck.someprettyrandomstuff.util;
|
|
||||||
|
|
||||||
public interface IInformation{
|
|
||||||
|
|
||||||
public abstract String[] getInformationString();
|
|
||||||
|
|
||||||
}
|
|
167
src/main/resources/assets/actuallyadditions/lang/en_US.lang
Normal file
|
@ -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!
|
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 622 B |
Before Width: | Height: | Size: 352 B After Width: | Height: | Size: 352 B |
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 530 B After Width: | Height: | Size: 530 B |
Before Width: | Height: | Size: 588 B After Width: | Height: | Size: 588 B |
Before Width: | Height: | Size: 708 B After Width: | Height: | Size: 708 B |
Before Width: | Height: | Size: 353 B After Width: | Height: | Size: 353 B |
Before Width: | Height: | Size: 374 B After Width: | Height: | Size: 374 B |
Before Width: | Height: | Size: 586 B After Width: | Height: | Size: 586 B |
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 607 B After Width: | Height: | Size: 607 B |
Before Width: | Height: | Size: 447 B After Width: | Height: | Size: 447 B |
Before Width: | Height: | Size: 446 B After Width: | Height: | Size: 446 B |
Before Width: | Height: | Size: 431 B After Width: | Height: | Size: 431 B |
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B |
Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 591 B |
|
@ -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
|