From 763ddfb7188c1a3b85e5247e4818589663a4915e Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 5 Jan 2015 22:14:01 +0100 Subject: [PATCH] Changing stuff! --- README.md | 3 - build.gradle | 4 +- .../gemification/blocks/InitBlocks.java | 24 ---- .../gemification/booklet/ChapterList.java | 14 -- .../gemification/crafting/InitCrafting.java | 21 --- .../ellpeck/gemification/items/InitItems.java | 21 --- .../Gemification.java | 22 ++-- .../blocks/BlockContainerBase.java | 4 +- .../blocks/BlockCrop.java | 63 +++++++++ .../blocks/BlockCrucible.java | 44 ++----- .../blocks/BlockCrucibleFire.java | 38 ++---- .../blocks/DefaultItemBlock.java | 29 +++++ .../blocks/InitBlocks.java | 39 ++++++ .../blocks/OreGem.java | 12 +- .../blocks/models/ModelBaseG.java | 2 +- .../blocks/models/ModelCrucible.java | 3 +- .../blocks/models/ModelCrucibleFire.java | 2 +- .../blocks/models/RendererCrucible.java | 4 +- .../blocks/models/RendererCrucibleFire.java | 4 +- .../models/RendererHoldingTileEntity.java | 2 +- .../booklet/Chapter.java | 4 +- .../booklet/ChapterList.java | 14 ++ .../booklet/ContainerInfoBook.java | 2 +- .../booklet/GuiInfoBook.java | 34 +++-- .../booklet/ItemInfoBook.java | 10 +- .../crafting/CrucibleCraftingManager.java | 4 +- .../crafting/CrucibleRecipe.java | 4 +- .../crafting/InitCrafting.java | 38 ++++++ .../creative/CreativeTab.java | 8 +- .../gen/OreGen.java | 6 +- .../inventory/GuiHandler.java | 22 ++-- .../container/ContainerCrucible.java | 12 +- .../container/ContainerCrucibleFire.java | 11 +- .../inventory/gui/GuiCrucible.java | 22 ++-- .../inventory/gui/GuiCrucibleFire.java | 8 +- .../someprettytechystuff/items/InitItems.java | 67 ++++++++++ .../items/ItemGem.java | 10 +- .../items/ItemInfusedIron.java | 32 +++++ .../someprettytechystuff/items/ItemPile.java | 63 +++++++++ .../someprettytechystuff/items/ItemSeed.java | 38 ++++++ .../items/tools/ItemAxeG.java | 34 +++++ .../items/tools/ItemHoeG.java | 34 +++++ .../items/tools/ItemPickaxeG.java | 34 +++++ .../items/tools/ItemShovelG.java | 34 +++++ .../items/tools/ItemSwordG.java | 34 +++++ .../proxy/ClientProxy.java | 10 +- .../proxy/IProxy.java | 2 +- .../proxy/ServerProxy.java | 2 +- .../tile/TileEntityBase.java | 4 +- .../tile/TileEntityCrucible.java | 24 ++-- .../tile/TileEntityCrucibleFire.java | 4 +- .../tile/TileEntityInventoryBase.java | 2 +- .../util/GemType.java | 4 +- .../util/Util.java | 10 +- .../assets/gemification/lang/en_US.lang | 75 ----------- .../someprettytechystuff/lang/en_US.lang | 122 ++++++++++++++++++ .../blocks/blockCropDiamondStage3.png | Bin 0 -> 327 bytes .../textures/blocks/blockCropGoldStage3.png | Bin 0 -> 325 bytes .../textures/blocks/blockCropIronStage3.png | Bin 0 -> 342 bytes .../blocks/blockCropRedstoneStage3.png | Bin 0 -> 327 bytes .../textures/blocks/blockCropStage0.png | Bin 0 -> 241 bytes .../textures/blocks/blockCropStage1.png | Bin 0 -> 260 bytes .../textures/blocks/blockCropStage2.png | Bin 0 -> 305 bytes .../textures/blocks/models/modelCrucible.png | Bin .../blocks/models/modelCrucibleFire.png | Bin .../textures/blocks/oreGemAlmandineGarnet.png | Bin .../textures/blocks/oreGemChromeDiopside.png | Bin .../textures/blocks/oreGemClinohumite.png | Bin .../textures/blocks/oreGemDanburite.png | Bin .../textures/blocks/oreGemGoshenite.png | Bin .../textures/blocks/oreGemHematite.png | Bin .../textures/blocks/oreGemIolite.png | Bin .../textures/blocks/oreGemJasper.png | Bin .../textures/blocks/oreGemLepidolite.png | Bin .../textures/blocks/oreGemOnyx.png | Bin .../blocks/oreGemParaibaTourlamine.png | Bin .../textures/blocks/oreGemRhodochrosite.png | Bin .../textures/blocks/oreGemSmithsonite.png | Bin .../textures/blocks/oreGemSodalite.png | Bin .../textures/blocks/oreGemSphene.png | Bin .../textures/blocks/oreGemTourmaline.png | Bin .../textures/gui/guiCrucible.png | Bin .../textures/gui/guiCrucibleFire.png | Bin .../textures/gui/guiInfoBook.png | Bin .../textures/items/itemGemAlmandineGarnet.png | Bin .../textures/items/itemGemChromeDiopside.png | Bin .../textures/items/itemGemClinohumite.png | Bin .../textures/items/itemGemDanburite.png | Bin .../textures/items/itemGemGoshenite.png | Bin .../textures/items/itemGemHematite.png | Bin .../textures/items/itemGemIolite.png | Bin .../textures/items/itemGemJasper.png | Bin .../textures/items/itemGemLepidolite.png | Bin .../textures/items/itemGemOnyx.png | Bin .../items/itemGemParaibaTourlamine.png | Bin .../textures/items/itemGemRhodochrosite.png | Bin .../textures/items/itemGemSmithsonite.png | Bin .../textures/items/itemGemSodalite.png | Bin .../textures/items/itemGemSphene.png | Bin .../textures/items/itemGemTourmaline.png | Bin .../textures/items/itemInfoBook.png | Bin .../textures/items/itemInfusedIronAxe.png | Bin 0 -> 318 bytes .../textures/items/itemInfusedIronHoe.png | Bin 0 -> 239 bytes .../textures/items/itemInfusedIronIngot.png | Bin 0 -> 400 bytes .../textures/items/itemInfusedIronPickaxe.png | Bin 0 -> 300 bytes .../textures/items/itemInfusedIronShovel.png | Bin 0 -> 265 bytes .../textures/items/itemInfusedIronSword.png | Bin 0 -> 364 bytes .../textures/items/itemPileDiamond.png | Bin 0 -> 286 bytes .../textures/items/itemPileGold.png | Bin 0 -> 284 bytes .../textures/items/itemPileIron.png | Bin 0 -> 286 bytes .../textures/items/itemPileRedstone.png | Bin 0 -> 280 bytes .../textures/items/itemSeedDiamond.png | Bin 0 -> 270 bytes .../textures/items/itemSeedGold.png | Bin 0 -> 269 bytes .../textures/items/itemSeedIron.png | Bin 0 -> 290 bytes .../textures/items/itemSeedRedstone.png | Bin 0 -> 275 bytes 115 files changed, 846 insertions(+), 347 deletions(-) delete mode 100644 README.md delete mode 100644 src/main/java/ellpeck/gemification/blocks/InitBlocks.java delete mode 100644 src/main/java/ellpeck/gemification/booklet/ChapterList.java delete mode 100644 src/main/java/ellpeck/gemification/crafting/InitCrafting.java delete mode 100644 src/main/java/ellpeck/gemification/items/InitItems.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/Gemification.java (63%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/BlockContainerBase.java (94%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrop.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/BlockCrucible.java (56%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/BlockCrucibleFire.java (65%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/OreGem.java (92%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/ModelBaseG.java (71%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/ModelCrucible.java (97%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/ModelCrucibleFire.java (98%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/RendererCrucible.java (90%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/RendererCrucibleFire.java (90%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/blocks/models/RendererHoldingTileEntity.java (97%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/booklet/Chapter.java (88%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/booklet/ChapterList.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/booklet/ContainerInfoBook.java (87%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/booklet/GuiInfoBook.java (76%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/booklet/ItemInfoBook.java (85%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/crafting/CrucibleCraftingManager.java (97%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/crafting/CrucibleRecipe.java (83%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/creative/CreativeTab.java (60%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/gen/OreGen.java (93%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/inventory/GuiHandler.java (71%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/inventory/container/ContainerCrucible.java (92%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/inventory/container/ContainerCrucibleFire.java (86%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/inventory/gui/GuiCrucible.java (86%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/inventory/gui/GuiCrucibleFire.java (84%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/InitItems.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/items/ItemGem.java (91%) create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/ItemInfusedIron.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/ItemPile.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/ItemSeed.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeG.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeG.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeG.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelG.java create mode 100644 src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordG.java rename src/main/java/ellpeck/{gemification => someprettytechystuff}/proxy/ClientProxy.java (76%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/proxy/IProxy.java (75%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/proxy/ServerProxy.java (77%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/tile/TileEntityBase.java (91%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/tile/TileEntityCrucible.java (91%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/tile/TileEntityCrucibleFire.java (95%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/tile/TileEntityInventoryBase.java (98%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/util/GemType.java (79%) rename src/main/java/ellpeck/{gemification => someprettytechystuff}/util/Util.java (84%) delete mode 100644 src/main/resources/assets/gemification/lang/en_US.lang create mode 100644 src/main/resources/assets/someprettytechystuff/lang/en_US.lang create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropDiamondStage3.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropGoldStage3.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropIronStage3.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/models/modelCrucible.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/models/modelCrucibleFire.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemAlmandineGarnet.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemChromeDiopside.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemClinohumite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemDanburite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemGoshenite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemHematite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemIolite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemJasper.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemLepidolite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemOnyx.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemParaibaTourlamine.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemRhodochrosite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemSmithsonite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemSodalite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemSphene.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/blocks/oreGemTourmaline.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/gui/guiCrucible.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/gui/guiCrucibleFire.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/gui/guiInfoBook.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemAlmandineGarnet.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemChromeDiopside.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemClinohumite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemDanburite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemGoshenite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemHematite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemIolite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemJasper.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemLepidolite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemOnyx.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemParaibaTourlamine.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemRhodochrosite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemSmithsonite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemSodalite.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemSphene.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemGemTourmaline.png (100%) rename src/main/resources/assets/{gemification => someprettytechystuff}/textures/items/itemInfoBook.png (100%) create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronAxe.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronHoe.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronIngot.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronPickaxe.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronShovel.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronSword.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileGold.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileIron.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemPileRedstone.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedGold.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedIron.png create mode 100644 src/main/resources/assets/someprettytechystuff/textures/items/itemSeedRedstone.png diff --git a/README.md b/README.md deleted file mode 100644 index 2d74377dd..000000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Gemification -============ -Magic with Gems! That's just awesome, isn't it? diff --git a/build.gradle b/build.gradle index 22e0a7bf1..898879ba0 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { apply plugin: 'forge' version = "1.7.10-1.0.1" -group = "ellpeck.gemification" -archivesBaseName = "Gemification" +group = "ellpeck.someprettytechystuff" +archivesBaseName = "SomePrettyTechyStuff" minecraft { version = "1.7.10-10.13.2.1264" diff --git a/src/main/java/ellpeck/gemification/blocks/InitBlocks.java b/src/main/java/ellpeck/gemification/blocks/InitBlocks.java deleted file mode 100644 index dc10de477..000000000 --- a/src/main/java/ellpeck/gemification/blocks/InitBlocks.java +++ /dev/null @@ -1,24 +0,0 @@ -package ellpeck.gemification.blocks; - -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; - -public class InitBlocks{ - - public static Block oreGem; - public static Block blockCrucible; - public static Block blockCrucibleFire; - - public static void init(){ - - oreGem = new OreGem(); - blockCrucible = new BlockCrucible(); - blockCrucibleFire = new BlockCrucibleFire(); - - GameRegistry.registerBlock(oreGem, OreGem.ItemBlockOreGem.class, oreGem.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(blockCrucible, BlockCrucible.ItemBlockCrucible.class, blockCrucible.getUnlocalizedName().substring(5)); - GameRegistry.registerBlock(blockCrucibleFire, BlockCrucibleFire.ItemBlockCrucibleFire.class, blockCrucibleFire.getUnlocalizedName().substring(5)); - - } - -} diff --git a/src/main/java/ellpeck/gemification/booklet/ChapterList.java b/src/main/java/ellpeck/gemification/booklet/ChapterList.java deleted file mode 100644 index f80368b96..000000000 --- a/src/main/java/ellpeck/gemification/booklet/ChapterList.java +++ /dev/null @@ -1,14 +0,0 @@ -package ellpeck.gemification.booklet; - -import java.util.ArrayList; - -public class ChapterList{ - - public static ArrayList chapterList = new ArrayList(); - - public static void init(){ - chapterList.add(new Chapter(0, "testChapterOne", 2, false)); - chapterList.add(new Chapter(1, "testChapterTwo", 3, false)); - chapterList.add(new Chapter(2, "testChapterThree", 2, false)); - } -} diff --git a/src/main/java/ellpeck/gemification/crafting/InitCrafting.java b/src/main/java/ellpeck/gemification/crafting/InitCrafting.java deleted file mode 100644 index 713b2e63a..000000000 --- a/src/main/java/ellpeck/gemification/crafting/InitCrafting.java +++ /dev/null @@ -1,21 +0,0 @@ -package ellpeck.gemification.crafting; - -import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.gemification.blocks.InitBlocks; -import ellpeck.gemification.items.InitItems; -import ellpeck.gemification.util.Util; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public class InitCrafting { - - public static void init(){ - GameRegistry.addRecipe(new ItemStack(InitBlocks.blockCrucible), "i i", "gcg", "iii", 'i', Items.iron_ingot, 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'c', Items.cauldron); - GameRegistry.addRecipe(new ItemStack(InitBlocks.blockCrucibleFire), "ccc", "cac", "sss", 'c', Blocks.cobblestone, 'a', Items.cauldron, 's', Blocks.stone_slab); - - CrucibleCraftingManager.instance.addRecipe(new ItemStack(Blocks.acacia_stairs), Util.chromeDiopside, 200, "ccc", "cgc", "ccc", 'c', Blocks.cobblestone, 'g', Items.stick); - } - -} diff --git a/src/main/java/ellpeck/gemification/items/InitItems.java b/src/main/java/ellpeck/gemification/items/InitItems.java deleted file mode 100644 index 09c1842e8..000000000 --- a/src/main/java/ellpeck/gemification/items/InitItems.java +++ /dev/null @@ -1,21 +0,0 @@ -package ellpeck.gemification.items; - -import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.gemification.booklet.ItemInfoBook; -import net.minecraft.item.Item; - -public class InitItems { - - public static Item itemGem; - public static Item itemInfoBook; - - public static void init(){ - - itemGem = new ItemGem(); - itemInfoBook = new ItemInfoBook(); - - GameRegistry.registerItem(itemGem, itemGem.getUnlocalizedName().substring(5)); - GameRegistry.registerItem(itemInfoBook, itemInfoBook.getUnlocalizedName().substring(5)); - - } -} diff --git a/src/main/java/ellpeck/gemification/Gemification.java b/src/main/java/ellpeck/someprettytechystuff/Gemification.java similarity index 63% rename from src/main/java/ellpeck/gemification/Gemification.java rename to src/main/java/ellpeck/someprettytechystuff/Gemification.java index 7773c3b86..5ea72f4b8 100644 --- a/src/main/java/ellpeck/gemification/Gemification.java +++ b/src/main/java/ellpeck/someprettytechystuff/Gemification.java @@ -1,4 +1,4 @@ -package ellpeck.gemification; +package ellpeck.someprettytechystuff; 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.gemification.blocks.InitBlocks; -import ellpeck.gemification.booklet.ChapterList; -import ellpeck.gemification.crafting.InitCrafting; -import ellpeck.gemification.gen.OreGen; -import ellpeck.gemification.inventory.GuiHandler; -import ellpeck.gemification.items.InitItems; -import ellpeck.gemification.proxy.IProxy; -import ellpeck.gemification.tile.TileEntityBase; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.booklet.ChapterList; +import ellpeck.someprettytechystuff.crafting.InitCrafting; +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; @Mod(modid = Util.MOD_ID, name = Util.NAME, version = Util.VERSION) public class Gemification{ @@ -23,7 +23,7 @@ public class Gemification{ @Instance(Util.MOD_ID) public static Gemification instance; - @SidedProxy(clientSide = "ellpeck.gemification.proxy.ClientProxy", serverSide = "ellpeck.gemification.proxy.ServerProxy") + @SidedProxy(clientSide = "ellpeck.someprettytechystuff.proxy.ClientProxy", serverSide = "ellpeck.someprettytechystuff.proxy.ServerProxy") public static IProxy proxy; @SuppressWarnings("unused") diff --git a/src/main/java/ellpeck/gemification/blocks/BlockContainerBase.java b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java similarity index 94% rename from src/main/java/ellpeck/gemification/blocks/BlockContainerBase.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java index 554ccaccc..8bee15520 100644 --- a/src/main/java/ellpeck/gemification/blocks/BlockContainerBase.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockContainerBase.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.blocks; +package ellpeck.someprettytechystuff.blocks; -import ellpeck.gemification.tile.TileEntityInventoryBase; +import ellpeck.someprettytechystuff.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/BlockCrop.java b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrop.java new file mode 100644 index 000000000..a2f69412e --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrop.java @@ -0,0 +1,63 @@ +package ellpeck.someprettytechystuff.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.block.BlockCrops; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class BlockCrop extends BlockCrops{ + + private IIcon[] textures; + + private Item seedItem; + private ItemStack cropItemStack; + private int growthStages; + + public BlockCrop(String blockName, int growthStages){ + super(); + this.growthStages = growthStages; + this.textures = new IIcon[growthStages]; + this.setBlockName(blockName); + } + + public void setSeedItem(Item seedItem){ + this.seedItem = seedItem; + } + + public void setCropItem(ItemStack cropItemStack){ + this.cropItemStack = cropItemStack; + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta){ + if(meta < 7){ + if(meta == 6) meta = 5; + return this.textures[meta >> 1]; + } + return textures[growthStages-1]; + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconReg){ + for(int i = 0; i < this.textures.length-1; i++){ + this.textures[i] = iconReg.registerIcon(Util.MOD_ID + ":" + "blockCropStage" + i); + } + this.textures[this.textures.length-1] = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + "Stage" + (this.textures.length-1)); + } + + public Item func_149866_i(){ + return seedItem; + } + + public Item func_149865_P(){ + return cropItemStack.getItem(); + } + + public int damageDropped(int par1){ + return cropItemStack.getItemDamage(); + } +} diff --git a/src/main/java/ellpeck/gemification/blocks/BlockCrucible.java b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucible.java similarity index 56% rename from src/main/java/ellpeck/gemification/blocks/BlockCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucible.java index fac176c5b..dd6fa3afe 100644 --- a/src/main/java/ellpeck/gemification/blocks/BlockCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucible.java @@ -1,33 +1,28 @@ -package ellpeck.gemification.blocks; +package ellpeck.someprettytechystuff.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.Gemification; -import ellpeck.gemification.creative.CreativeTab; -import ellpeck.gemification.inventory.GuiHandler; -import ellpeck.gemification.tile.TileEntityCrucible; -import ellpeck.gemification.tile.TileEntityInventoryBase; -import ellpeck.gemification.util.Util; -import net.minecraft.block.Block; +import ellpeck.someprettytechystuff.Gemification; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.inventory.GuiHandler; +import ellpeck.someprettytechystuff.tile.TileEntityCrucible; +import ellpeck.someprettytechystuff.tile.TileEntityInventoryBase; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - public class BlockCrucible extends BlockContainerBase{ protected BlockCrucible(){ super(Material.rock); this.setBlockName("blockCrucible"); this.setCreativeTab(CreativeTab.instance); + this.setHardness(3.0F); + this.setResistance(5.0F); + this.setHarvestLevel("pickaxe", 2); } public TileEntity createNewTileEntity(World world, int i){ @@ -63,23 +58,4 @@ public class BlockCrucible extends BlockContainerBase{ if(tileEntity.currentFluid != Util.fluidNone) world.setBlock(x, y, z, Blocks.flowing_water); return tileEntity; } - - public static class ItemBlockCrucible extends ItemBlock { - - public ItemBlockCrucible(Block block){ - super(block); - setHasSubtypes(false); - } - - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName(); - } - - @SuppressWarnings("unchecked") - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { - if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); - else list.add(Util.shiftForInfo()); - } - } } diff --git a/src/main/java/ellpeck/gemification/blocks/BlockCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucibleFire.java similarity index 65% rename from src/main/java/ellpeck/gemification/blocks/BlockCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucibleFire.java index 96bcfac80..ac86c9df6 100644 --- a/src/main/java/ellpeck/gemification/blocks/BlockCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/BlockCrucibleFire.java @@ -1,25 +1,19 @@ -package ellpeck.gemification.blocks; +package ellpeck.someprettytechystuff.blocks; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.Gemification; -import ellpeck.gemification.creative.CreativeTab; -import ellpeck.gemification.inventory.GuiHandler; -import ellpeck.gemification.tile.TileEntityCrucibleFire; -import ellpeck.gemification.util.Util; -import net.minecraft.block.Block; +import ellpeck.someprettytechystuff.Gemification; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.inventory.GuiHandler; +import ellpeck.someprettytechystuff.tile.TileEntityCrucibleFire; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; import java.util.Random; public class BlockCrucibleFire extends BlockContainerBase{ @@ -29,6 +23,9 @@ public class BlockCrucibleFire extends BlockContainerBase{ this.setBlockName("blockCrucibleFire"); this.setCreativeTab(CreativeTab.instance); this.setTickRandomly(true); + this.setHardness(3.0F); + this.setResistance(5.0F); + this.setHarvestLevel("pickaxe", 2); } public TileEntity createNewTileEntity(World world, int i){ @@ -68,23 +65,4 @@ public class BlockCrucibleFire extends BlockContainerBase{ } } } - - public static class ItemBlockCrucibleFire extends ItemBlock { - - public ItemBlockCrucibleFire(Block block){ - super(block); - setHasSubtypes(false); - } - - public String getUnlocalizedName(ItemStack stack) { - return this.getUnlocalizedName(); - } - - @SuppressWarnings("unchecked") - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { - if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); - else list.add(Util.shiftForInfo()); - } - } } \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java b/src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java new file mode 100644 index 000000000..938756fb7 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/DefaultItemBlock.java @@ -0,0 +1,29 @@ +package ellpeck.someprettytechystuff.blocks; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public class DefaultItemBlock extends ItemBlock{ + + public DefaultItemBlock(Block block){ + super(block); + setHasSubtypes(false); + } + + public String getUnlocalizedName(ItemStack stack) { + return this.getUnlocalizedName(); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + list.add(Util.addStandardInformation(this)); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java b/src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java new file mode 100644 index 000000000..9e5670070 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/InitBlocks.java @@ -0,0 +1,39 @@ +package ellpeck.someprettytechystuff.blocks; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.block.Block; + +public class InitBlocks{ + + public static Block oreGem; + public static Block blockCrucible; + public static Block blockCrucibleFire; + + public static Block blockCropIron; + public static Block blockCropGold; + public static Block blockCropRedstone; + public static Block blockCropDiamond; + + public static void init(){ + + oreGem = new OreGem(); + blockCrucible = new BlockCrucible(); + blockCrucibleFire = new BlockCrucibleFire(); + + blockCropIron = new BlockCrop("blockCropIron", 4); + blockCropGold = new BlockCrop("blockCropGold", 4); + blockCropRedstone = new BlockCrop("blockCropRedstone", 4); + blockCropDiamond = new BlockCrop("blockCropDiamond", 4); + + GameRegistry.registerBlock(oreGem, OreGem.ItemBlockOreGem.class, oreGem.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock(blockCrucible, DefaultItemBlock.class, blockCrucible.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock(blockCrucibleFire, DefaultItemBlock.class, blockCrucibleFire.getUnlocalizedName().substring(5)); + + GameRegistry.registerBlock(blockCropIron, blockCropIron.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock(blockCropGold, blockCropGold.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock(blockCropRedstone, blockCropRedstone.getUnlocalizedName().substring(5)); + GameRegistry.registerBlock(blockCropDiamond, blockCropDiamond.getUnlocalizedName().substring(5)); + + } + +} diff --git a/src/main/java/ellpeck/gemification/blocks/OreGem.java b/src/main/java/ellpeck/someprettytechystuff/blocks/OreGem.java similarity index 92% rename from src/main/java/ellpeck/gemification/blocks/OreGem.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/OreGem.java index f77a1f67a..463b7a600 100644 --- a/src/main/java/ellpeck/gemification/blocks/OreGem.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/OreGem.java @@ -1,10 +1,10 @@ -package ellpeck.gemification.blocks; +package ellpeck.someprettytechystuff.blocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.creative.CreativeTab; -import ellpeck.gemification.items.InitItems; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.items.InitItems; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -89,9 +89,7 @@ public class OreGem extends Block{ } list.add(EnumChatFormatting.BOLD + StatCollector.translateToLocal("tooltip.gemIsOre.desc")); } - else{ - list.add(Util.shiftForInfo()); - } + else list.add(Util.shiftForInfo()); } } } diff --git a/src/main/java/ellpeck/gemification/blocks/models/ModelBaseG.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseG.java similarity index 71% rename from src/main/java/ellpeck/gemification/blocks/models/ModelBaseG.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseG.java index 87adc331d..87c279a51 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/ModelBaseG.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelBaseG.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucible.java similarity index 97% rename from src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucible.java index 5cc1bfe2b..ab908f06d 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/ModelCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucible.java @@ -1,6 +1,5 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; -import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; public class ModelCrucible extends ModelBaseG{ diff --git a/src/main/java/ellpeck/gemification/blocks/models/ModelCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucibleFire.java similarity index 98% rename from src/main/java/ellpeck/gemification/blocks/models/ModelCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucibleFire.java index 47d0ccb0b..85d8c703d 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/ModelCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/ModelCrucibleFire.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucible.java similarity index 90% rename from src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucible.java index 92f36b870..8dcd9920b 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/RendererCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucible.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/gemification/blocks/models/RendererCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucibleFire.java similarity index 90% rename from src/main/java/ellpeck/gemification/blocks/models/RendererCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucibleFire.java index fb9fb2bce..04ba9b259 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/RendererCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererCrucibleFire.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererHoldingTileEntity.java similarity index 97% rename from src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java rename to src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererHoldingTileEntity.java index 5b636c141..5173d2c10 100644 --- a/src/main/java/ellpeck/gemification/blocks/models/RendererHoldingTileEntity.java +++ b/src/main/java/ellpeck/someprettytechystuff/blocks/models/RendererHoldingTileEntity.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.blocks.models; +package ellpeck.someprettytechystuff.blocks.models; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/gemification/booklet/Chapter.java b/src/main/java/ellpeck/someprettytechystuff/booklet/Chapter.java similarity index 88% rename from src/main/java/ellpeck/gemification/booklet/Chapter.java rename to src/main/java/ellpeck/someprettytechystuff/booklet/Chapter.java index bef076e90..ede030bd3 100644 --- a/src/main/java/ellpeck/gemification/booklet/Chapter.java +++ b/src/main/java/ellpeck/someprettytechystuff/booklet/Chapter.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.booklet; +package ellpeck.someprettytechystuff.booklet; import net.minecraft.util.StatCollector; @@ -12,7 +12,7 @@ public class Chapter{ public Chapter(int ID, String name, int pageAmount, boolean hasCraftingRecipe){ this.ID = ID; - this.name = name; + this.name = name + "Chapter"; this.pageAmount = pageAmount; this.hasCraftingRecipe = hasCraftingRecipe; this.pageTexts = new String[pageAmount]; diff --git a/src/main/java/ellpeck/someprettytechystuff/booklet/ChapterList.java b/src/main/java/ellpeck/someprettytechystuff/booklet/ChapterList.java new file mode 100644 index 000000000..29722f009 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/booklet/ChapterList.java @@ -0,0 +1,14 @@ +package ellpeck.someprettytechystuff.booklet; + +import java.util.ArrayList; + +public class ChapterList{ + + public static ArrayList chapterList = new ArrayList(); + + public static void init(){ + chapterList.add(new Chapter(0, "crucible", 1, false)); + chapterList.add(new Chapter(1, "crucibleFire", 2, false)); + chapterList.add(new Chapter(2, "gems", 4, false)); + } +} diff --git a/src/main/java/ellpeck/gemification/booklet/ContainerInfoBook.java b/src/main/java/ellpeck/someprettytechystuff/booklet/ContainerInfoBook.java similarity index 87% rename from src/main/java/ellpeck/gemification/booklet/ContainerInfoBook.java rename to src/main/java/ellpeck/someprettytechystuff/booklet/ContainerInfoBook.java index bb6208f32..0ea4e016f 100644 --- a/src/main/java/ellpeck/gemification/booklet/ContainerInfoBook.java +++ b/src/main/java/ellpeck/someprettytechystuff/booklet/ContainerInfoBook.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.booklet; +package ellpeck.someprettytechystuff.booklet; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/ellpeck/gemification/booklet/GuiInfoBook.java b/src/main/java/ellpeck/someprettytechystuff/booklet/GuiInfoBook.java similarity index 76% rename from src/main/java/ellpeck/gemification/booklet/GuiInfoBook.java rename to src/main/java/ellpeck/someprettytechystuff/booklet/GuiInfoBook.java index 31bf2f1f3..1bd10d8b1 100644 --- a/src/main/java/ellpeck/gemification/booklet/GuiInfoBook.java +++ b/src/main/java/ellpeck/someprettytechystuff/booklet/GuiInfoBook.java @@ -1,9 +1,10 @@ -package ellpeck.gemification.booklet; +package ellpeck.someprettytechystuff.booklet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -14,11 +15,15 @@ import org.lwjgl.opengl.GL11; public class GuiInfoBook extends GuiScreen{ public static final ResourceLocation resLoc = new ResourceLocation(Util.MOD_ID, "textures/gui/guiInfoBook.png"); + public static final ResourceLocation fontLocation = new ResourceLocation("textures/font/ascii.png"); public final int xSize = 180; public final int ySize = 180; - public Chapter mainChapter = new Chapter(-1, "mainChapter", 0, false); + @SideOnly(Side.CLIENT) + public final FontRenderer thisRenderer = new FontRenderer(Minecraft.getMinecraft().gameSettings, fontLocation, Minecraft.getMinecraft().renderEngine, true); + + public Chapter mainChapter = new Chapter(-1, "main", 1, false); public int currentPage = 0; public Chapter currentChapter = mainChapter; @@ -56,20 +61,18 @@ public class GuiInfoBook extends GuiScreen{ int yPos = (this.height-this.ySize)/2; int size = ChapterList.chapterList.size(); - for(int i = 0; i < size; i++){ - this.buttonList.add(new InvisiButton(i, xPos + 15, yPos + 15 + 11*i, 150, 10, StatCollector.translateToLocal("infoBook." + ChapterList.chapterList.get(i).name + ".title"))); + for(int i = 0; i < size; i++) { + this.buttonList.add(new InvisiButton(i, xPos + 20, yPos + 15 + 11 * i, 145, 10, StatCollector.translateToLocal("infoBook." + ChapterList.chapterList.get(i).name + ".title"), this.thisRenderer)); } } public void updateButtons(){ - this.nextPageButton.visible = this.currentChapter.pageAmount > 0 && this.currentPage < this.currentChapter.pageAmount-1; + this.nextPageButton.visible = this.currentPage < this.currentChapter.pageAmount-1; this.prevPageButton.visible = this.currentPage > 0; this.mainPageButton.visible = this.currentChapter != this.mainChapter; for(int i = 0; i < ChapterList.chapterList.size(); i++){ ((GuiButton)this.buttonList.get(i)).visible = this.currentChapter == mainChapter; } - - System.out.println(currentPage); } @SuppressWarnings("static-access") @@ -94,9 +97,18 @@ public class GuiInfoBook extends GuiScreen{ this.mc.getTextureManager().bindTexture(resLoc); this.drawTexturedModalRect(xPos, yPos, 0, 0, this.xSize, this.ySize); + this.drawPageContents(); + super.drawScreen(x, y, f); } + public void drawPageContents(){ + int xPos = (this.width-this.xSize)/2; + int yPos = (this.height-this.ySize)/2; + + if(this.currentChapter != this.mainChapter) this.thisRenderer.drawSplitString(this.currentChapter.pageTexts[this.currentPage], xPos + 15, yPos + 14, 150, 0); + } + @SideOnly(Side.CLIENT) static class ChangePageButton extends GuiButton{ /** @@ -130,15 +142,17 @@ public class GuiInfoBook extends GuiScreen{ @SideOnly(Side.CLIENT) static class InvisiButton extends GuiButton{ - public InvisiButton(int ID, int x, int y, int width, int height, String text){ + private FontRenderer renderer; + public InvisiButton(int ID, int x, int y, int width, int height, String text, FontRenderer renderer){ super(ID, x, y, width, height, text); + this.renderer = renderer; } public void drawButton(Minecraft mc, int mouseX, int mouseY){ if (this.visible){ boolean isHoverOver = false; if(mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width && mouseY < this.yPosition + this.height) isHoverOver = true; - mc.fontRenderer.drawString((isHoverOver ? ((char)167+"2" + (char)167+"n") : "") + this.displayString, this.xPosition, this.yPosition + (this.height - 8) / 2, 0); + this.renderer.drawString((isHoverOver ? ((char) 167 + "2" + (char) 167 + "n") : "") + this.displayString, this.xPosition, this.yPosition + (this.height - 8) / 2, 0); } } } diff --git a/src/main/java/ellpeck/gemification/booklet/ItemInfoBook.java b/src/main/java/ellpeck/someprettytechystuff/booklet/ItemInfoBook.java similarity index 85% rename from src/main/java/ellpeck/gemification/booklet/ItemInfoBook.java rename to src/main/java/ellpeck/someprettytechystuff/booklet/ItemInfoBook.java index 27a2c0f68..7d29590f6 100644 --- a/src/main/java/ellpeck/gemification/booklet/ItemInfoBook.java +++ b/src/main/java/ellpeck/someprettytechystuff/booklet/ItemInfoBook.java @@ -1,11 +1,11 @@ -package ellpeck.gemification.booklet; +package ellpeck.someprettytechystuff.booklet; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.Gemification; -import ellpeck.gemification.creative.CreativeTab; -import ellpeck.gemification.inventory.GuiHandler; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.Gemification; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.inventory.GuiHandler; +import ellpeck.someprettytechystuff.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/gemification/crafting/CrucibleCraftingManager.java b/src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleCraftingManager.java similarity index 97% rename from src/main/java/ellpeck/gemification/crafting/CrucibleCraftingManager.java rename to src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleCraftingManager.java index 3f34d90e9..18bf9e711 100644 --- a/src/main/java/ellpeck/gemification/crafting/CrucibleCraftingManager.java +++ b/src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleCraftingManager.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.crafting; +package ellpeck.someprettytechystuff.crafting; -import ellpeck.gemification.util.GemType; +import ellpeck.someprettytechystuff.util.GemType; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java b/src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleRecipe.java similarity index 83% rename from src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java rename to src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleRecipe.java index 5a5c345e8..78cd54e00 100644 --- a/src/main/java/ellpeck/gemification/crafting/CrucibleRecipe.java +++ b/src/main/java/ellpeck/someprettytechystuff/crafting/CrucibleRecipe.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.crafting; +package ellpeck.someprettytechystuff.crafting; -import ellpeck.gemification.util.GemType; +import ellpeck.someprettytechystuff.util.GemType; import net.minecraft.item.ItemStack; public class CrucibleRecipe{ diff --git a/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java b/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java new file mode 100644 index 000000000..88b4ca369 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/crafting/InitCrafting.java @@ -0,0 +1,38 @@ +package ellpeck.someprettytechystuff.crafting; + +import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.items.InitItems; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +public class InitCrafting { + + public static void init(){ + GameRegistry.addRecipe(new ItemStack(InitBlocks.blockCrucible), "i i", "gcg", "iii", 'i', Items.iron_ingot, 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'c', Items.cauldron); + GameRegistry.addRecipe(new ItemStack(InitBlocks.blockCrucibleFire), "ccc", "cac", "csc", 'c', Blocks.cobblestone, 'a', Items.cauldron, 's', Blocks.stone_slab); + GameRegistry.addShapelessRecipe(new ItemStack(InitItems.itemInfoBook), new ItemStack(Items.book), new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE)); + + GameRegistry.addRecipe(new ItemStack(Items.iron_ingot), "xx", "xx", 'x', new ItemStack(InitItems.itemPile, 1, 0)); + GameRegistry.addRecipe(new ItemStack(Items.gold_ingot), "xx", "xx", 'x', new ItemStack(InitItems.itemPile, 1, 1)); + GameRegistry.addRecipe(new ItemStack(Items.redstone), "xx", "xx", 'x', new ItemStack(InitItems.itemPile, 1, 2)); + GameRegistry.addRecipe(new ItemStack(Items.diamond), "xx", "xx", 'x', new ItemStack(InitItems.itemPile, 1, 3)); + GameRegistry.addRecipe(new ItemStack(InitItems.itemPile, 8, 0), "x", "x", 'x', new ItemStack(Items.iron_ingot)); + GameRegistry.addRecipe(new ItemStack(InitItems.itemPile, 8, 1), "x", "x", 'x', new ItemStack(Items.gold_ingot)); + GameRegistry.addRecipe(new ItemStack(InitItems.itemPile, 8, 2), "x", "x", 'x', new ItemStack(Items.redstone)); + GameRegistry.addRecipe(new ItemStack(InitItems.itemPile, 8, 3), "x", "x", 'x', new ItemStack(Items.diamond)); + + CrucibleCraftingManager.instance.addRecipe(new ItemStack(Blocks.acacia_stairs), Util.chromeDiopside, 200, "ccc", "cgc", "ccc", 'c', Blocks.cobblestone, 'g', Items.stick); + + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronIngot), Util.goshenite, 500, "gig", "idi", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', Items.iron_ingot, 'd', Items.diamond); + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronAxe), Util.chromeDiopside, 1000, "gig", "iai", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', InitItems.itemInfusedIronIngot, 'a', Items.iron_axe); + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronHoe), Util.jasper, 1000, "gig", "iai", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', InitItems.itemInfusedIronIngot, 'a', Items.iron_hoe); + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronPickaxe), Util.hematite, 1000, "gig", "iai", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', InitItems.itemInfusedIronIngot, 'a', Items.iron_pickaxe); + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronShovel), Util.tourmaline, 1000, "gig", "iai", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', InitItems.itemInfusedIronIngot, 'a', Items.iron_shovel); + CrucibleCraftingManager.instance.addRecipe(new ItemStack(InitItems.itemInfusedIronSword), Util.almandineGarnet, 1000, "gig", "iai", "gig", 'g', new ItemStack(InitItems.itemGem, 1, OreDictionary.WILDCARD_VALUE), 'i', InitItems.itemInfusedIronIngot, 'a', Items.iron_sword); + } + +} diff --git a/src/main/java/ellpeck/gemification/creative/CreativeTab.java b/src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java similarity index 60% rename from src/main/java/ellpeck/gemification/creative/CreativeTab.java rename to src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java index dcf59ee74..3d8442dbb 100644 --- a/src/main/java/ellpeck/gemification/creative/CreativeTab.java +++ b/src/main/java/ellpeck/someprettytechystuff/creative/CreativeTab.java @@ -1,7 +1,7 @@ -package ellpeck.gemification.creative; +package ellpeck.someprettytechystuff.creative; -import ellpeck.gemification.blocks.InitBlocks; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.items.InitItems; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -14,6 +14,6 @@ public class CreativeTab extends CreativeTabs{ } public Item getTabIconItem() { - return Item.getItemFromBlock(InitBlocks.blockCrucible); + return InitItems.itemInfoBook; } } diff --git a/src/main/java/ellpeck/gemification/gen/OreGen.java b/src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java similarity index 93% rename from src/main/java/ellpeck/gemification/gen/OreGen.java rename to src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java index b7f42c597..27089ad36 100644 --- a/src/main/java/ellpeck/gemification/gen/OreGen.java +++ b/src/main/java/ellpeck/someprettytechystuff/gen/OreGen.java @@ -1,9 +1,9 @@ -package ellpeck.gemification.gen; +package ellpeck.someprettytechystuff.gen; import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.gemification.blocks.InitBlocks; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; diff --git a/src/main/java/ellpeck/gemification/inventory/GuiHandler.java b/src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java similarity index 71% rename from src/main/java/ellpeck/gemification/inventory/GuiHandler.java rename to src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java index 4f15e0b78..2ef57fcef 100644 --- a/src/main/java/ellpeck/gemification/inventory/GuiHandler.java +++ b/src/main/java/ellpeck/someprettytechystuff/inventory/GuiHandler.java @@ -1,17 +1,17 @@ -package ellpeck.gemification.inventory; +package ellpeck.someprettytechystuff.inventory; import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.NetworkRegistry; -import ellpeck.gemification.Gemification; -import ellpeck.gemification.booklet.ContainerInfoBook; -import ellpeck.gemification.booklet.GuiInfoBook; -import ellpeck.gemification.inventory.container.ContainerCrucible; -import ellpeck.gemification.inventory.container.ContainerCrucibleFire; -import ellpeck.gemification.inventory.gui.GuiCrucible; -import ellpeck.gemification.inventory.gui.GuiCrucibleFire; -import ellpeck.gemification.tile.TileEntityBase; -import ellpeck.gemification.tile.TileEntityCrucible; -import ellpeck.gemification.tile.TileEntityCrucibleFire; +import ellpeck.someprettytechystuff.Gemification; +import ellpeck.someprettytechystuff.booklet.ContainerInfoBook; +import ellpeck.someprettytechystuff.booklet.GuiInfoBook; +import ellpeck.someprettytechystuff.inventory.container.ContainerCrucible; +import ellpeck.someprettytechystuff.inventory.container.ContainerCrucibleFire; +import ellpeck.someprettytechystuff.inventory.gui.GuiCrucible; +import ellpeck.someprettytechystuff.inventory.gui.GuiCrucibleFire; +import ellpeck.someprettytechystuff.tile.TileEntityBase; +import ellpeck.someprettytechystuff.tile.TileEntityCrucible; +import ellpeck.someprettytechystuff.tile.TileEntityCrucibleFire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/ellpeck/gemification/inventory/container/ContainerCrucible.java b/src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucible.java similarity index 92% rename from src/main/java/ellpeck/gemification/inventory/container/ContainerCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucible.java index b93f2ffbf..6c168a5dd 100644 --- a/src/main/java/ellpeck/gemification/inventory/container/ContainerCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucible.java @@ -1,14 +1,15 @@ -package ellpeck.gemification.inventory.container; +package ellpeck.someprettytechystuff.inventory.container; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.tile.TileEntityCrucible; +import ellpeck.someprettytechystuff.tile.TileEntityCrucible; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.inventory.SlotFurnace; +import net.minecraft.item.ItemStack; public class ContainerCrucible extends Container { @@ -90,4 +91,11 @@ public class ContainerCrucible extends Container { if (par1 == 3) this.tileCrucible.burnTime = par2; if (par1 == 4) this.tileCrucible.burnTimeOfItem = par2; } + + //TODO Add transferStackInSlot() + public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { + Slot slot = (Slot)this.inventorySlots.get(slotNumber); + return null; + } + } diff --git a/src/main/java/ellpeck/gemification/inventory/container/ContainerCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucibleFire.java similarity index 86% rename from src/main/java/ellpeck/gemification/inventory/container/ContainerCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucibleFire.java index 7c4a05a76..27bf75908 100644 --- a/src/main/java/ellpeck/gemification/inventory/container/ContainerCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/inventory/container/ContainerCrucibleFire.java @@ -1,13 +1,14 @@ -package ellpeck.gemification.inventory.container; +package ellpeck.someprettytechystuff.inventory.container; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.tile.TileEntityCrucibleFire; +import ellpeck.someprettytechystuff.tile.TileEntityCrucibleFire; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; public class ContainerCrucibleFire extends Container { @@ -61,4 +62,10 @@ public class ContainerCrucibleFire extends Container { if (par1 == 0) this.tileCrucibleFire.burnTime = par2; if (par1 == 1) this.tileCrucibleFire.burnTimeOfItem = par2; } + + //TODO Add transferStackInSlot() + public ItemStack transferStackInSlot(EntityPlayer player, int slotNumber) { + Slot slot = (Slot)this.inventorySlots.get(slotNumber); + return null; + } } diff --git a/src/main/java/ellpeck/gemification/inventory/gui/GuiCrucible.java b/src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucible.java similarity index 86% rename from src/main/java/ellpeck/gemification/inventory/gui/GuiCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucible.java index 94d6f35be..6fb9db03e 100644 --- a/src/main/java/ellpeck/gemification/inventory/gui/GuiCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucible.java @@ -1,8 +1,8 @@ -package ellpeck.gemification.inventory.gui; +package ellpeck.someprettytechystuff.inventory.gui; -import ellpeck.gemification.inventory.container.ContainerCrucible; -import ellpeck.gemification.tile.TileEntityCrucible; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.inventory.container.ContainerCrucible; +import ellpeck.someprettytechystuff.tile.TileEntityCrucible; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.player.InventoryPlayer; @@ -60,18 +60,18 @@ public class GuiCrucible extends GuiContainer{ else if(this.tileCrucible.currentFluidID == Util.gemList.get(15).ID) this.drawTexturedModalRect(guiLeft + 141, guiTop + 7, 176, 59+60, 12, 12); } - @SuppressWarnings("static-access") + @SuppressWarnings("static-access, unchecked") public void drawScreen(int par1, int par2, float par3){ super.drawScreen(par1, par2, par3); - RenderHelper.enableGUIStandardItemLighting(); - GL11.glEnable(GL11.GL_LIGHTING); - itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), tileCrucible.output, guiLeft + 112, guiTop + 65); - GL11.glDisable(GL11.GL_LIGHTING); - RenderHelper.disableStandardItemLighting(); if(tileCrucible.output != null){ + RenderHelper.enableGUIStandardItemLighting(); + GL11.glEnable(GL11.GL_LIGHTING); + itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), tileCrucible.output.copy(), guiLeft + 112, guiTop + 65); + GL11.glDisable(GL11.GL_LIGHTING); + RenderHelper.disableStandardItemLighting(); if(par1 >= 112 + guiLeft && par2 >= 65 + guiTop && par1 <= 112 + 16 + guiLeft && par2 <= 65 + 16 + guiTop){ - this.drawHoveringText(tileCrucible.output.getTooltip(mc.thePlayer, true), par1, par2, mc.fontRenderer); + this.drawHoveringText(tileCrucible.output.copy().getTooltip(mc.thePlayer, true), par1, par2, mc.fontRenderer); } } if(par1 >= 141 + guiLeft && par2 >= 7 + guiTop && par1 <= 141+12 + guiLeft && par2 <= 7+12 + guiTop){ diff --git a/src/main/java/ellpeck/gemification/inventory/gui/GuiCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucibleFire.java similarity index 84% rename from src/main/java/ellpeck/gemification/inventory/gui/GuiCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucibleFire.java index b587fd29c..caa1babd0 100644 --- a/src/main/java/ellpeck/gemification/inventory/gui/GuiCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/inventory/gui/GuiCrucibleFire.java @@ -1,8 +1,8 @@ -package ellpeck.gemification.inventory.gui; +package ellpeck.someprettytechystuff.inventory.gui; -import ellpeck.gemification.inventory.container.ContainerCrucibleFire; -import ellpeck.gemification.tile.TileEntityCrucibleFire; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.inventory.container.ContainerCrucibleFire; +import ellpeck.someprettytechystuff.tile.TileEntityCrucibleFire; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/ellpeck/someprettytechystuff/items/InitItems.java b/src/main/java/ellpeck/someprettytechystuff/items/InitItems.java new file mode 100644 index 000000000..b88dfac90 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/InitItems.java @@ -0,0 +1,67 @@ +package ellpeck.someprettytechystuff.items; + +import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.booklet.ItemInfoBook; +import ellpeck.someprettytechystuff.items.tools.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.Item.ToolMaterial; +import net.minecraftforge.common.util.EnumHelper; + +public class InitItems { + + public static Item itemInfoBook; + public static Item itemGem; + public static Item itemPile; + + public static Item itemSeedIron; + public static Item itemSeedGold; + public static Item itemSeedRedstone; + public static Item itemSeedDiamond; + + public static Item itemInfusedIronIngot; + public static Item itemInfusedIronAxe; + public static Item itemInfusedIronHoe; + public static Item itemInfusedIronPickaxe; + public static Item itemInfusedIronShovel; + public static Item itemInfusedIronSword; + + public static ToolMaterial infusedIronMaterial = EnumHelper.addToolMaterial("INFUSED_IRON", 3, 2000, 20.0F, 6.0F, 10); + + public static void init(){ + + itemInfoBook = new ItemInfoBook(); + itemGem = new ItemGem(); + itemPile = new ItemPile(); + + itemInfusedIronIngot = new ItemInfusedIron(); + itemSeedIron = new ItemSeed(InitBlocks.blockCropIron, new ItemStack(itemPile, 1, 0), "itemSeedIron"); + itemSeedGold = new ItemSeed(InitBlocks.blockCropGold, new ItemStack(itemPile, 1, 1), "itemSeedGold"); + itemSeedRedstone = new ItemSeed(InitBlocks.blockCropRedstone, new ItemStack(itemPile, 1, 2), "itemSeedRedstone"); + itemSeedDiamond = new ItemSeed(InitBlocks.blockCropDiamond, new ItemStack(itemPile, 1, 3), "itemSeedDiamond"); + + itemInfusedIronAxe = new ItemAxeG(infusedIronMaterial, "itemInfusedIronAxe"); + itemInfusedIronHoe = new ItemHoeG(infusedIronMaterial, "itemInfusedIronHoe"); + itemInfusedIronPickaxe = new ItemPickaxeG(infusedIronMaterial, "itemInfusedIronPickaxe"); + itemInfusedIronShovel = new ItemShovelG(infusedIronMaterial, "itemInfusedIronShovel"); + itemInfusedIronSword = new ItemSwordG(infusedIronMaterial, "itemInfusedIronSword"); + + GameRegistry.registerItem(itemInfoBook, itemInfoBook.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemGem, itemGem.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemPile, itemPile.getUnlocalizedName().substring(5)); + + GameRegistry.registerItem(itemSeedIron, itemSeedIron.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemSeedGold, itemSeedGold.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemSeedRedstone, itemSeedRedstone.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemSeedDiamond, itemSeedDiamond.getUnlocalizedName().substring(5)); + + GameRegistry.registerItem(itemInfusedIronIngot, itemInfusedIronIngot.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemInfusedIronAxe, itemInfusedIronAxe.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemInfusedIronHoe, itemInfusedIronHoe.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemInfusedIronPickaxe, itemInfusedIronPickaxe.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemInfusedIronShovel, itemInfusedIronShovel.getUnlocalizedName().substring(5)); + GameRegistry.registerItem(itemInfusedIronSword, itemInfusedIronSword.getUnlocalizedName().substring(5)); + + } +} diff --git a/src/main/java/ellpeck/gemification/items/ItemGem.java b/src/main/java/ellpeck/someprettytechystuff/items/ItemGem.java similarity index 91% rename from src/main/java/ellpeck/gemification/items/ItemGem.java rename to src/main/java/ellpeck/someprettytechystuff/items/ItemGem.java index 14d15f6dd..157991813 100644 --- a/src/main/java/ellpeck/gemification/items/ItemGem.java +++ b/src/main/java/ellpeck/someprettytechystuff/items/ItemGem.java @@ -1,9 +1,9 @@ -package ellpeck.gemification.items; +package ellpeck.someprettytechystuff.items; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.creative.CreativeTab; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -33,9 +33,7 @@ public class ItemGem extends Item { if(this.getDamage(stack) == i) list.add(StatCollector.translateToLocal("tooltip.gem" + Util.gemList.get(i).name.substring(5) + ".desc")); } } - else{ - list.add(Util.shiftForInfo()); - } + else list.add(Util.shiftForInfo()); } public String getUnlocalizedName(ItemStack stack){ diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemInfusedIron.java b/src/main/java/ellpeck/someprettytechystuff/items/ItemInfusedIron.java new file mode 100644 index 000000000..3866b010d --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/ItemInfusedIron.java @@ -0,0 +1,32 @@ +package ellpeck.someprettytechystuff.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public class ItemInfusedIron extends Item{ + + public ItemInfusedIron(){ + this.setCreativeTab(CreativeTab.instance); + this.setUnlocalizedName("itemInfusedIronIngot"); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + list.add(Util.addStandardInformation(this)); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } + +} \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemPile.java b/src/main/java/ellpeck/someprettytechystuff/items/ItemPile.java new file mode 100644 index 000000000..d46b1aec1 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/ItemPile.java @@ -0,0 +1,63 @@ +package ellpeck.someprettytechystuff.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemPile extends Item{ + + public final String[] pileTypes = new String[]{"Iron", "Gold", "Redstone", "Diamond"}; + public final IIcon[] textures = new IIcon[pileTypes.length]; + + public ItemPile(){ + this.setHasSubtypes(true); + this.setCreativeTab(CreativeTab.instance); + this.setUnlocalizedName("itemPile"); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()){ + for(int i = 0; i < this.pileTypes.length; i++){ + if(this.getDamage(stack) == i) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + this.pileTypes[i] + ".desc")); + } + } + else list.add(Util.shiftForInfo()); + } + + public String getUnlocalizedName(ItemStack stack){ + return this.getUnlocalizedName() + this.pileTypes[stack.getItemDamage()]; + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void getSubItems(Item item, CreativeTabs tabs, List list){ + for (int i = 0; i < this.pileTypes.length; i++) { + list.add(new ItemStack(item, 1, i)); + } + } + + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1){ + return textures[par1]; + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + for (int i = 0; i < this.pileTypes.length; i++) { + textures[i] = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5) + this.pileTypes[i]); + } + } + +} \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettytechystuff/items/ItemSeed.java b/src/main/java/ellpeck/someprettytechystuff/items/ItemSeed.java new file mode 100644 index 000000000..50ec82ec7 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/ItemSeed.java @@ -0,0 +1,38 @@ +package ellpeck.someprettytechystuff.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ellpeck.someprettytechystuff.blocks.BlockCrop; +import ellpeck.someprettytechystuff.creative.CreativeTab; +import ellpeck.someprettytechystuff.util.Util; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemSeeds; +import net.minecraft.item.ItemStack; + +import java.util.List; + +public class ItemSeed extends ItemSeeds{ + + public ItemSeed(Block blockCrop, ItemStack cropItemStack, String unlocalizedName){ + super(blockCrop, Blocks.farmland); + ((BlockCrop)blockCrop).setSeedItem(this); + ((BlockCrop)blockCrop).setCropItem(cropItemStack); + this.setCreativeTab(CreativeTab.instance); + this.setUnlocalizedName(unlocalizedName); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + list.add(Util.addStandardInformation(this)); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } + +} \ No newline at end of file diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeG.java b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeG.java new file mode 100644 index 000000000..b4d772301 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemAxeG.java @@ -0,0 +1,34 @@ +package ellpeck.someprettytechystuff.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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemAxe; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemAxeG extends ItemAxe{ + + public ItemAxeG(ToolMaterial toolMat, String unlocalizedName){ + super(toolMat); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(CreativeTab.instance); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); + else list.add(Util.shiftForInfo()); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeG.java b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeG.java new file mode 100644 index 000000000..a1c66e9a5 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemHoeG.java @@ -0,0 +1,34 @@ +package ellpeck.someprettytechystuff.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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemHoe; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemHoeG extends ItemHoe{ + + public ItemHoeG(ToolMaterial toolMat, String unlocalizedName){ + super(toolMat); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(CreativeTab.instance); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); + else list.add(Util.shiftForInfo()); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeG.java b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeG.java new file mode 100644 index 000000000..825e6df34 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemPickaxeG.java @@ -0,0 +1,34 @@ +package ellpeck.someprettytechystuff.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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemPickaxe; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemPickaxeG extends ItemPickaxe{ + + public ItemPickaxeG(ToolMaterial toolMat, String unlocalizedName){ + super(toolMat); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(CreativeTab.instance); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); + else list.add(Util.shiftForInfo()); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelG.java b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelG.java new file mode 100644 index 000000000..537995b27 --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemShovelG.java @@ -0,0 +1,34 @@ +package ellpeck.someprettytechystuff.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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemSpade; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemShovelG extends ItemSpade{ + + public ItemShovelG(ToolMaterial toolMat, String unlocalizedName){ + super(toolMat); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(CreativeTab.instance); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); + else list.add(Util.shiftForInfo()); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } +} diff --git a/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordG.java b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordG.java new file mode 100644 index 000000000..2ae2d545e --- /dev/null +++ b/src/main/java/ellpeck/someprettytechystuff/items/tools/ItemSwordG.java @@ -0,0 +1,34 @@ +package ellpeck.someprettytechystuff.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 net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.util.StatCollector; + +import java.util.List; + +public class ItemSwordG extends ItemSword{ + + public ItemSwordG(ToolMaterial toolMat, String unlocalizedName){ + super(toolMat); + this.setUnlocalizedName(unlocalizedName); + this.setCreativeTab(CreativeTab.instance); + } + + @SuppressWarnings("unchecked") + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { + if(Util.isShiftPressed()) list.add(StatCollector.translateToLocal("tooltip." + this.getUnlocalizedName().substring(5) + ".desc")); + else list.add(Util.shiftForInfo()); + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconReg){ + this.itemIcon = iconReg.registerIcon(Util.MOD_ID + ":" + this.getUnlocalizedName().substring(5)); + } +} diff --git a/src/main/java/ellpeck/gemification/proxy/ClientProxy.java b/src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java similarity index 76% rename from src/main/java/ellpeck/gemification/proxy/ClientProxy.java rename to src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java index 83836217d..3c5694239 100644 --- a/src/main/java/ellpeck/gemification/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/someprettytechystuff/proxy/ClientProxy.java @@ -1,10 +1,10 @@ -package ellpeck.gemification.proxy; +package ellpeck.someprettytechystuff.proxy; import cpw.mods.fml.client.registry.ClientRegistry; -import ellpeck.gemification.blocks.InitBlocks; -import ellpeck.gemification.blocks.models.*; -import ellpeck.gemification.tile.TileEntityCrucible; -import ellpeck.gemification.tile.TileEntityCrucibleFire; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.blocks.models.*; +import ellpeck.someprettytechystuff.tile.TileEntityCrucible; +import ellpeck.someprettytechystuff.tile.TileEntityCrucibleFire; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; diff --git a/src/main/java/ellpeck/gemification/proxy/IProxy.java b/src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java similarity index 75% rename from src/main/java/ellpeck/gemification/proxy/IProxy.java rename to src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java index 7d961a7d6..a4f7246d9 100644 --- a/src/main/java/ellpeck/gemification/proxy/IProxy.java +++ b/src/main/java/ellpeck/someprettytechystuff/proxy/IProxy.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.proxy; +package ellpeck.someprettytechystuff.proxy; public interface IProxy { diff --git a/src/main/java/ellpeck/gemification/proxy/ServerProxy.java b/src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java similarity index 77% rename from src/main/java/ellpeck/gemification/proxy/ServerProxy.java rename to src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java index e6264fc86..3e2b8432e 100644 --- a/src/main/java/ellpeck/gemification/proxy/ServerProxy.java +++ b/src/main/java/ellpeck/someprettytechystuff/proxy/ServerProxy.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.proxy; +package ellpeck.someprettytechystuff.proxy; public class ServerProxy implements IProxy{ diff --git a/src/main/java/ellpeck/gemification/tile/TileEntityBase.java b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java similarity index 91% rename from src/main/java/ellpeck/gemification/tile/TileEntityBase.java rename to src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java index ac5cb633e..b709ef0bb 100644 --- a/src/main/java/ellpeck/gemification/tile/TileEntityBase.java +++ b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityBase.java @@ -1,7 +1,7 @@ -package ellpeck.gemification.tile; +package ellpeck.someprettytechystuff.tile; import cpw.mods.fml.common.registry.GameRegistry; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; diff --git a/src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucible.java similarity index 91% rename from src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java rename to src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucible.java index a692b4087..d97a44b17 100644 --- a/src/main/java/ellpeck/gemification/tile/TileEntityCrucible.java +++ b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucible.java @@ -1,12 +1,12 @@ -package ellpeck.gemification.tile; +package ellpeck.someprettytechystuff.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.blocks.InitBlocks; -import ellpeck.gemification.crafting.CrucibleCraftingManager; -import ellpeck.gemification.items.ItemGem; -import ellpeck.gemification.util.GemType; -import ellpeck.gemification.util.Util; +import ellpeck.someprettytechystuff.blocks.InitBlocks; +import ellpeck.someprettytechystuff.crafting.CrucibleCraftingManager; +import ellpeck.someprettytechystuff.items.ItemGem; +import ellpeck.someprettytechystuff.util.GemType; +import ellpeck.someprettytechystuff.util.Util; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -29,7 +29,7 @@ public class TileEntityCrucible extends TileEntityInventoryBase{ public int burnTime; public int burnTimeOfItem; - public static ItemStack output; + public ItemStack output; public TileEntityCrucible(){ /** @@ -49,9 +49,9 @@ public class TileEntityCrucible extends TileEntityInventoryBase{ if(!worldObj.isRemote){ if(!this.isCrafting()) this.output = CrucibleCraftingManager.instance.getCraftingResult(slots, 0, 8, currentFluid); this.getBurnFromBelow(); - this.craft(); this.addWaterByWaterSlot(); this.colorGemWater(); + this.craft(); this.currentFluidID = this.currentFluid.ID; } if(isCraftingFlag != this.isCrafting()){ @@ -64,7 +64,6 @@ public class TileEntityCrucible extends TileEntityInventoryBase{ return this.currentProcessTime > 0; } - @SuppressWarnings("static-access") public void craft(){ if(this.burnTime > 0){ if (!this.isCrafting()){ @@ -83,11 +82,10 @@ public class TileEntityCrucible extends TileEntityInventoryBase{ this.currentProcessTime--; if (this.currentProcessTime <= 0){ if (this.slots[slotOutput] == null) this.slots[slotOutput] = output.copy(); - else if (this.slots[slotOutput].getItem() == output.getItem()) - this.slots[slotOutput].stackSize += output.stackSize; - this.output = null; + else if(this.slots[slotOutput].isItemEqual(output)) this.slots[slotOutput].stackSize += output.stackSize; this.currentProcessTime = 0; this.processTimeNeeded = 0; + this.output = null; } } } @@ -164,4 +162,4 @@ public class TileEntityCrucible extends TileEntityInventoryBase{ public int getBurnTimeRemainingScaled(int i){ return this.burnTime * i / this.burnTimeOfItem; } -} +} \ No newline at end of file diff --git a/src/main/java/ellpeck/gemification/tile/TileEntityCrucibleFire.java b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucibleFire.java similarity index 95% rename from src/main/java/ellpeck/gemification/tile/TileEntityCrucibleFire.java rename to src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucibleFire.java index 27606566e..97c6d5243 100644 --- a/src/main/java/ellpeck/gemification/tile/TileEntityCrucibleFire.java +++ b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityCrucibleFire.java @@ -1,8 +1,8 @@ -package ellpeck.gemification.tile; +package ellpeck.someprettytechystuff.tile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import ellpeck.gemification.blocks.InitBlocks; +import ellpeck.someprettytechystuff.blocks.InitBlocks; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntityFurnace; diff --git a/src/main/java/ellpeck/gemification/tile/TileEntityInventoryBase.java b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java similarity index 98% rename from src/main/java/ellpeck/gemification/tile/TileEntityInventoryBase.java rename to src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java index 6502d3d11..baee2ff21 100644 --- a/src/main/java/ellpeck/gemification/tile/TileEntityInventoryBase.java +++ b/src/main/java/ellpeck/someprettytechystuff/tile/TileEntityInventoryBase.java @@ -1,4 +1,4 @@ -package ellpeck.gemification.tile; +package ellpeck.someprettytechystuff.tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/ellpeck/gemification/util/GemType.java b/src/main/java/ellpeck/someprettytechystuff/util/GemType.java similarity index 79% rename from src/main/java/ellpeck/gemification/util/GemType.java rename to src/main/java/ellpeck/someprettytechystuff/util/GemType.java index 136765175..db378b5b5 100644 --- a/src/main/java/ellpeck/gemification/util/GemType.java +++ b/src/main/java/ellpeck/someprettytechystuff/util/GemType.java @@ -1,6 +1,6 @@ -package ellpeck.gemification.util; +package ellpeck.someprettytechystuff.util; -public class GemType { +public class GemType{ public final int ID; public final String name; diff --git a/src/main/java/ellpeck/gemification/util/Util.java b/src/main/java/ellpeck/someprettytechystuff/util/Util.java similarity index 84% rename from src/main/java/ellpeck/gemification/util/Util.java rename to src/main/java/ellpeck/someprettytechystuff/util/Util.java index 592c004e6..a9b8633bf 100644 --- a/src/main/java/ellpeck/gemification/util/Util.java +++ b/src/main/java/ellpeck/someprettytechystuff/util/Util.java @@ -1,5 +1,6 @@ -package ellpeck.gemification.util; +package ellpeck.someprettytechystuff.util; +import net.minecraft.item.Item; import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; @@ -8,7 +9,7 @@ import java.util.ArrayList; @SuppressWarnings("unused") public class Util{ - public static final String MOD_ID = "gemification"; + public static final String MOD_ID = "someprettytechystuff"; public static final String NAME = "Gemification"; public static final String VERSION = "1.7.10-1.0.1"; @@ -40,4 +41,9 @@ public class Util{ public static String shiftForInfo() { return (char)167+"2" + (char)167+"o" + StatCollector.translateToLocal("tooltip.shiftForInfo.desc"); } + + public static String addStandardInformation(Item item){ + if(isShiftPressed()) return StatCollector.translateToLocal("tooltip." + item.getUnlocalizedName().substring(5) + ".desc"); + else return shiftForInfo(); + } } diff --git a/src/main/resources/assets/gemification/lang/en_US.lang b/src/main/resources/assets/gemification/lang/en_US.lang deleted file mode 100644 index 46112d62a..000000000 --- a/src/main/resources/assets/gemification/lang/en_US.lang +++ /dev/null @@ -1,75 +0,0 @@ -itemGroup.gemification=Gemification - -tile.oreGemOnyx.name=Onyx Ore -tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore -tile.oreGemChromeDiopside.name=Chrome Diopside Ore -tile.oreGemJasper.name=Jasper Ore -tile.oreGemSodalite.name=Sodalite Ore -tile.oreGemIolite.name=Iolite Ore -tile.oreGemSmithsonite.name=Smithsonite Ore -tile.oreGemDanburite.name=Danburite Ore -tile.oreGemHematite.name=Hematite Ore -tile.oreGemLepidolite.name=Lepidolite Ore -tile.oreGemTourmaline.name=Tourmaline Ore -tile.oreGemSphene.name=Sphene Ore -tile.oreGemParaibaTourlamine.name=Paraiba Tourlamine Ore -tile.oreGemRhodochrosite.name=Rhodochrosite Ore -tile.oreGemClinohumite.name=Clinohumite Ore -tile.oreGemGoshenite.name=Goshenite Ore - -item.itemGemOnyx.name=Onyx -item.itemGemAlmandineGarnet.name=Almandine Garnet -item.itemGemChromeDiopside.name=Chrome Diopside -item.itemGemJasper.name=Jasper -item.itemGemSodalite.name=Sodalite -item.itemGemIolite.name=Iolite -item.itemGemSmithsonite.name=Smithsonite -item.itemGemDanburite.name=Danburite -item.itemGemHematite.name=Hematite -item.itemGemLepidolite.name=Lepidolite -item.itemGemTourmaline.name=Tourmaline -item.itemGemSphene.name=Sphene -item.itemGemParaibaTourlamine.name=Paraiba Tourlamine -item.itemGemRhodochrosite.name=Rhodochrosite -item.itemGemClinohumite.name=Clinohumite -item.itemGemGoshenite.name=Goshenite - -tooltip.shiftForInfo.desc= -tooltip.blockCrucible.desc=Better than Cauldrons, better than everything! -tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use. - -tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz -tooltip.gemAlmandineGarnet.desc=Popular for its excellent hardness and brilliance -tooltip.gemChromeDiopside.desc=Colored by chromium, has similarities to chrome tourmaline -tooltip.gemJasper.desc=In a gem group by itself because of its grainy structure -tooltip.gemSodalite.desc=Gets its name from its sodium content, contains white veins of calcite -tooltip.gemIolite.desc=Is seen as three different color shades -tooltip.gemSmithsonite.desc=Discovered by the British mineralogist James Smithson -tooltip.gemDanburite.desc=First discovered in 1839, quite hard -tooltip.gemHematite.desc=When highly polished it can sometimes look like silver, remarkably dense -tooltip.gemLepidolite.desc=One of the major sources of the rare alkali metals rubidium and caesium -tooltip.gemTourmaline.desc=One of the most versatile of gems, found in every color -tooltip.gemSphene.desc=Of high luster, unique color shades and an intense fire -tooltip.gemParaibaTourlamine.desc=First found in Brazil in 1989, similar material has since been found in Africa. -tooltip.gemRhodochrosite.desc=Usually found in an aggregate form with alternating light -tooltip.gemClinohumite.desc=Rare gemstone, only three sources of gem-quality material are known -tooltip.gemGoshenite.desc=Named after the small town of Goshen in Western Massachusetts - -tooltip.fluidNone.name=Empty -tooltip.fluidWater.name=Water -tooltip.fluidOnyx.name=Liquid Onyx -tooltip.fluidAlmandineGarnet.name=Liquid Almandine Garnet -tooltip.fluidChromeDiopside.name=Liquid Chrome Diopside -tooltip.fluidJasper.name=Liquid Jasper -tooltip.fluidSodalite.name=Liquid Sodalite -tooltip.fluidIolite.name=Liquid Iolite -tooltip.fluidSmithsonite.name=Liquid Smithsonite -tooltip.fluidDanburite.name=Liquid Danburite -tooltip.fluidHematite.name=Liquid Hematite -tooltip.fluidLepidolite.name=Liquid Lepidolite -tooltip.fluidTourmaline.name=Liquid Tourmaline -tooltip.fluidSphene.name=Liquid Sphene -tooltip.fluidParaibaTourlamine.name=Liquid ParaibaTourmaline -tooltip.fluidRhodochrosite.name=Liquid Rhodochrosite -tooltip.fluidClinohumite.name=Liquid Clinohumite -tooltip.fluidGoshenite.name=Liquid Goshenite \ No newline at end of file diff --git a/src/main/resources/assets/someprettytechystuff/lang/en_US.lang b/src/main/resources/assets/someprettytechystuff/lang/en_US.lang new file mode 100644 index 000000000..b2d80ac39 --- /dev/null +++ b/src/main/resources/assets/someprettytechystuff/lang/en_US.lang @@ -0,0 +1,122 @@ +itemGroup.gemification=Gemification + +tile.oreGemOnyx.name=Onyx Ore +tile.oreGemAlmandineGarnet.name=Almandine Garnet Ore +tile.oreGemChromeDiopside.name=Chrome Diopside Ore +tile.oreGemJasper.name=Jasper Ore +tile.oreGemSodalite.name=Sodalite Ore +tile.oreGemIolite.name=Iolite Ore +tile.oreGemSmithsonite.name=Smithsonite Ore +tile.oreGemDanburite.name=Danburite Ore +tile.oreGemHematite.name=Hematite Ore +tile.oreGemLepidolite.name=Lepidolite Ore +tile.oreGemTourmaline.name=Tourmaline Ore +tile.oreGemSphene.name=Sphene Ore +tile.oreGemParaibaTourlamine.name=Paraiba Tourlamine Ore +tile.oreGemRhodochrosite.name=Rhodochrosite Ore +tile.oreGemClinohumite.name=Clinohumite Ore +tile.oreGemGoshenite.name=Goshenite Ore + +tile.blockCrucible.name=The Crucible +tile.blockCrucibleFire.name=Crucible Fire +tile.blockCropIron.name=Fea +tile.blockCropGold.name=Ahu +tile.blockCropDiamond.name=Cee +tile.blockCropRedstone.name=Rad + +item.itemGemOnyx.name=Onyx +item.itemGemAlmandineGarnet.name=Almandine Garnet +item.itemGemChromeDiopside.name=Chrome Diopside +item.itemGemJasper.name=Jasper +item.itemGemSodalite.name=Sodalite +item.itemGemIolite.name=Iolite +item.itemGemSmithsonite.name=Smithsonite +item.itemGemDanburite.name=Danburite +item.itemGemHematite.name=Hematite +item.itemGemLepidolite.name=Lepidolite +item.itemGemTourmaline.name=Tourmaline +item.itemGemSphene.name=Sphene +item.itemGemParaibaTourlamine.name=Paraiba Tourlamine +item.itemGemRhodochrosite.name=Rhodochrosite +item.itemGemClinohumite.name=Clinohumite +item.itemGemGoshenite.name=Goshenite + +item.itemInfoBook.name=Gemificationic Lexicon +item.itemSeedIron.name=Fea Seeds +item.itemSeedGold.name=Ahu Seeds +item.itemSeedDiamond.name=Cee Seeds +item.itemSeedRedstone.name=Rad Seeds + +item.itemPileIron.name=Pile of Iron +item.itemPileGold.name=Pile of Gold +item.itemPileDiamond.name=Pile of Diamond +item.itemPileRedstone.name=Pile of Redstone + +item.itemInfusedIronPickaxe.name=Infused Iron Pick +item.itemInfusedIronAxe.name=Infused Iron Axe +item.itemInfusedIronShovel.name=Infused Iron Shovel +item.itemInfusedIronSword.name=Infused Iron Sword +item.itemInfusedIronHoe.name=Infused Iron Hoe +item.itemInfusedIronIngot.name=Infused Iron Ingot + +tooltip.shiftForInfo.desc= + +tooltip.blockCrucible.desc=Better than Cauldrons, better than everything! +tooltip.blockCrucibleFire.desc=Powers Crucibles, just put 'em on top! +tooltip.gemIsOre.desc=Ore Form, needs to get broken down to use. + +tooltip.itemInfoBook.desc=Still UNIMPLEMENTED, go look at it though! It's FANCY I tell ya! +tooltip.itemSeedIron.desc=Grows Iron. ...no, seriously. STOP LAUGHING. +tooltip.itemSeedGold.desc=Grows Gold. ...no, seriously. STOP LAUGHING. +tooltip.itemSeedRedstone.desc=Grows Redstone. ...no, seriously. STOP LAUGHING. +tooltip.itemSeedDiamond.desc=Grows Diamond. ...no, seriously. STOP LAUGHING. +tooltip.itemPileIron.desc=Craft in a 2x2 to get an Iron Ingot! +tooltip.itemPileGold.desc=Craft in a 2x2 to get a Gold Ingot! +tooltip.itemPileDiamond.desc=Craft in a 2x2 to get a Diamond! +tooltip.itemPileRedstone.desc=Craft in a 2x2 to get a piece of Redstone! + +tooltip.itemInfusedIronPickaxe.desc=Want some InstaMine? Efficiency V! +tooltip.itemInfusedIronAxe.desc=Chops trees! Fast! +tooltip.itemInfusedIronShovel.desc=InstaMine? Heck yes! +tooltip.itemInfusedIronSword.desc=Kill all 'dem Mobs! +tooltip.itemInfusedIronHoe.desc=...well. It's a Hoe. +tooltip.itemInfusedIronIngot.desc=Feel the Strength! The Power! The... colory mess! + +tooltip.gemOnyx.desc=Black form of chalcedony, a form of quartz +tooltip.gemAlmandineGarnet.desc=Popular for its excellent hardness and brilliance +tooltip.gemChromeDiopside.desc=Colored by chromium, has similarities to chrome tourmaline +tooltip.gemJasper.desc=In a gem group by itself because of its grainy structure +tooltip.gemSodalite.desc=Gets its name from its sodium content, contains white veins of calcite +tooltip.gemIolite.desc=Is seen as three different color shades +tooltip.gemSmithsonite.desc=Discovered by the British mineralogist James Smithson +tooltip.gemDanburite.desc=First discovered in 1839, quite hard +tooltip.gemHematite.desc=When highly polished it can sometimes look like silver, remarkably dense +tooltip.gemLepidolite.desc=One of the major sources of the rare alkali metals rubidium and caesium +tooltip.gemTourmaline.desc=One of the most versatile of gems, found in every color +tooltip.gemSphene.desc=Of high luster, unique color shades and an intense fire +tooltip.gemParaibaTourlamine.desc=First found in Brazil in 1989, similar material has since been found in Africa. +tooltip.gemRhodochrosite.desc=Usually found in an aggregate form with alternating light +tooltip.gemClinohumite.desc=Rare gemstone, only three sources of gem-quality material are known +tooltip.gemGoshenite.desc=Named after the small town of Goshen in Western Massachusetts + +tooltip.fluidNone.name=Empty +tooltip.fluidWater.name=Water +tooltip.fluidOnyx.name=Aqueous Onyx +tooltip.fluidAlmandineGarnet.name=Aqueous Almandine Garnet +tooltip.fluidChromeDiopside.name=Aqueous Chrome Diopside +tooltip.fluidJasper.name=Aqueous Jasper +tooltip.fluidSodalite.name=Aqueous Sodalite +tooltip.fluidIolite.name=Aqueous Iolite +tooltip.fluidSmithsonite.name=Aqueous Smithsonite +tooltip.fluidDanburite.name=Aqueous Danburite +tooltip.fluidHematite.name=Aqueous Hematite +tooltip.fluidLepidolite.name=Aqueous Lepidolite +tooltip.fluidTourmaline.name=Aqueous Tourmaline +tooltip.fluidSphene.name=Aqueous Sphene +tooltip.fluidParaibaTourlamine.name=Aqueous ParaibaTourmaline +tooltip.fluidRhodochrosite.name=Aqueous Rhodochrosite +tooltip.fluidClinohumite.name=Aqueous Clinohumite +tooltip.fluidGoshenite.name=Aqueous Goshenite + +infoBook.crucibleChapter.title=Crucible +infoBook.crucibleChapter.page0.text=The Crucible is a block that is crafted using iron and a cauldron. It is used for nearly all of the Gem involving recipes. It needs a Crucible Fire below and a liquid Gem inside to be able to craft something. The liquid Gem is obtained by putting a water bucket and a Gem into the two slots at the top right. When crafting is done, the item is going to end up at the bottom right. \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..6b704ea94994830074ee5d284e48c3cf197a82f3 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropRedstoneStage3.png new file mode 100644 index 0000000000000000000000000000000000000000..d86bce1ca76cc3edf0e37c709c765874456163c3 GIT binary patch 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>% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage0.png new file mode 100644 index 0000000000000000000000000000000000000000..62d0418d5911ceee6edb76f29e6e31175462377a GIT binary patch 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}+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage1.png new file mode 100644 index 0000000000000000000000000000000000000000..bb1337daa7b4afe1006d7c9fde98951d9eb8545e GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/blockCropStage2.png new file mode 100644 index 0000000000000000000000000000000000000000..7a0fe2d2efa40e5f07e18131e06abe4f34549df9 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gemification/textures/blocks/models/modelCrucible.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/models/modelCrucible.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/models/modelCrucible.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/models/modelCrucible.png diff --git a/src/main/resources/assets/gemification/textures/blocks/models/modelCrucibleFire.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/models/modelCrucibleFire.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/models/modelCrucibleFire.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/models/modelCrucibleFire.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemAlmandineGarnet.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemAlmandineGarnet.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemAlmandineGarnet.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemAlmandineGarnet.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemChromeDiopside.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemChromeDiopside.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemChromeDiopside.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemChromeDiopside.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemClinohumite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemClinohumite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemClinohumite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemClinohumite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemDanburite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemDanburite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemDanburite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemDanburite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemGoshenite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemGoshenite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemGoshenite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemGoshenite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemHematite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemHematite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemHematite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemHematite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemIolite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemIolite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemIolite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemIolite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemJasper.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemJasper.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemJasper.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemJasper.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemLepidolite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemLepidolite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemLepidolite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemLepidolite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemOnyx.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemOnyx.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemOnyx.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemOnyx.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemParaibaTourlamine.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemParaibaTourlamine.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemParaibaTourlamine.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemParaibaTourlamine.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemRhodochrosite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemRhodochrosite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemRhodochrosite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemRhodochrosite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemSmithsonite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSmithsonite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemSmithsonite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSmithsonite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemSodalite.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSodalite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemSodalite.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSodalite.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemSphene.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSphene.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemSphene.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemSphene.png diff --git a/src/main/resources/assets/gemification/textures/blocks/oreGemTourmaline.png b/src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemTourmaline.png similarity index 100% rename from src/main/resources/assets/gemification/textures/blocks/oreGemTourmaline.png rename to src/main/resources/assets/someprettytechystuff/textures/blocks/oreGemTourmaline.png diff --git a/src/main/resources/assets/gemification/textures/gui/guiCrucible.png b/src/main/resources/assets/someprettytechystuff/textures/gui/guiCrucible.png similarity index 100% rename from src/main/resources/assets/gemification/textures/gui/guiCrucible.png rename to src/main/resources/assets/someprettytechystuff/textures/gui/guiCrucible.png diff --git a/src/main/resources/assets/gemification/textures/gui/guiCrucibleFire.png b/src/main/resources/assets/someprettytechystuff/textures/gui/guiCrucibleFire.png similarity index 100% rename from src/main/resources/assets/gemification/textures/gui/guiCrucibleFire.png rename to src/main/resources/assets/someprettytechystuff/textures/gui/guiCrucibleFire.png diff --git a/src/main/resources/assets/gemification/textures/gui/guiInfoBook.png b/src/main/resources/assets/someprettytechystuff/textures/gui/guiInfoBook.png similarity index 100% rename from src/main/resources/assets/gemification/textures/gui/guiInfoBook.png rename to src/main/resources/assets/someprettytechystuff/textures/gui/guiInfoBook.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemAlmandineGarnet.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemAlmandineGarnet.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemAlmandineGarnet.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemAlmandineGarnet.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemChromeDiopside.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemChromeDiopside.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemChromeDiopside.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemChromeDiopside.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemClinohumite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemClinohumite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemClinohumite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemClinohumite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemDanburite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemDanburite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemDanburite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemDanburite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemGoshenite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemGoshenite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemGoshenite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemGoshenite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemHematite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemHematite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemHematite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemHematite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemIolite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemIolite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemIolite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemIolite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemJasper.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemJasper.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemJasper.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemJasper.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemLepidolite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemLepidolite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemLepidolite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemLepidolite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemOnyx.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemOnyx.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemOnyx.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemOnyx.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemParaibaTourlamine.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemParaibaTourlamine.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemParaibaTourlamine.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemParaibaTourlamine.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemRhodochrosite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemRhodochrosite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemRhodochrosite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemRhodochrosite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemSmithsonite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemSmithsonite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemSmithsonite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemSmithsonite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemSodalite.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemSodalite.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemSodalite.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemSodalite.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemSphene.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemSphene.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemSphene.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemSphene.png diff --git a/src/main/resources/assets/gemification/textures/items/itemGemTourmaline.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemGemTourmaline.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemGemTourmaline.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemGemTourmaline.png diff --git a/src/main/resources/assets/gemification/textures/items/itemInfoBook.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemInfoBook.png similarity index 100% rename from src/main/resources/assets/gemification/textures/items/itemInfoBook.png rename to src/main/resources/assets/someprettytechystuff/textures/items/itemInfoBook.png diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronAxe.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemInfusedIronAxe.png new file mode 100644 index 0000000000000000000000000000000000000000..be2094b95b263eaa0b85da457f7b9f2748a8166a GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxK$!8B)5ZfpL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBN_ISED zhFJI~|M>sk-c`cs0kfXg|5VAC0_{WT3@(qq|G(+*=8!@|tYRK>%mFD$xvl@wf86t5 z#ORP-pT6PO{|-mtBnE-%S)KpRf0%qYq~|olgtw^DoHRSkaDrh|P8;I{#*~{p%r6=}q!JPs7+xhGJ!lvI6;>1s;*b z3=DkxK$!8B)5ZfpL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBNay?xf zLoEE07f5bM;rMl4;0WtM73K}g{{NT!x7x|TvaKP8;n41dY>hYOr7ikz{O5^>@tJF3 zPwn{+dv9=@`|{O)(`SVGt&YPi%_6fCX`4*@Z}})G f+)g{i$jr>(B_Gz7YIN=y&|(HpS3j3^P6N2bZe?^J zG%heMGmPe!Pyhe{4oO5oR5(x7kuggHK@f$nx80Z{TxV@-Ap|@SBc>4|fmn!Fr&3rh zM@Z#Au=9S0|I42+?l(7cxuBq>K6vcy?Y#G9cC-J3x|j>J?eFlGiNK;>N{DAlzU}yX zOtTLyg6B660@_{K^U_SMyu)K%h%-J16@k~XRSpf<$58FZ>Drr`q=O5~_DXqNiLR6F zt!yWYo}<-;r~!!K{vZju=rpy=N)RKkQm+Qg3`pdFGz3G@k%`!lvI6;>1s;*b z3=DkxK$!8B)5ZfpL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBNR(ZNO zhFJI~FW~j~@{9jCPhP+*j|UHqefWR1o=w5#*MHS!eTn<*pBx^|OI!5c_|KCLL!PA7 z(#<9k^Q%rW9Gm;{)qm3`J37mGc^Y#5ofqIM!lvI6;>1s;*b z3=DkxK$!8B)5ZfpL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBN+C5zy zLoED{_ABx=2MD;hCtl#-IXG4LL3Ul!%JmM-xfZPKt_eF1ZJ2x^EFq$fNk8)Ey_7=P zhbQmvHcWhuF>!%-J*6ocP$F>#a~VS$$ep#F?*d!Rd1@=50#9JHe)m zKg?B1lY4Km$jQH}f1H*pJ1ys@@7)n+r&}MWqE#S#fQxrd{9J2c-e*83F?hQAxvX!lvI6;>1s;*b z3=DkxL735kHCP2GC{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXWa8_dH_((D^C~4 z5DWjg6K%N;IS90}3ktGGZ}eTAkeEL4P|<;7UVEDE9q_8wPe@Oke(#vx_6^@v9`CuC z^QSSzymG@$-re_S-`sx1%Vu(siMY0k(w8feuicVZpsTkw6=OR)I9Z?p?P)NrTM;Fcuz>O++wR)xH#wCz9zP1xzV?(zOPW<%=c-s z+&pO&<#5Yidv{k%yL5oH&9CdN#X%K$trcqXU%O;&l{j5Dm*e{hp9v@HH%w)!x#ycQ zi-)J7lmFVf5LKB&4ypY0r;9ixpOmb&4^d}HP26gvP{quWFn{Gf-BX!BUo&{R`njxg HN@xNAf!>VZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemPileDiamond.png new file mode 100644 index 0000000000000000000000000000000000000000..7e25ab0bd4284643c5704fe907dbf0c5437d3c2e GIT binary patch literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!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} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png b/src/main/resources/assets/someprettytechystuff/textures/items/itemSeedDiamond.png new file mode 100644 index 0000000000000000000000000000000000000000..eb890e0557d75fb4004b215c2c61ca72c3c4da9f GIT binary patch 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 literal 0 HcmV?d00001