diff --git a/build.gradle b/build.gradle index 084947bae..ee06c90af 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { apply plugin: 'forge' version = "1.7.10-0.0.1" -group = "ellpeck.someprettytechystuff" -archivesBaseName = "SomePrettyTechyStuff" +group = "ellpeck.someprettyrandomstuff" +archivesBaseName = "SomePrettyRandomStuff" minecraft { version = "1.7.10-10.13.2.1277" diff --git a/src/main/java/ellpeck/someprettytechystuff/SPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/SPTS.java similarity index 62% rename from src/main/java/ellpeck/someprettytechystuff/SPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/SPTS.java index 4fc2fdeb5..38dd834d9 100644 --- a/src/main/java/ellpeck/someprettytechystuff/SPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/SPTS.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff; +package ellpeck.someprettyrandomstuff; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; @@ -7,15 +7,15 @@ import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import ellpeck.someprettytechystuff.blocks.InitBlocks; -import ellpeck.someprettytechystuff.crafting.InitCrafting; -import ellpeck.someprettytechystuff.event.UpdateEvent; -import ellpeck.someprettytechystuff.gen.OreGen; -import ellpeck.someprettytechystuff.inventory.GuiHandler; -import ellpeck.someprettytechystuff.items.InitItems; -import ellpeck.someprettytechystuff.proxy.IProxy; -import ellpeck.someprettytechystuff.tile.TileEntityBase; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.blocks.InitBlocks; +import ellpeck.someprettyrandomstuff.crafting.InitCrafting; +import ellpeck.someprettyrandomstuff.event.UpdateEvent; +import ellpeck.someprettyrandomstuff.gen.OreGen; +import ellpeck.someprettyrandomstuff.inventory.GuiHandler; +import ellpeck.someprettyrandomstuff.items.InitItems; +import ellpeck.someprettyrandomstuff.proxy.IProxy; +import ellpeck.someprettyrandomstuff.tile.TileEntityBase; +import ellpeck.someprettyrandomstuff.util.Util; @Mod(modid = Util.MOD_ID, name = Util.NAME, version = Util.VERSION) public class SPTS{ @@ -23,7 +23,7 @@ public class SPTS{ @Instance(Util.MOD_ID) public static SPTS instance; - @SidedProxy(clientSide = "ellpeck.someprettytechystuff.proxy.ClientProxy", serverSide = "ellpeck.someprettytechystuff.proxy.ServerProxy") + @SidedProxy(clientSide = "ellpeck.someprettyrandomstuff.proxy.ClientProxy", serverSide = "ellpeck.someprettyrandomstuff.proxy.ServerProxy") public static IProxy proxy; @SuppressWarnings("unused") diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java similarity index 94% rename from src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java index 947b7c180..3cd64797c 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/BlockContainerBase.java @@ -1,6 +1,6 @@ -package ellpeck.someprettytechystuff.blocks; +package ellpeck.someprettyrandomstuff.blocks; -import ellpeck.someprettytechystuff.tile.TileEntityInventoryBase; +import ellpeck.someprettyrandomstuff.tile.TileEntityInventoryBase; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java similarity index 88% rename from src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java index 21529596d..71572450d 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/DefaultItemBlock.java @@ -1,8 +1,8 @@ -package ellpeck.someprettytechystuff.blocks; +package ellpeck.someprettyrandomstuff.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java similarity index 59% rename from src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java index 75c3a751a..485aacc89 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/InitBlocks.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.blocks; +package ellpeck.someprettyrandomstuff.blocks; public class InitBlocks{ diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/models/ModelBaseSPTS.java similarity index 72% rename from src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/models/ModelBaseSPTS.java index f0ccd8843..fb97c3874 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/models/ModelBaseSPTS.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.blocks.models; +package ellpeck.someprettyrandomstuff.blocks.models; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/BlockBaseRenderer.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/BlockBaseRenderer.java similarity index 90% rename from src/main/java/ellpeck/someprettytechystuff/blocks/renderer/BlockBaseRenderer.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/BlockBaseRenderer.java index 197ef36f9..80a14ef02 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/BlockBaseRenderer.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/BlockBaseRenderer.java @@ -1,6 +1,6 @@ -package ellpeck.someprettytechystuff.blocks.renderer; +package ellpeck.someprettyrandomstuff.blocks.renderer; -import ellpeck.someprettytechystuff.blocks.models.ModelBaseSPTS; +import ellpeck.someprettyrandomstuff.blocks.models.ModelBaseSPTS; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/ItemBaseRenderer.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/ItemBaseRenderer.java similarity index 95% rename from src/main/java/ellpeck/someprettytechystuff/blocks/renderer/ItemBaseRenderer.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/ItemBaseRenderer.java index 083f7ab32..a54d10b81 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/ItemBaseRenderer.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/ItemBaseRenderer.java @@ -1,6 +1,6 @@ -package ellpeck.someprettytechystuff.blocks.renderer; +package ellpeck.someprettyrandomstuff.blocks.renderer; -import ellpeck.someprettytechystuff.blocks.models.ModelBaseSPTS; +import ellpeck.someprettyrandomstuff.blocks.models.ModelBaseSPTS; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/RenderRegistry.java b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/RenderRegistry.java similarity index 87% rename from src/main/java/ellpeck/someprettytechystuff/blocks/renderer/RenderRegistry.java rename to src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/RenderRegistry.java index 7fc8074f8..a94024534 100644 --- a/src/main/java/ellpeck/someprettytechystuff/blocks/renderer/RenderRegistry.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/blocks/renderer/RenderRegistry.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.blocks.renderer; +package ellpeck.someprettyrandomstuff.blocks.renderer; public class RenderRegistry{ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java b/src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java new file mode 100644 index 000000000..497068d52 --- /dev/null +++ b/src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java @@ -0,0 +1,51 @@ +package ellpeck.someprettyrandomstuff.crafting; + +import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.someprettyrandomstuff.items.InitItems; +import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; +import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + +public class InitCrafting { + + public static void init(){ + + GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, + TheMiscItems.DOUGH.ordinal()), new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), 1F); + + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemMisc, 2, TheMiscItems.DOUGH.ordinal()), + new ItemStack(Items.wheat), new ItemStack(Items.wheat)); + + GameRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.PIZZA.ordinal()), + "HHH", "MCF", " D ", + 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), + 'M', new ItemStack(Blocks.brown_mushroom), + 'C', new ItemStack(Items.carrot), + 'F', new ItemStack(Items.fish), + 'H', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal())); + + GameRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.HAMBURGER.ordinal()), + " T ", "CBS", " T ", + 'T', new ItemStack(InitItems.itemFoods, 1, TheFoods.TOAST.ordinal()), + 'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), + 'S', new ItemStack(Blocks.leaves), + 'B', new ItemStack(Items.cooked_beef)); + + GameRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.BIG_COOKIE.ordinal()), + "DCD", "CDC", "DCD", + 'D', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.DOUGH.ordinal()), + 'C', new ItemStack(Items.dye, 1, 3)); + + GameRegistry.addRecipe(new ItemStack(InitItems.itemFoods, 1, TheFoods.SUBMARINE_SANDWICH.ordinal()), + "PCP", "FBS", "PCP", + 'P', new ItemStack(Items.paper), + 'C', new ItemStack(InitItems.itemFoods, 1, TheFoods.CHEESE.ordinal()), + 'F', new ItemStack(Items.fish), + 'B', new ItemStack(InitItems.itemFoods, 1, TheFoods.BAGUETTE.ordinal()), + 'S', new ItemStack(Blocks.leaves)); + + } + +} diff --git a/src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java b/src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java new file mode 100644 index 000000000..6263f7861 --- /dev/null +++ b/src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java @@ -0,0 +1,25 @@ +package ellpeck.someprettyrandomstuff.creative; + +import ellpeck.someprettyrandomstuff.items.InitItems; +import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; +import ellpeck.someprettyrandomstuff.util.Util; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class CreativeTab extends CreativeTabs{ + + public static CreativeTab instance = new CreativeTab(); + + public CreativeTab(){ + super(Util.MOD_ID); + } + + public Item getTabIconItem(){ + return InitItems.itemFoods; + } + + public ItemStack getIconItemStack(){ + return new ItemStack(this.getTabIconItem(), 1, TheFoods.CHOCOLATE.ordinal()); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/event/UpdateEvent.java b/src/main/java/ellpeck/someprettyrandomstuff/event/UpdateEvent.java similarity index 89% rename from src/main/java/ellpeck/someprettytechystuff/event/UpdateEvent.java rename to src/main/java/ellpeck/someprettyrandomstuff/event/UpdateEvent.java index 81443b427..c0a21c067 100644 --- a/src/main/java/ellpeck/someprettytechystuff/event/UpdateEvent.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/event/UpdateEvent.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.event; +package ellpeck.someprettyrandomstuff.event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java b/src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java similarity index 97% rename from src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java rename to src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java index a00289201..191974d1f 100644 --- a/src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/gen/OreGen.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.gen; +package ellpeck.someprettyrandomstuff.gen; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java b/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java rename to src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java index b7f56d486..6f30fe35f 100644 --- a/src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/inventory/GuiHandler.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.inventory; +package ellpeck.someprettyrandomstuff.inventory; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import ellpeck.someprettytechystuff.SPTS; -import ellpeck.someprettytechystuff.tile.TileEntityBase; +import ellpeck.someprettyrandomstuff.SPTS; +import ellpeck.someprettyrandomstuff.tile.TileEntityBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/InitItems.java b/src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java similarity index 67% rename from src/main/java/ellpeck/someprettytechystuff/items/InitItems.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java index 4d70ba13b..2f8884fe5 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/InitItems.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/InitItems.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.items; +package ellpeck.someprettyrandomstuff.items; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; @@ -7,7 +7,7 @@ public class InitItems{ public static Item itemFertilizer; public static Item itemMisc; - public static Item itemCombinedFood; + public static Item itemFoods; public static void init(){ @@ -17,7 +17,7 @@ public class InitItems{ itemMisc = new ItemMisc(); GameRegistry.registerItem(itemMisc, itemMisc.getUnlocalizedName().substring(5)); - itemCombinedFood = new ItemFoods(); - GameRegistry.registerItem(itemCombinedFood, itemCombinedFood.getUnlocalizedName().substring(5)); + itemFoods = new ItemFoods(); + GameRegistry.registerItem(itemFoods, itemFoods.getUnlocalizedName().substring(5)); } } diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemFertilizer.java b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java similarity index 89% rename from src/main/java/ellpeck/someprettytechystuff/items/ItemFertilizer.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java index caa36e8a5..cf44124b0 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/ItemFertilizer.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFertilizer.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items; +package ellpeck.someprettyrandomstuff.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemFoods.java b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java similarity index 61% rename from src/main/java/ellpeck/someprettytechystuff/items/ItemFoods.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java index 502cba10a..67b9c4369 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/ItemFoods.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemFoods.java @@ -1,11 +1,13 @@ -package ellpeck.someprettytechystuff.items; +package ellpeck.someprettyrandomstuff.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.items.metalists.TheFoods; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.Item; @@ -13,50 +15,12 @@ import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import net.minecraft.world.World; import java.util.List; public class ItemFoods extends ItemFood{ - public enum TheFoods{ - - /*Name of every single one: - * "itemFoodNAMEHERE - * Every food in a 16x16 .png file with that name - * v this is said name*/ - PUMPKIN_STEW("PumpkinStew", 10, 0.4F, true, 30), - CARROT_JUICE("CarrotJuice", 6, 0.2F, true, 20), - FISH_N_CHIPS("FishNChips", 20, 1F, false, 40), - FRENCH_FRIES("FrenchFries", 16, 0.7F, false, 32), - FRENCH_FRY("FrenchFry", 1, 0.01F, false, 3), - SPAGHETTI("Spaghetti", 18, 0.8F, false, 38), - NOODLE("Noodle", 1, 0.01F, false, 3), - CHOCOLATE_CAKE("ChocolateCake", 16, 0.45F, false, 45), - CHOCOLATE("Chocolate", 5, 0.05F, false, 15), - TOAST("Toast", 7, 0.4F, false, 25), - SUBMARINE_SANDWICH("SubmarineSandwich", 10, 0.7F, false, 40), - BIG_COOKIE("BigCookie", 6, 0.1F, false, 20), - HAMBURGER("Hamburger", 14, 0.9F, false, 40), - PIZZA("Pizza", 20, 1F, false, 45), - BAGUETTE("Baguette", 7, 0.2F, false, 25); - - public final String name; - public final int healAmount; - public final float saturation; - public final boolean getsDrunken; - public final int useDuration; - @SideOnly(Side.CLIENT) - private IIcon theIcon; - - private TheFoods(String name, int healAmount, float saturation, boolean getsDrunken, int useDuration){ - this.name = name; - this.getsDrunken = getsDrunken; - this.healAmount = healAmount; - this.saturation = saturation; - this.useDuration = useDuration; - } - } - private final TheFoods[] allFoods = TheFoods.values(); public ItemFoods(){ @@ -107,6 +71,21 @@ public class ItemFoods extends ItemFood{ return this.getUnlocalizedName() + allFoods[stack.getItemDamage()].name; } + public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player){ + ItemStack stackToReturn = super.onEaten(stack, world, player); + ItemStack returnItem = allFoods[stack.getItemDamage()].returnItem; + if (returnItem != null){ + if(!player.inventory.addItemStackToInventory(returnItem.copy())){ + if(!world.isRemote){ + EntityItem entityItem = new EntityItem(player.worldObj, player.posX, player.posY, player.posZ, returnItem.copy()); + entityItem.delayBeforeCanPickup = 0; + player.worldObj.spawnEntityInWorld(entityItem); + } + } + } + return stackToReturn; + } + @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld){ diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemMisc.java b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java similarity index 57% rename from src/main/java/ellpeck/someprettytechystuff/items/ItemMisc.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java index 012ac026e..6de5ce5dd 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/ItemMisc.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/ItemMisc.java @@ -1,9 +1,10 @@ -package ellpeck.someprettytechystuff.items; +package ellpeck.someprettyrandomstuff.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.items.metalists.TheMiscItems; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -16,39 +17,38 @@ import java.util.List; public class ItemMisc extends Item{ - private final String[] items = new String[]{"MashedFood", "RefinedIron", "RefinedRedstone", "CompressedIron", "Steel"}; - - @SideOnly(Side.CLIENT) - private IIcon[] icons = new IIcon[items.length]; + private final TheMiscItems[] allMiscItems = TheMiscItems.values(); public ItemMisc(){ - this.setHasSubtypes(true); this.setUnlocalizedName("itemMisc"); + this.setHasSubtypes(true); this.setCreativeTab(CreativeTab.instance); } - public String getUnlocalizedName(ItemStack stack){ - return this.getUnlocalizedName() + items[stack.getItemDamage()]; - } - @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister iconReg){ - for(int i = 0; i < items.length; i++){ - icons[i] = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + this.items[i]); + for(TheMiscItems theMisc : allMiscItems){ + theMisc.theIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + theMisc.name); } } - public IIcon getIconFromDamage(int i){ - return icons[i]; + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1){ + return allMiscItems[par1].theIcon; } - @SuppressWarnings("unchecked") - public void getSubItems(Item item, CreativeTabs tabs, List list) { - for (int i = 0; i < items.length; i++){ - list.add(new ItemStack(this, 1, i)); + @SuppressWarnings("all") + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tab, List list){ + for (int j = 0; j < allMiscItems.length; j++){ + list.add(new ItemStack(this, 1, j)); } } + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName() + allMiscItems[stack.getItemDamage()].name; + } + @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld){ diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java b/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java new file mode 100644 index 000000000..37469bde6 --- /dev/null +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java @@ -0,0 +1,46 @@ +package ellpeck.someprettyrandomstuff.items.metalists; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettyrandomstuff.items.InitItems; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public enum TheFoods{ + + CHEESE("Cheese", 1, 0.1F, false, 3, null), + PUMPKIN_STEW("PumpkinStew", 10, 0.4F, true, 30, new ItemStack(Items.bowl)), + CARROT_JUICE("CarrotJuice", 6, 0.2F, true, 20, new ItemStack(Items.glass_bottle)), + FISH_N_CHIPS("FishNChips", 20, 1F, false, 40, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal())), + FRENCH_FRIES("FrenchFries", 16, 0.7F, false, 32, new ItemStack(InitItems.itemMisc, 1, TheMiscItems.PAPER_CONE.ordinal())), + FRENCH_FRY("FrenchFry", 1, 0.01F, false, 3, null), + SPAGHETTI("Spaghetti", 18, 0.8F, false, 38, new ItemStack(Items.bowl)), + NOODLE("Noodle", 1, 0.01F, false, 3, null), + CHOCOLATE_CAKE("ChocolateCake", 16, 0.45F, false, 45, null), + CHOCOLATE("Chocolate", 5, 0.05F, false, 15, null), + TOAST("Toast", 7, 0.4F, false, 25, null), + SUBMARINE_SANDWICH("SubmarineSandwich", 10, 0.7F, false, 40, null), + BIG_COOKIE("BigCookie", 6, 0.1F, false, 20, null), + HAMBURGER("Hamburger", 14, 0.9F, false, 40, null), + PIZZA("Pizza", 20, 1F, false, 45, null), + BAGUETTE("Baguette", 7, 0.2F, false, 25, null); + + public final String name; + public final int healAmount; + public final float saturation; + public final boolean getsDrunken; + public final int useDuration; + public final ItemStack returnItem; + @SideOnly(Side.CLIENT) + public IIcon theIcon; + + private TheFoods(String name, int healAmount, float saturation, boolean getsDrunken, int useDuration, ItemStack returnItem){ + this.name = name; + this.getsDrunken = getsDrunken; + this.healAmount = healAmount; + this.saturation = saturation; + this.useDuration = useDuration; + this.returnItem = returnItem; + } +} \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java b/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java new file mode 100644 index 000000000..8f550d66b --- /dev/null +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java @@ -0,0 +1,24 @@ +package ellpeck.someprettyrandomstuff.items.metalists; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.util.IIcon; + +public enum TheMiscItems{ + + PAPER_CONE("PaperCone"), + MASHED_FOOD("MashedFood"), + REFINED_IRON("RefinedIron"), + REFINED_REDSTONE("RefinedRedstone"), + COMPRESSED_IRON("CompressedIron"), + STEEL("Steel"), + DOUGH("Dough"); + + public final String name; + @SideOnly(Side.CLIENT) + public IIcon theIcon; + + private TheMiscItems(String name){ + this.name = name; + } +} \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPTS.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPTS.java index 6349b7048..5ef7393bd 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemAxeSPTS.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items.tools; +package ellpeck.someprettyrandomstuff.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemAxe; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPTS.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPTS.java index 38b4c1aba..5cfbb873e 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemHoeSPTS.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items.tools; +package ellpeck.someprettyrandomstuff.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemHoe; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPTS.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPTS.java index 7867758a8..39a9c1d08 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemPickaxeSPTS.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items.tools; +package ellpeck.someprettyrandomstuff.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemPickaxe; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPTS.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPTS.java index b20362164..0f2ddca49 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemShovelSPTS.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items.tools; +package ellpeck.someprettyrandomstuff.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemSpade; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordSPTS.java b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPTS.java similarity index 85% rename from src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordSPTS.java rename to src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPTS.java index 1f2e8dcab..a2d735aab 100644 --- a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordSPTS.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/items/tools/ItemSwordSPTS.java @@ -1,9 +1,9 @@ -package ellpeck.someprettytechystuff.items.tools; +package ellpeck.someprettyrandomstuff.items.tools; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.someprettytechystuff.creative.CreativeTab; -import ellpeck.someprettytechystuff.util.Util; +import ellpeck.someprettyrandomstuff.creative.CreativeTab; +import ellpeck.someprettyrandomstuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java b/src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java similarity index 64% rename from src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java rename to src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java index 9cf9a713f..2833650c6 100644 --- a/src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/proxy/ClientProxy.java @@ -1,7 +1,7 @@ -package ellpeck.someprettytechystuff.proxy; +package ellpeck.someprettyrandomstuff.proxy; -import ellpeck.someprettytechystuff.blocks.renderer.RenderRegistry; +import ellpeck.someprettyrandomstuff.blocks.renderer.RenderRegistry; @SuppressWarnings("unused") public class ClientProxy implements IProxy{ diff --git a/src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java b/src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java similarity index 75% rename from src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java rename to src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java index a4f7246d9..1ee452f5b 100644 --- a/src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/proxy/IProxy.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.proxy; +package ellpeck.someprettyrandomstuff.proxy; public interface IProxy { diff --git a/src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java b/src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java similarity index 77% rename from src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java rename to src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java index 3e2b8432e..099789ec3 100644 --- a/src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.proxy; +package ellpeck.someprettyrandomstuff.proxy; public class ServerProxy implements IProxy{ diff --git a/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java b/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java similarity index 94% rename from src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java rename to src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java index 92125418e..95ddf6671 100644 --- a/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityBase.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.tile; +package ellpeck.someprettyrandomstuff.tile; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; diff --git a/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java b/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java similarity index 98% rename from src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java rename to src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java index baee2ff21..1dfc6cbfc 100644 --- a/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/tile/TileEntityInventoryBase.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.tile; +package ellpeck.someprettyrandomstuff.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/ellpeck/someprettytechystuff/util/Util.java b/src/main/java/ellpeck/someprettyrandomstuff/util/Util.java similarity index 84% rename from src/main/java/ellpeck/someprettytechystuff/util/Util.java rename to src/main/java/ellpeck/someprettyrandomstuff/util/Util.java index 51afc9e52..431fb092c 100644 --- a/src/main/java/ellpeck/someprettytechystuff/util/Util.java +++ b/src/main/java/ellpeck/someprettyrandomstuff/util/Util.java @@ -1,4 +1,4 @@ -package ellpeck.someprettytechystuff.util; +package ellpeck.someprettyrandomstuff.util; import net.minecraft.item.Item; import net.minecraft.util.StatCollector; @@ -7,8 +7,8 @@ import org.lwjgl.input.Keyboard; @SuppressWarnings("unused") public class Util{ - public static final String MOD_ID = "someprettytechystuff"; - public static final String NAME = "SomePrettyTechyStuff"; + public static final String MOD_ID = "someprettyrandomstuff"; + public static final String NAME = "SomePrettyRandomStuff"; public static final String VERSION = "1.7.10-0.0.1"; public static boolean isShiftPressed(){ diff --git a/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java b/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java deleted file mode 100644 index d700a3326..000000000 --- a/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java +++ /dev/null @@ -1,9 +0,0 @@ -package ellpeck.someprettytechystuff.crafting; - -public class InitCrafting { - - public static void init(){ - - } - -} diff --git a/src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java b/src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java deleted file mode 100644 index 1ad3a0ac2..000000000 --- a/src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java +++ /dev/null @@ -1,19 +0,0 @@ -package ellpeck.someprettytechystuff.creative; - -import ellpeck.someprettytechystuff.util.Util; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Items; -import net.minecraft.item.Item; - -public class CreativeTab extends CreativeTabs{ - - public static CreativeTab instance = new CreativeTab(); - - public CreativeTab(){ - super(Util.MOD_ID); - } - - public Item getTabIconItem() { - return Items.command_block_minecart; - } -} diff --git a/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang b/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang new file mode 100644 index 000000000..3d0b8fcc2 --- /dev/null +++ b/src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang @@ -0,0 +1,57 @@ +itemGroup.someprettytechystuff=SomePrettyTechyStuff + +item.itemMiscMashedFood.name=Mashed Food +item.itemMiscRefinedIron.name=Refined Iron +item.itemMiscRefinedRedstone.name=Refined Redstone +item.itemMiscCompressedIron.name=Compressed Iron +item.itemMiscSteel.name=Steel +item.itemFertilizer.name=Fertilizer +item.itemMiscDough.name=Dough +item.itemMiscPaperCone.name=Paper Cone + +item.itemFoodBaguette.name=Baguette +item.itemFoodPizza.name=Pizza +item.itemFoodHamburger.name=Hamburger +item.itemFoodBigCookie.name=Big Cookie +item.itemFoodSubmarineSandwich.name=Submarine Sandwich +item.itemFoodToast.name=Toast +item.itemFoodChocolate.name=Chocolate +item.itemFoodChocolateCake.name=Chocolate Cake +item.itemFoodNoodle.name=Noodle +item.itemFoodSpaghetti.name=Spaghetti +item.itemFoodFrenchFry.name=French Fry +item.itemFoodFrenchFries.name=French Fries +item.itemFoodFishNChips.name=Fish 'N' Chips +item.itemFoodCarrotJuice.name=Carrot Juice +item.itemFoodPumpkinStew.name=Pumpkin Stew +item.itemFoodCheese.name=Cheese + +tooltip.shiftForInfo.desc=Press Shift for Info +tooltip.hunger.desc=Fills +tooltip.saturation.desc=Saturation + +tooltip.itemMiscMashedFood.desc=Used to make Fertilizer +tooltip.itemMiscRefinedIron.desc=Iron, but better +tooltip.itemMiscRefinedRedstone.desc=Redstone, but better +tooltip.itemMiscCompressedIron.desc=Iron, but compressed +tooltip.itemMiscSteel.desc=Like Iron, but stronger. Much stronger. +tooltip.itemFertilizer.desc=Om nom nom. Don't eat it. +tooltip.itemMiscDough.desc=Used to make things that involve dough. +tooltip.itemMiscPaperCone.desc=Used to store foodstuffs! + +tooltip.itemFoodBaguette.desc=It's french. It's noms. +tooltip.itemFoodPizza.desc=Who doesn't like it? +tooltip.itemFoodHamburger.desc=It's from a german city! +tooltip.itemFoodBigCookie.desc=Do you know? The Subway Thing? +tooltip.itemFoodSubmarineSandwich.desc=Do you know? The Subway and everything else Thing? +tooltip.itemFoodToast.desc="GHOSTS! GHOSTS! TOAST!" +tooltip.itemFoodChocolate.desc=Lari likes. +tooltip.itemFoodChocolateCake.desc=Looks delicious. With redberries. Or something. +tooltip.itemFoodNoodle.desc=Just one. Like... that's not much. +tooltip.itemFoodSpaghetti.desc=The most generic food ever. So clichée. +tooltip.itemFoodFrenchFry.desc=French. Fry. +tooltip.itemFoodFrenchFries.desc=Much like French Fires, but actually taste good. +tooltip.itemFoodFishNChips.desc=It's Fish. It's Chips. Or French Fries. Whatevs. +tooltip.itemFoodCarrotJuice.desc=Carrots, but pressed! +tooltip.itemFoodPumpkinStew.desc=Like Mushroom Stew or Rabbit Stew, but pumpykinny. +tooltip.itemFoodCheese.desc=Cheese. \ No newline at end of file diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemFertilizer.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFertilizer.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemFertilizer.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemFertilizer.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png new file mode 100644 index 000000000..cf6fb5aa2 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png new file mode 100644 index 000000000..602966bc2 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png new file mode 100644 index 000000000..677bda4ae Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png new file mode 100644 index 000000000..7559422df Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png new file mode 100644 index 000000000..2ced8770d Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png new file mode 100644 index 000000000..151e7f612 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png new file mode 100644 index 000000000..3fb07bae9 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png new file mode 100644 index 000000000..85f0d00c8 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png new file mode 100644 index 000000000..fc27dca53 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png new file mode 100644 index 000000000..cb5cbe6e1 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png new file mode 100644 index 000000000..472c0ea19 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png new file mode 100644 index 000000000..fcd882dab Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png new file mode 100644 index 000000000..94667f9c3 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png new file mode 100644 index 000000000..7d4140431 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png new file mode 100644 index 000000000..df4e1508a Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png differ diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png new file mode 100644 index 000000000..4b6bb7405 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscCompressedIron.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscCompressedIron.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemMiscCompressedIron.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscCompressedIron.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png new file mode 100644 index 000000000..bee66f441 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMashedFood.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscMashedFood.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMashedFood.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscMashedFood.png diff --git a/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png new file mode 100644 index 000000000..dc15878e9 Binary files /dev/null and b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscRefinedIron.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscRefinedIron.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemMiscRefinedIron.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscRefinedIron.png diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscRefinedRedstone.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscRefinedRedstone.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemMiscRefinedRedstone.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscRefinedRedstone.png diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscSteel.png b/src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscSteel.png similarity index 100% rename from src/main/resources/assets/someprettytechystuff/textures/items/itemMiscSteel.png rename to src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscSteel.png diff --git a/src/main/resources/assets/someprettytechystuff/lang/en_US.lang b/src/main/resources/assets/someprettytechystuff/lang/en_US.lang deleted file mode 100644 index 83c5edac9..000000000 --- a/src/main/resources/assets/someprettytechystuff/lang/en_US.lang +++ /dev/null @@ -1,43 +0,0 @@ -itemGroup.someprettytechystuff=SomePrettyTechyStuff - -item.itemMiscMashedFood.name=Mashed Food -item.itemMiscMatterAccellerator.name=Matter Accellerator -item.itemMiscRefinedIron.name=Refined Iron -item.itemMiscRefinedRedstone.name=Refined Redstone -item.itemMiscCompressedIron.name=Compressed Iron -item.itemMiscSteel.name=Steel -item.itemFertilizer.name=Fertilizer - -tile.blockOreCopper.name=Copper Ore -tile.blockOreTin.name=Tin Ore -tile.blockOreLead.name=Lead Ore -tile.blockOreSilver.name=Silver Ore -tile.blockOreTungsten.name=Tungsten Ore -tile.blockOreQuartz.name=Quartz Ore -tile.blockOrePlatinum.name=Platinum Ore -tile.blockOreAluminum.name=Aluminum Ore -tile.blockOreZinc.name=Zinc Ore -tile.blockOreCobalt.name=Cobalt Ore - -tooltip.shiftForInfo.desc=Press Shift for Info -tooltip.hunger.desc=Fills -tooltip.saturation.desc=Saturation - -tooltip.blockOreCopper.desc=Used for ...something. -tooltip.blockOreTin.desc=Used for ...something. -tooltip.blockOreLead.desc=Used for ...something. -tooltip.blockOreSilver.desc=Used for ...something. -tooltip.blockOreTungsten.desc=Used for ...something. -tooltip.blockOreQuartz.desc=Used for ...something. -tooltip.blockOrePlatinum.desc=Used for ...something. -tooltip.blockOreAluminum.desc=Used for ...something. -tooltip.blockOreZinc.desc=Used for ...something. -tooltip.blockOreCobalt.desc=Used for ...something. - -tooltip.itemMiscMashedFood.desc=Used to make Fertilizer -tooltip.itemMiscMatterAccellerator.desc=Accellerates Matter. What did you expect? -tooltip.itemMiscRefinedIron.desc=Iron, but better -tooltip.itemMiscRefinedRedstone.desc=Redstone, but better -tooltip.itemMiscCompressedIron.desc=Iron, but compressed -tooltip.itemMiscSteel.desc=Like Iron, but stronger. Much stronger. -tooltip.itemFertilizer.desc=Om nom nom. Don't eat it. \ No newline at end of file diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropDiamondStage3.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropDiamondStage3.png deleted file mode 100644 index 6b704ea94..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropDiamondStage3.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropGoldStage3.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropGoldStage3.png deleted file mode 100644 index 82cc79be5..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropGoldStage3.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropIronStage3.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropIronStage3.png deleted file mode 100644 index 9f0f90cfc..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropIronStage3.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png deleted file mode 100644 index d86bce1ca..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png deleted file mode 100644 index 62d0418d5..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png deleted file mode 100644 index bb1337daa..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png deleted file mode 100644 index 7a0fe2d2e..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMatterAccellerator.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMatterAccellerator.png deleted file mode 100644 index c2e5802dd..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMatterAccellerator.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png deleted file mode 100644 index 7e25ab0bd..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileGold.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemPileGold.png deleted file mode 100644 index 1239fe4fe..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileGold.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileIron.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemPileIron.png deleted file mode 100644 index b2914d896..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileIron.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileRedstone.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemPileRedstone.png deleted file mode 100644 index bc522d01b..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileRedstone.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png deleted file mode 100644 index eb890e055..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedGold.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedGold.png deleted file mode 100644 index 3f1b574d3..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedGold.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedIron.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedIron.png deleted file mode 100644 index 45194479d..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedIron.png and /dev/null differ diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedRedstone.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedRedstone.png deleted file mode 100644 index 8ce0d5c16..000000000 Binary files a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedRedstone.png and /dev/null differ