Changing stuff!

This commit is contained in:
Ellpeck 2015-01-05 22:14:01 +01:00
parent 46332e7beb
commit 763ddfb718
115 changed files with 846 additions and 347 deletions

View file

@ -1,3 +0,0 @@
Gemification
============
Magic with Gems! That's just awesome, isn't it?

View file

@ -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"

View file

@ -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));
}
}

View file

@ -1,14 +0,0 @@
package ellpeck.gemification.booklet;
import java.util.ArrayList;
public class ChapterList{
public static ArrayList<Chapter> chapterList = new ArrayList<Chapter>();
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));
}
}

View file

@ -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);
}
}

View file

@ -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));
}
}

View file

@ -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")

View file

@ -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;

View file

@ -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();
}
}

View file

@ -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());
}
}
}

View file

@ -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());
}
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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());
}
}
}

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.blocks.models;
package ellpeck.someprettytechystuff.blocks.models;
import net.minecraft.client.model.ModelBase;

View file

@ -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{

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.blocks.models;
package ellpeck.someprettytechystuff.blocks.models;
import net.minecraft.client.model.ModelRenderer;

View file

@ -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;

View file

@ -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;

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.blocks.models;
package ellpeck.someprettytechystuff.blocks.models;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;

View file

@ -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];

View file

@ -0,0 +1,14 @@
package ellpeck.someprettytechystuff.booklet;
import java.util.ArrayList;
public class ChapterList{
public static ArrayList<Chapter> chapterList = new ArrayList<Chapter>();
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));
}
}

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.booklet;
package ellpeck.someprettytechystuff.booklet;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;

View file

@ -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);
}
}
}

View file

@ -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;

View file

@ -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;

View file

@ -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{

View file

@ -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);
}
}

View file

@ -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;
}
}

View file

@ -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;

View file

@ -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;

View file

@ -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;
}
}

View file

@ -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;
}
}

View file

@ -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);
if(tileCrucible.output != null){
RenderHelper.enableGUIStandardItemLighting();
GL11.glEnable(GL11.GL_LIGHTING);
itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), tileCrucible.output, guiLeft + 112, guiTop + 65);
itemRender.renderItemAndEffectIntoGUI(fontRendererObj, mc.getTextureManager(), tileCrucible.output.copy(), guiLeft + 112, guiTop + 65);
GL11.glDisable(GL11.GL_LIGHTING);
RenderHelper.disableStandardItemLighting();
if(tileCrucible.output != null){
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){

View file

@ -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;

View file

@ -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));
}
}

View file

@ -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){

View file

@ -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));
}
}

View file

@ -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]);
}
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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));
}
}

View file

@ -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;

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.proxy;
package ellpeck.someprettytechystuff.proxy;
public interface IProxy {

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.proxy;
package ellpeck.someprettytechystuff.proxy;
public class ServerProxy implements IProxy{

View file

@ -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;

View file

@ -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;
}
}
}

View file

@ -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;

View file

@ -1,4 +1,4 @@
package ellpeck.gemification.tile;
package ellpeck.someprettytechystuff.tile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ISidedInventory;

View file

@ -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;

View file

@ -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();
}
}

View file

@ -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=<Hold Shift>
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

View file

@ -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=<Hold Shift>
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.

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 327 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 305 B

Some files were not shown because too many files have changed in this diff Show more