diff --git a/build.gradle b/build.gradle index 6574862c..b8c45a17 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-v0.9.6-Beta-pre5" +version = "1.7.10-v0.9.6-Beta-pre6" group= "com.brandon3055.draconicevolution" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Draconic-Evolution" diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java index 42d47864..eb0ddabb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiButtonTextOnly.java @@ -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(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java index f4f53a88..1e982b73 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/manual/GuiManual.java @@ -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), "")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java index 7dddf706..c7d5c3f4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java @@ -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(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java index 8e3a47ed..f280aa77 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/PlacedItem.java @@ -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 diff --git a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java index 764ad021..9c67854b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/core/handler/CraftingHandler.java @@ -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) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java index 0a7e13bf..949c8d7f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/InfoTablet.java @@ -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); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java index e8efa863..d6e92fd3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -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); } } diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 89435bc6..21100b96 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -69,11 +69,11 @@ tile.draconicevolution:teleporterStand.name=Dislocator Pedestal tile.draconicevolution:teleporterStand.description=You have figured out how to create a simple pedestal on which you can place you basic or advanced charms of dislocation. Simply right click with a charm in your hand to place it on the pedestal then right click the pedestal to teleport. The advantage of this is the charms wont take damage or use fuel. The disadvantage is you can bring them with you to your destination. To remove the charm from the pedestal simply shift right click with an empty hand. tile.draconicevolution:draconiumChest.name=Draconic Chest -tile.draconicevolution:draconiumChest.Description=//TODO Description +tile.draconicevolution:draconiumChest.description=Using your draconic knowledge you have learned how to create the ultimate chest. With a massive 234 slot storage capacity a built in crafting table and 5 slot RF furnace capable of doubling ore as well as the ability to keep its contents when harvested this chest is the most powerful most versatile storage device in existence! It also comes in a variety of every colour you can imagine gust shift right click it with empty hand for details. //###################################Item names###################################// item.draconicevolution:draconicCompound.name=Draconic Compound -item.draconicevolution:draconicCompound.description=Research has found a very powerful item that will be neccessary to create powerful tools +item.draconicevolution:draconicCompound.description=Research has found a very powerful item that will be necessary to create powerful tools item.draconicevolution:draconiumIngot.name=Draconium Ingot item.draconicevolution:draconiumIngot.description=The results of smelting draconium blend in a furnace. Used in most recipes. @@ -102,7 +102,7 @@ item.draconicevolution:teleporterMKI.name=Charm of Dislocation item.draconicevolution:teleporterMKI.description=You have managed to infuse the powers of The End with your knowledge of the Draconic to create a basic teleporter, but at a cost. The energies binding them are unstable and only last for 10 uses and will take some of your life energy with each use and can only be linked to a single location but works across dimensions. Once used up, you must create a new one. item.draconicevolution:teleporterMKII.name=Enhanced Charm of Dislocation -item.draconicevolution:teleporterMKII.description=Learning how draconic powers interract with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 5 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. +item.draconicevolution:teleporterMKII.description=Learning how draconic powers interact with the powers of the endermen, you have created the ultimate teleporter. You can now store up to 100 locations and using the endermen’s own pearls as fuel, created something that can teleport you extreme distances even across dimensions at will. Shift right click to open the GUI. Most functionality should be self explanatory. On the left is the destination list. Each destination has a lock button that prevents you from accidentally overwriting or deleting it. On the right starting from the top you have information about the selected destination, An option to rename the selected destination, An option to change the selected destination to your current coordinates and an option to delete the selected destination. Under that is the fuel, An option to teleport to the selected destination, an option to add a new destination (your current location), And an option to add fuel (Ender pearls from your inventory) Shift click to add a stack. You can also shift+Scroll with the item in your hand to cycle through the destinations without opening the gui and right click to teleport. You can also teleport players and mobs by left clicking them however players must be holding shift and mobs can not be teleported across dimensions. item.draconicevolution:wyvernPickaxe.name=Pickaxe of the Wyvern item.draconicevolution:wyvernPickaxe.description=Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Modes: Shift-Right Click to switch modes: 1×1 or 3×3 @@ -236,6 +236,7 @@ msg.draconiumChestEditL1.txt=Right click with red green or blue dye to adjust th msg.draconiumChestEditL2.txt=Click the top half of the chest to increase the value msg.draconiumChestEditL3.txt=Or the bottom half of the chest to decrease the value msg.draconiumChestEditL4.txt=Right click with paper to copy the colour to other chests +msg.draconiumChestEdit2.txt=Please use a single peace of paper //###################################Tool Tips###################################// info.teleporterInfUnset1.txt=Unbound