commit 07/11/2014

This commit is contained in:
brandon3055 committed 2014-11-07 17:58:11 +11:00
1 parent 7d8ba25d2d
commit 4d645d235f
9 files changed
+17 -14

No files matched your search

@@ -50,7 +50,7 @@ public class GuiButtonTextOnly extends GuiButton{
trimmedDisplayString = EnumChatFormatting.BOLD+""+EnumChatFormatting.ITALIC+trimmedDisplayString;
GL11.glPushMatrix();
GL11.glColor4f(0f, 0f, 0f, 1f);
drawTexturedModalRect(xPosition, yPosition, 0, 46, (int)(fontrenderer.getStringWidth(trimmedDisplayString)*0.72)+2, 8);
drawTexturedModalRect(xPosition+(int)(xPosition*0.01), yPosition+(int)(yPosition*0.01), 0, 46, (int)(fontrenderer.getStringWidth(trimmedDisplayString)*0.72)+2, 8);
GL11.glPopMatrix();
}
GL11.glPushMatrix();
@@ -91,6 +91,7 @@ public class GuiManual extends GuiScreen {
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.generator, 1, 3), ""));
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.dissEnchanter), ""));
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.teleporterStand), ""));
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconiumChest), ""));
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.particleGenerator), ""));
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), ""));
@@ -24,10 +24,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.MathHelper;
import net.minecraft.util.StatCollector;
import net.minecraft.util.*;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.oredict.OreDictionary;
@@ -53,7 +50,6 @@ public class DraconiumChest extends BlockContainerDE {
ModBlocks.register(this, DraconiumChestItemBlock.class);
}
//todo add to guide and update dislocator in guide
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float cx, float cy, float cz) {
TileEntity tileEntity = world.getTileEntity(x, y, z);
@@ -95,7 +91,11 @@ public class DraconiumChest extends BlockContainerDE {
return true;
}
if (te.editMode && player.getHeldItem() != null && player.getHeldItem().getItem().equals(Items.paper) && player.getHeldItem().stackSize == 1){
if (te.editMode && player.getHeldItem() != null && player.getHeldItem().getItem().equals(Items.paper)){
if (player.getHeldItem().stackSize != 1){
if (world.isRemote)player.addChatComponentMessage(new ChatComponentTranslation("msg.draconiumChestEdit2.txt"));
return true;
}
ItemStack paper = player.getHeldItem();
NBTTagCompound nbt = paper.getTagCompound();
if (nbt == null) nbt = new NBTTagCompound();
@@ -168,6 +168,7 @@ public class PlacedItem extends BlockDE {
if (!world.isRemote) breakBlock(world, x, y, z, this, world.getBlockMetadata(x, y, z));
world.setBlockToAir(x, y, z);
}
world.markBlockForUpdate(x, y, z);
return true;
}
@@ -186,6 +187,7 @@ public class PlacedItem extends BlockDE {
}
tile.rotation -= 25;
}
world.markBlockForUpdate(x, y, z);
}
@Override
@@ -90,7 +90,7 @@ public class CraftingHandler {
CraftingManager.getInstance().addRecipe(new ItemStack(ModBlocks.draconium), "III", "III", "III", 'I', ModItems.draconiumIngot);
CraftingManager.getInstance().addRecipe(new ItemStack(ModBlocks.energyStorageCore), "SRS", "DCD", "SRS", 'S', Items.nether_star, 'R', Blocks.redstone_block, 'C', ModItems.draconicCore, 'D', new ItemStack(ModBlocks.draconium, 1, 0));
CraftingManager.getInstance().addRecipe(new ItemStack(ModBlocks.draconium, 1, 1), "CSC", "SDS", "CSC", 'C', mobSoul, 'S', ModItems.sunFocus, 'D', new ItemStack(ModBlocks.draconium, 1, 0));
CraftingManager.getInstance().addRecipe(new ItemStack(ModBlocks.draconiumChest), "ICI", "SWS", "ICI", 'I', ModItems.draconiumIngot, 'C', ModItems.draconicCore, 'S', chest, 'W', Blocks.crafting_table);
CraftingManager.getInstance().addRecipe(new ItemStack(ModBlocks.draconiumChest), "IFI", "SCS", "IWI", 'I', ModItems.draconiumIngot, 'C', ModItems.draconicCore, 'S', chest, 'W', Blocks.crafting_table, 'F', Blocks.furnace);
if(ConfigHandler.disableSunDial == 0)
@@ -18,6 +18,7 @@ public class InfoTablet extends ItemDE {
public InfoTablet() {
this.setUnlocalizedName(Strings.infoTabletName);
this.setCreativeTab(DraconicEvolution.tolkienTabBlocksItems);
this.setMaxStackSize(1);
ModItems.register(this);
}
@@ -221,11 +221,9 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
if (candidate == null) break;
boolean candidateSmeltable = FurnaceRecipes.smelting().getSmeltingResult(candidate) != null;
if (candidateSmeltable) {
LogHelper.info(candidate);
setInventorySlotContents(234 + j, candidate.copy());
setInventorySlotContents(i, null);
candidate = null;
LogHelper.info(candidate);
}
}