From 6905c3c8f907d063c83698ab7a7415d09eb8c5e3 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 30 Jan 2015 20:16:32 +0100 Subject: [PATCH] Dat rename tho! --- build.gradle | 4 +- .../SPTS.java | 22 +++--- .../blocks/BlockContainerBase.java | 4 +- .../blocks/DefaultItemBlock.java | 4 +- .../blocks/InitBlocks.java | 2 +- .../blocks/models/ModelBaseSPTS.java | 2 +- .../blocks/renderer/BlockBaseRenderer.java | 4 +- .../blocks/renderer/ItemBaseRenderer.java | 4 +- .../blocks/renderer/RenderRegistry.java | 2 +- .../crafting/InitCrafting.java | 51 ++++++++++++++ .../creative/CreativeTab.java | 25 +++++++ .../event/UpdateEvent.java | 2 +- .../gen/OreGen.java | 2 +- .../inventory/GuiHandler.java | 6 +- .../items/InitItems.java | 8 +-- .../items/ItemFertilizer.java | 6 +- .../items/ItemFoods.java | 63 ++++++------------ .../items/ItemMisc.java | 40 +++++------ .../items/metalists/TheFoods.java | 46 +++++++++++++ .../items/metalists/TheMiscItems.java | 24 +++++++ .../items/tools/ItemAxeSPTS.java | 6 +- .../items/tools/ItemHoeSPTS.java | 6 +- .../items/tools/ItemPickaxeSPTS.java | 6 +- .../items/tools/ItemShovelSPTS.java | 6 +- .../items/tools/ItemSwordSPTS.java | 6 +- .../proxy/ClientProxy.java | 4 +- .../proxy/IProxy.java | 2 +- .../proxy/ServerProxy.java | 2 +- .../tile/TileEntityBase.java | 2 +- .../tile/TileEntityInventoryBase.java | 2 +- .../util/Util.java | 6 +- .../crafting/InitCrafting.java | 9 --- .../creative/CreativeTab.java | 19 ------ .../someprettyrandomstuff/lang/en_US.lang | 57 ++++++++++++++++ .../textures/items/itemFertilizer.png | Bin .../textures/items/itemFoodBaguette.png | Bin 0 -> 277 bytes .../textures/items/itemFoodBigCookie.png | Bin 0 -> 313 bytes .../textures/items/itemFoodCarrotJuice.png | Bin 0 -> 264 bytes .../textures/items/itemFoodCheese.png | Bin 0 -> 276 bytes .../textures/items/itemFoodChocolate.png | Bin 0 -> 646 bytes .../textures/items/itemFoodChocolateCake.png | Bin 0 -> 295 bytes .../textures/items/itemFoodFishNChips.png | Bin 0 -> 563 bytes .../textures/items/itemFoodFrenchFries.png | Bin 0 -> 569 bytes .../textures/items/itemFoodFrenchFry.png | Bin 0 -> 287 bytes .../textures/items/itemFoodHamburger.png | Bin 0 -> 288 bytes .../textures/items/itemFoodNoodle.png | Bin 0 -> 282 bytes .../textures/items/itemFoodPizza.png | Bin 0 -> 645 bytes .../textures/items/itemFoodPumpkinStew.png | Bin 0 -> 259 bytes .../textures/items/itemFoodSpaghetti.png | Bin 0 -> 348 bytes .../items/itemFoodSubmarineSandwich.png | Bin 0 -> 359 bytes .../textures/items/itemFoodToast.png | Bin 0 -> 304 bytes .../textures/items/itemMiscCompressedIron.png | Bin .../textures/items/itemMiscDough.png | Bin 0 -> 324 bytes .../textures/items/itemMiscMashedFood.png | Bin .../textures/items/itemMiscPaperCone.png | Bin 0 -> 537 bytes .../textures/items/itemMiscRefinedIron.png | Bin .../items/itemMiscRefinedRedstone.png | Bin .../textures/items/itemMiscSteel.png | Bin .../someprettytechystuff/lang/en_US.lang | 43 ------------ .../blocks/blockCropDiamondStage3.png | Bin 327 -> 0 bytes .../textures/blocks/blockCropGoldStage3.png | Bin 325 -> 0 bytes .../textures/blocks/blockCropIronStage3.png | Bin 342 -> 0 bytes .../blocks/blockCropRedstoneStage3.png | Bin 327 -> 0 bytes .../textures/blocks/blockCropStage0.png | Bin 241 -> 0 bytes .../textures/blocks/blockCropStage1.png | Bin 260 -> 0 bytes .../textures/blocks/blockCropStage2.png | Bin 305 -> 0 bytes .../items/itemMiscMatterAccellerator.png | Bin 258 -> 0 bytes .../textures/items/itemPileDiamond.png | Bin 286 -> 0 bytes .../textures/items/itemPileGold.png | Bin 284 -> 0 bytes .../textures/items/itemPileIron.png | Bin 286 -> 0 bytes .../textures/items/itemPileRedstone.png | Bin 280 -> 0 bytes .../textures/items/itemSeedDiamond.png | Bin 270 -> 0 bytes .../textures/items/itemSeedGold.png | Bin 269 -> 0 bytes .../textures/items/itemSeedIron.png | Bin 290 -> 0 bytes .../textures/items/itemSeedRedstone.png | Bin 275 -> 0 bytes 75 files changed, 304 insertions(+), 193 deletions(-) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/SPTS.java (62%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/BlockContainerBase.java (94%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/DefaultItemBlock.java (88%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/InitBlocks.java (59%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/models/ModelBaseSPTS.java (72%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/renderer/BlockBaseRenderer.java (90%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/renderer/ItemBaseRenderer.java (95%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/blocks/renderer/RenderRegistry.java (87%) create mode 100644 src/main/java/ellpeck/someprettyrandomstuff/crafting/InitCrafting.java create mode 100644 src/main/java/ellpeck/someprettyrandomstuff/creative/CreativeTab.java rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/event/UpdateEvent.java (89%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/gen/OreGen.java (97%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/inventory/GuiHandler.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/InitItems.java (67%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/ItemFertilizer.java (89%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/ItemFoods.java (61%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/ItemMisc.java (57%) create mode 100644 src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheFoods.java create mode 100644 src/main/java/ellpeck/someprettyrandomstuff/items/metalists/TheMiscItems.java rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/tools/ItemAxeSPTS.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/tools/ItemHoeSPTS.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/tools/ItemPickaxeSPTS.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/tools/ItemShovelSPTS.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/items/tools/ItemSwordSPTS.java (85%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/proxy/ClientProxy.java (64%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/proxy/IProxy.java (75%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/proxy/ServerProxy.java (77%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/tile/TileEntityBase.java (94%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/tile/TileEntityInventoryBase.java (98%) rename src/main/java/ellpeck/{someprettytechystuff => someprettyrandomstuff}/util/Util.java (84%) delete mode 100644 src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java delete mode 100644 src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java create mode 100644 src/main/resources/assets/someprettyrandomstuff/lang/en_US.lang rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemFertilizer.png (100%) create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBaguette.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodBigCookie.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCarrotJuice.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodCheese.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolate.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodChocolateCake.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFishNChips.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFries.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodFrenchFry.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodHamburger.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodNoodle.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPizza.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodPumpkinStew.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSpaghetti.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodSubmarineSandwich.png create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemFoodToast.png rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemMiscCompressedIron.png (100%) create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscDough.png rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemMiscMashedFood.png (100%) create mode 100644 src/main/resources/assets/someprettyrandomstuff/textures/items/itemMiscPaperCone.png rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemMiscRefinedIron.png (100%) rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemMiscRefinedRedstone.png (100%) rename src/main/resources/assets/{someprettytechystuff => someprettyrandomstuff}/textures/items/itemMiscSteel.png (100%) delete mode 100644 src/main/resources/assets/someprettytechystuff/lang/en_US.lang delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropDiamondStage3.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropGoldStage3.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropIronStage3.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemMiscMatterAccellerator.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileGold.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileIron.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileRedstone.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedGold.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedIron.png delete mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedRedstone.png 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 0000000000000000000000000000000000000000..cf6fb5aa25a05ffec74c4eb7efb72e1b66b427d1 GIT binary patch literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((WKS2z z5DWig1+gh@-iJTb3#{v$mgwq4InGjh zqH)mBWAk1)`8?(erp+b|20oknTNUb!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((c25__ z5DWja6K%Pe3@?V=_aq zhB>YBw6_2g2lFp(p9Qltc^kN8*KtPgk9ooIYrWP|^-fp22WQ%mvv4F FO#qpGbXEWW literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..677bda4ae1b696ddecaafac85af79eeae06cc4ae GIT binary patch literal 264 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_&Oo2QFo zh=qT$#GMCT>z@C&UD) z8}sJ>&f@1D<*YuJ*TwGkxX!~QBH8dReG(62X5D;!Rz3>>-oq}EP2R>l!X_+F@+UZT z@g7(v=;k~%i9N)SVVT72v?jI#3_gZNZC-)G1_lfaX1=%Py!^G*1?VCMPgg&ebxsLQ E05+Id761SM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7559422df4e6cc634b1a44ab0830376852eb0821 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((Bu^K| z5DWig39AEFXa2V5aNc=@afX^e+)k%w|KCc#YT-S&j8isQ!l_5CgvXra$PBwsuGLB< zb0(^_H2M1O_}9$KaI@>QKnia!Z&E_3K~ECHCdD5nipf084iZZk=c`HRX^OZ?FbFxA zF~l13G{>-9VmbW4frT-}`2ugl&6b6nvIlq=B^|b?l`t5!r1&!PNJubD6Od`j@(}n8 PbRC1ItDnm{r-UW|qN2bZe?^J zG%heMGmPe!Pyhe|1W80eR5(v#pcve|xgCsM4aFH2*ZVV^I*`av6=%s1?xe;LY_AH& zlS0`T&Me7iSlasBO7kM)%h;f1yfHZ(K zPVUNKIDLE(gN?pCLy9FMLy0ppLus5W!;yW981CLVzyQ`!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((QcoAh z5DWja{f=CR3qfyO{eY{rTB%qFWsI zd4jS|9>3WA^M>_ppHgQju>^7!lRvjjtnwb7mC9gzR zU*FF#k^QJw!M$}??o9geXl;D@%ZR-kPl7t)9-Lm7a4UaG;q{kIA{%u)Bxin5K5$~` nbi)&ejrjGA#PqX*elcmjyS1GARpmyYgBd(s{an^LB{Ts5+|+NA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3fb07bae9eebcff662c579fe551de6db7c71abc4 GIT binary patch literal 563 zcmV-30?hr1P)N2bZe?^J zG%heMGmPe!Pyhe{u}MThR5(wSlg~>6K@`W|KM>jvB0Pi#!8!zCL>)4W2oDuRRFDu} zDu{w0PzcIX(4p<>K}ci|dk{rRx}=c1A}AUXBnq7*u%smP;&Ji~JKOFeln=hUv$OO0 zykVDtvDqb>$65{cA`!5k`hiQQAzCiOZKXnU)@p&B<6v75;7XF{oONaaHV!=S?>cmw zh|^&r^5fs725@|L(}O?_sK*Z{gM?e|qmh>aWHK2D1OiI*@b&pG9Ch~-|GI$+aL!_z z14xw06by&M6lQ?Fvl?dek$N4V)NG&5}?qCw~aJP>@U}=^~V3g2A8?d|xaUNh}tlf|o`^Cgox~K#4v~j)KkI zV<^7ALG}9!=s>K#(mUIt9>%Bz`yLYQNZnD$cB&NX=c`0O;#!4J*F){;c>>c9X1002ovPDHLkV1lcm B=w<)_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..85f0d00c868d5bab796ea75bea54ef916643cb87 GIT binary patch literal 569 zcmV-90>=G`P)N2bZe?^J zG%heMGmPe!Pyhe{w@E}nR5(wSlff$lQ5?s={{czT9^{~wgA$1YB55y_graakiE^S8 zdr}V8)nUt~Im}^OEj9=3wsvOQb~md@Xvs-x*^s!{+nC>5ziDP8y!y`X&HMenpWl1E z9_risgidlf%mf1HT-k;v9>-obi-YTHq1E?ybb34(lVxnGs#tTj^3ZShSXEVjc6v@DyIUfuL1>o}K1<)Sug^q77peTwSi9|#Z?TSQj7UeZf(?_Nk zh3D?|xd>41Zbjq{1Su862{60lhIACO1Dd<~g&1PoiXIAuY|3OZdhfs}me)OY02v*% z4JfOqG65u6mQ6EvpIBJ71L(t$x|VK~S5^xMou7BXW@=&uY{X&!T?IjCfgp{>%lrvY z>ufU3@sAIj886s;rVQyFniK#!uT^AZbE|6*=Z{ZD^E5sIM5*yZb+)Hz00000NkvXX Hu0mjfS&s2= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fc27dca53af1f161696a2336c8a8517e00196f84 GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((Tu&Fr z5DWjM0S9?o40w|Je2VSeUVLWTAt}))7}3OP`SZZkY}X5~lp;$P-Qe>P{3w2DA@kSD zw-m+Kw?0Zzh->qN#!KU{y zmo|qmtUFy{cs=EvfUon8j+3!$OQ$@G?p(*MaqWL$x!nbmeQ(kvwIqGjv<^PN!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((JWm(L z5DWig3DzBrd*$xeOSEwbvO7ox?LGQ%hguX{k7LdXp*svqZXS0MSXb!OCnR%TJM3?~ zl%DSmftML=|NrY7{0Y}f|FM5s<3szN^%KrI%n8?eTk=0WD&yaL!N-5)hkzRbqRKB6`46kO eKks1V;b905$k^0e)AbPOQU*^~KbLh*2~7ZKuWM)k literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..472c0ea197f1b74fa1a83e0c7180d288c7d720dd GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((3{Mxw z5DWjQlQ!};7zi*Mi;2qK4%)!Tt9@Yu&xuL0KA%{UPX2oS`1cZpzgO#g)Nk7{#%%w1 zr76B!AV^?C%%QWX79vkVYlYjCPE;SeCwlPdnw=U=&r(kqf9bi_l`x;tt+mr;sdM|^ z=(InYjDb@n*Dh6=QnYUls} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fcd882dab65b775293529f68aed16f677e077944 GIT binary patch literal 645 zcmV;00($+4P)N2bZe?^J zG%heMGmPe!Pyhe|14%?dR5(w~kzGiWVHk$LR%5BvT;(>aK`c8k4+JAj3OAyklOhme z6%i!SQIODCbPx=RCX|My2ZkjD*~Iaw{aH4cpJuWx%N2}eTTa`L{mfa|+10+aL2G#K z4bQ>L{a!cs^S;8;l;2v5Ji+EF;@t+KH%&yE_K>j`R~l+D(|Ns)N!K}|U1iKk<-EJ1 zA$nKEM_Y9|ICDK$vf;6;B{8~-SK4kMD-pWjA?-DW-U zP8G3xDkd-M2s}0t8Qx0JT1N7vg5+x@V?9TC`{X3v1Nz)1a-wIij!#bw40V{8Ze2;z zxh%DR0TFQ%{<8+Y_b7?BtC)9c@SRwn8z3KIch>N0+`xxNl}ueNr17GK#MnlrQjNkR zhnQ|J;@e08GmPt;cfT$- z;Mw^dxT;GDzbIkeXCmIUg69^29}XqI$JNZ-(BQ5urKO>c(14Dwy?SIOg9}3Q@on6% zD#6)S$%Mne+@ONMEdjByhM$s_xLu9wv_Rjro%s8Tks7qfOa}j}Y{Yx;%ys}{S2Yhw=PT==|8OD;chK$_2rAh|0)~w f|77eXB|-QD-8f-E^;GGV00000NkvXXu0mjf%K#&p literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..94667f9c335c196e37908560bc713a72e7720576 GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_&Oqo<2w zh=qT$1gi;C*sGlX8xvQUiMT45S;;?P6_8%VE83vq&~~6;gQ|Lja0grB xo>_?uY0^HzJco}gJjKC0gKd&2pXq@EKvy2^KYu~*wLH)<44$rjF6*2Ung9ngQPKba literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7d41404315c4bfb22bfda72341f250308a259710 GIT binary patch literal 348 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((El(H6 z5DWig304!Puva<%6K^<9{kngvl=ckXsmFK|X3cBk`ct2B{`3Ed44?nIJDvGIKeg*m z{S-AGbCFdtq9?kI{?>1C{rO+nf8T$9ot^*fjUN2@f1>~Ye`Vdi|NSKmGsHFCAN>CR zqEPF9g{=X(91KDsqKSX%P2IozU#zfzd)Lzc_Js_)oERT1Qa8KvfBlq>|JwzUj^sKl zwEzFVSbFL~E{7kFTxR|^Z(=>b*8D@ka)S58bg=d#Wzp$P!WZHDRq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..df4e1508a0716b2d531020e071db180986a45925 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((Q%@Ji z5DWjQLDpP{97Jjqd!0nq=xh-Lv8ITZiZ%@uQtKaC&YO9hZ%y{5 zbD#zvS)~p{%9eM2wH|{VG z>05L?cmF*Fk?BvRJ_mJ_TzA^*IHSk-{_|ODjjG!#EMJF6wC748kw!g>PBL7MH1l%1Z@=94$I{}^ zI@3Ty2j*{Qo@Cs#OGvQ(R^{iVcBtOk@}|NkwoqT@7e_MhTmyQT!PC{xWt~$(69DVp Bk1YTI literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b6bb7405f8e08767afae0071f9e37fc96d869f1 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((I!_nJ z5DWigiI@lf|NrNCHfv9USqEEUwXL0jyo$RBL*}dri@(@kjh12k9l_D$>tM!lG(cdv zNsLs>|LZQN8w@>^jd(-5UP{eiIMYyhbk%>ybqt9!5*5S`#59UF%;7U)h&0}$c;cP| zcsx`8F+Qh8_!5@qn`mR?KW{45r*G{Z{q))Bs)1;OXk;vd$@?2>`Q6VLJc- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bee66f441f15ee7284e76cbfaca37773d087a76b GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((Ax{^_ z5DWjM6AZbS34z+)ijSkSy2kEoEQi!1c2*ZtC^3+}Bc?^kzRF7g_a2iKP`0SX2CqWNt*)i0zja8Xl=yP$DFc%j2D#)D-S{kenWIeun- z`^&oZNu}VLA`4j?#&(|xO>ISs8FnxPT{yad=boE#Ye=BMVY3+z-|u+Cs3-1n;@+t{ R^MSr$@O1TaS?83{1ON|9d)EK} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dc15878e9d0c7b9d2fb60376d7967b1ae35366b2 GIT binary patch literal 537 zcmV+!0_OdRP)N2bZe?^J zG%heMGmPe!Pyhe{mq|oHR5(xFlfg>@Q4q%GKPVz1I)sP7Is{QfU5p~4OF@SU3c6Jg z1f3Lu@Dy}t&mBBS>|sGMWs$tBn7fPUvc?i53Y{ddpd|F-@wGGg9x4@dZQ$GYn3?bQ zhJ8F3pI;%})oO4Mi-GU-3MA8nn{pY{N`-XRY=TdcU`J8l(l99Jom+y8fhMA_x z3WWl*EQ^%S=P8FZ-iLMBwgEuqN{umQ~o=@o|~U~B&boR?>)e!K&1^y(9>e8gTesuOVN4}yG~ z?FLLQtdTgxy;i)gE)|PKw!FR#fpe)FfW{He1oRCI2>?n_6k+D4?;Qua0r=sNv6)5a z9~>qK{y;tjH{&6lfQxJv0Ivcem_W#+`!W%LhF*ERQ^IVvT5#{aVDU`<60@rt@bLQP b9&W)WRHEhK-LaV;00000NkvXXu0mjf>c!($ literal 0 HcmV?d00001 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 6b704ea94994830074ee5d284e48c3cf197a82f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((QBN1g z5DWjMfrfmC6$DN@zqJ0vBsZaPDkEE&-Nm){UrgE>y!6s9mHB!vSBhq-2%r1W)2Q0= zK|H32P0x~f`kY4Za|cw@A541uH#YD5$8P477kl{|7JdGzXpvi_E6$vf>@CI)58w8=9Z|Dc+ZF8Pq{L}?{>zD%DY4h@I%%d}m{K_N#H*AB zf$16I2M)6M-j8#aPU=zGlz!HdUuAQ7gR;YEySu!cZ!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((VNVyw z5DWjMfsS0viadAzf6@HwwC^#q&6}&uayDWub*rDtaZU4_IpHo_SBQk^WKWq=;febN zCTVk=6m5CJ@r9%UpZ*-tXxRXLo+L z3FEEEQdyvVKGD|1L11p5(+xGHwVmHqSWnf;9G7<6C1F|qi-S0#LT=By}Z;C1rt33 zJ>#Bd(*uBNj(fT|hFJJ74K(CpRutIN{;PjWW)8EE&ZUS9#U+*-{3fO^Ip@x^*iM;q=ZzDWMm<1urD! i4;b)Nnm)hti81%gJhxTTgt>uUV(@hJb6Mw<&;$TOy@HDX 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 d86bce1ca76cc3edf0e37c709c765874456163c3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((QBN1g z5DWjMfrfmC6?j~{K6%%-?@V&ID{-RX%EXoXi>s&g$YiZ_lI**2{N|jw4ldgtOwukm zDZ1kcS4cFJ_tr*4J3O`20VvB;rA z^%i$QMw4L)|GoQ?tcGraw<5hYdD6?+B^aaDO0PfIxR;?l<}I^^o3m_h$07D|-?D{~ T9Y+I!9%Arx^>bP0l+XkKFY0>% 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 62d0418d5911ceee6edb76f29e6e31175462377a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBNl001;LoEE4p4rHIK!JxfknOA08plTNDt!+Z!R`a5@tS^{=J6gqQ`fqp z1v~t4t$O~GYDC3Ds2wPpTY%wlR3R L`njxgN@xNAj{H}+ 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 bb1337daa7b4afe1006d7c9fde98951d9eb8545e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBNNm6(c=phjcxlJKt0Z#GxX`TkE_ zLo`5ZL5Rc3h9JhJOkS*0xWEE)wp_FNslIyQllr|iZCf@>dzN#r-aLKx?aFe-Epr@LISiMc06Kud)78&qol`;+0Mr#%cK`qY 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 7a0fe2d2efa40e5f07e18131e06abe4f34549df9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBN7J0fjhFJJ7onXl4qR8R$-*Imr`v!wDv8Wr>j%LYBr$22}i0(PaZY(r^ z%BA?CL>IlD6Rm`0hEFA1K(qUirgr$0|G9gvy??I_bP0l+XkKiga*M 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 c2e5802ddfc15d05c4efa92eb3047a82b8127ef1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ>#Bd(*uBNialK%LoEES_B`ZlP!Mplzn;OAo*`r&aL21dX7irIr#m$E)_r}TcxW&G z|0Lf^<=5NgInTbi@or*v$H`6Wnf(!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>b4B{hlt4ArbCxCv4 z<|f&n^Zs)vwtV0|UG;N9?oIATmmgbRj$=|(u)iN?oU8gx-#k~f?}^xsd-sdAQdM_I zOi_Bm?YE#rD5guKQMD)O{An(Y#>Gs_mM}y#X?(xRa_UJ_Li~{(`~QaZA1W&Z8vNhr anE3QwL7(7zKAk|PF?hQAxvX!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>b4By`C!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>b4B{hlt4ArbCxCmrN;Q50}~dyebP5urCH!lvI6;>1s;*b3=DjSL74G){)!Z!phSslL`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo^j8!=>b4Bot`d^ArbCxCm3?II0&#jcV70Ly*U2S|A%uX<<23`udEE)y>Q1WaxwGiBq=;{fXEtyzKeOnPM5S zPTQyNa7zly&^>To@S18Cp3Kd%wPVreuaWjbecio=$7;NfuqN=9 V*;oJLJq>gegQu&X%Q~loCIGPfW|sf} 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 eb890e0557d75fb4004b215c2c61ca72c3c4da9f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_&OkEe@c zh=u>riH=+i20SdEFZ|-0|Ke!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_&Ox2KC^ zh=u>riGh3#3LI@a{oP-3-P^c)-PL0LT(c?j6<40ldVM>C`Qc>ARsj0#LT=By}Z;C1rt33 zJ>#Bd(*uBNCVRR#hFJI?ow$*=!GMRwHsjlZR3<5{umvZXM0y<0DmnK3nV2l&;&RZl z|4IK}LkGnc|Dv;UJJb5L66XD$)n}o8cY*C%E|c8TGenmwo)lbI$Ft!D+wB;pAC1vZ z*BnT{_u3$oL1Wp0<~?RAWy>TVx!=sX5bS3j3^P6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((L{AsT z5DWjK6YugiDDbq*=7`=jx&Pe*mb`YkmlK07dQ^PyKDWePW~rA~rq|sk9lK5nni|Y> z{UqnKjn^#wYQd3+S=&-Iqx3U9CH6~I*}yceBjr`M~q;;QzU^8S^h}I3!z9EYII~_`g&`CbQr~;iyluZW|n4 RCk=EQgQu&X%Q~loCII+eWBULA