diff --git a/.gitignore b/.gitignore index c4f7aa18..18331dcb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ ## gradle /.gradle /build +/libs ## ForgeGradle /run diff --git a/Change Log.txt b/Change Log.txt index 026862d1..8ec31ac2 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,5 +1,22 @@ +######## 1.0.1-Snapshot 9 (RC 4)######## +-stopped draconic chest eating up a tone of tick time. +-prevented dragon travelling through portals. +-you now make draconium ingots by smelting draconium dust directly. +-draconium blend is now depreciated and will be removed completely in 1.0.2. +-fixed server crash related to the wireless energy transceiver. +-draconium and awakened draconium blocks are now immune to the wither. +-added more documentation to the information tablet. +-you can now scroll faster in the info tablet gui by holding shift. +-changed the default texture for draconium ore to the overworld texture. +-increased draconic chest energy usage to 1000RF/t + +######## 1.0.1-Snapshot 8 (RC 3)######## +-fixed manual crashing due to ingredients with wiled card damage values. +-removed some debug code from the crystal binder. +-fixed dislocator client crash when binding. + ######## 1.0.1-Snapshot 7 (RC 2)######## --hotfix for server crash in RC 1 related to changing tool modes +-hotfix for server crash in RC 1 related to changing tool modes. ######## 1.0.1-Snapshot 6 (RC 1)######## -fixed teleporting mobs with a dislocator on a server crashing the client. diff --git a/VERSION.json b/VERSION.json index 17248de5..7d144fcc 100644 --- a/VERSION.json +++ b/VERSION.json @@ -1,3 +1,3 @@ Version:1.0.1 -Snapshot:7 -ReleaseNote:Hotfix for server crash in RC 1! +Snapshot:9 +ReleaseNote:More bug fixes diff --git a/build.gradle b/build.gradle index b464b3b8..0f155358 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ repositories { apply plugin: 'forge' -version = "1.7.10-v1.0.1-RC-2" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) +version = "1.7.10-v1.0.1-RC-4" //Version System A.B.CD A=Minecraft version (increments with each new minecraft version) B=Major mod change (Will break saves) C=Release Number (Increments with each public release) D=Bugfix version (a-z) 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/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 23109bb2..c488a61b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -37,6 +37,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; @@ -225,4 +226,9 @@ public class ClientProxy extends CommonProxy { { return Minecraft.getMinecraft().theWorld.getWorldInfo().getGameType().isCreative(); } + + @Override + public void spawnParticle(Object particle) { + if (particle instanceof EntityFX) ParticleHandler.spawnCustomParticle((EntityFX)particle); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java index 99346ae0..b5adf988 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -5,6 +5,7 @@ import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.container.DummyContainer; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; import com.brandon3055.draconicevolution.common.lib.References; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.google.gson.stream.JsonReader; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; @@ -32,7 +33,7 @@ public class GUIManual extends GUIScrollingBase { if (currentPage != null) { collection.addComponent(new ComponentManualPage(0, 0, this, currentPage)).setGroup(GR_PAGE); - collection.addComponent(new ComponentButton(102, 325, 50, 20, 1, this, StatCollector.translateToLocal("button.de.back.txt"))).setGroup(GR_PAGE); + collection.addComponent(new ComponentButton(102, 314, 50, 12, 1, this, StatCollector.translateToLocal("button.de.back.txt"))).setGroup(GR_PAGE); collection.setOnlyGroupEnabled(GR_BACKGROUND); collection.setGroupEnabled(GR_PAGE, true); } @@ -51,7 +52,7 @@ public class GUIManual extends GUIScrollingBase { @Override protected ComponentCollection assembleComponents() { - collection = new ComponentCollection(0, 0, xSize, ySize + 20, this); + collection = new ComponentCollection(0, 0, xSize, ySize, this); collection.addComponent(new ComponentTexturedRect(0, 0, 255, 255, ResourceHandler.getResource("textures/gui/manualTop.png"))).setGroup(GR_BACKGROUND); collection.addComponent(new ComponentTexturedRect(0, 255, 255, 69, ResourceHandler.getResource("textures/gui/manualBottom.png"))).setGroup(GR_BACKGROUND); @@ -74,7 +75,7 @@ public class GUIManual extends GUIScrollingBase { @Override public void handleScrollInput(int direction) { if (currentPage != null) return; - scrollOffset += direction * 10; + scrollOffset += direction * (InfoHelper.isShiftKeyDown() ? 30 : 10); if (scrollOffset < 0) scrollOffset = 0; if (scrollOffset > pageLength - ySize + 40) scrollOffset = pageLength - ySize + 40; if (pageLength + 40 <= ySize) scrollOffset = 0; @@ -96,7 +97,7 @@ public class GUIManual extends GUIScrollingBase { @Override protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); + GL11.glPushMatrix(); GL11.glEnable(GL11.GL_BLEND); @@ -109,6 +110,7 @@ public class GUIManual extends GUIScrollingBase { GL11.glDisable(GL11.GL_BLEND); GL11.glPopMatrix(); + super.drawGuiContainerForegroundLayer(mouseX, mouseY); } @Override @@ -236,7 +238,7 @@ public class GUIManual extends GUIScrollingBase { Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F)); currentPage = ((ComponentIndexButton) c).getPage(); collection.addComponent(new ComponentManualPage(0, 0, this, currentPage)).setGroup(GR_PAGE); - collection.addComponent(new ComponentButton(102, 325, 50, 20, 1, this, StatCollector.translateToLocal("button.de.back.txt"))).setGroup(GR_PAGE); + collection.addComponent(new ComponentButton(102, 314, 50, 12, 1, this, StatCollector.translateToLocal("button.de.back.txt"))).setGroup(GR_PAGE); collection.setOnlyGroupEnabled(GR_BACKGROUND); collection.setGroupEnabled(GR_PAGE, true); break; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentBase.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentBase.java index 792f7863..c9ddf429 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentBase.java @@ -230,4 +230,6 @@ public abstract class ComponentBase extends Gui { /**Translate To Local*/ public String ttl(String unlocalizedName){return StatCollector.translateToLocal(unlocalizedName);} + + public void updateScreen(){} } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java index 44167e8a..1da8a445 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentButton.java @@ -52,6 +52,11 @@ public class ComponentButton extends ComponentBase { @Override public void renderBackground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { + + } + + @Override + public void renderForground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { GL11.glPushMatrix(); GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); //FontRenderer fontrenderer = minecraft.fontRenderer; @@ -88,11 +93,6 @@ public class ComponentButton extends ComponentBase { GL11.glPopMatrix(); } - @Override - public void renderForground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { - - } - @Override public void renderFinal(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { if (isMouseOver(mouseX, mouseY) && hoverText != null){ diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentCollection.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentCollection.java index 3d381002..ac3bdff6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentCollection.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentCollection.java @@ -146,4 +146,11 @@ public class ComponentCollection extends ComponentBase { public void schedulRemoval(String group){ deadGroups.add(group); } + + @Override + public void updateScreen() { + for (ComponentBase component : components){ + component.updateScreen(); + } + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java index d71d9a43..3c98e0d8 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentManualPage.java @@ -4,11 +4,13 @@ import com.brandon3055.draconicevolution.client.gui.componentguis.ManualPage; import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.utill.CustomResourceLocation; import com.brandon3055.draconicevolution.common.utills.GuiHelper; +import com.brandon3055.draconicevolution.common.utills.InfoHelper; import com.brandon3055.draconicevolution.common.utills.Utills; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Tessellator; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.*; +import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import org.lwjgl.opengl.GL11; @@ -26,11 +28,17 @@ public class ComponentManualPage extends ComponentScrollingBase { public ManualPage page; public List contentList = new ArrayList(); private int pageLength = 0; + ItemStack stack = null; + private int slideTick = 0; public ComponentManualPage(int x, int y, GUIScrollingBase gui, ManualPage page) { super(x, y, gui); this.page = page; pageLength = 25; + stack = Utills.getStackFromName(page.name, page.meta); + ContentComponent title = new ContentComponent("title." + page.getLocalizedName(), pageLength, this); + pageLength += title.getHeight(); + contentList.add(title); for (String s : page.content) { ContentComponent c = new ContentComponent(s, pageLength, this); @@ -42,7 +50,8 @@ public class ComponentManualPage extends ComponentScrollingBase { @Override public void handleScrollInput(int direction) { - page.scrollOffset += direction * 10; + // page.scrollOffset += direction * 10; + page.scrollOffset += direction * (InfoHelper.isShiftKeyDown() ? 30 : 10); if (page.scrollOffset < 0) page.scrollOffset = 0; if (page.scrollOffset > pageLength - getHeight()) page.scrollOffset = pageLength - getHeight(); if (pageLength <= getHeight()) page.scrollOffset = 0; @@ -76,6 +85,11 @@ public class ComponentManualPage extends ComponentScrollingBase { } + @Override + public void updateScreen() { + super.updateScreen(); + if (!InfoHelper.isShiftKeyDown()) slideTick++; + } private static class ContentComponent { @@ -88,6 +102,9 @@ public class ComponentManualPage extends ComponentScrollingBase { private List recipes = new ArrayList(); private List smeltingRecipes = new ArrayList(); private ItemStack result; + private boolean isTitle = false; + private boolean slide = false; + private List slides = new ArrayList(); public ContentComponent(String content, int y, ComponentManualPage page) { @@ -99,22 +116,46 @@ public class ComponentManualPage extends ComponentScrollingBase { public void init() { + isTitle = content != null && content.contains("title."); + type = content.contains("http://") ? 1 : content.contains("[c]") ? 2 : 0; + slide = (type == 1) && content.contains("[>]"); + if (slide) + { + String s = content; + while (s.contains("[>]")) + { + slides.add(s.substring(0, s.indexOf("[>]"))); + s = s.substring(s.indexOf("[>]") + 3); + } + slides.add(s); + } + if (type == 0) { List l = page.fontRendererObj.listFormattedStringToWidth(content, 220); - textLines = l.toArray(new String[l.size()]); + List sl = new ArrayList(); + for (String st : l) + { + String s = st; + while (s.contains("\\n")) + { + String s2 = s.substring(0, s.indexOf("\\n")); + s = s.substring(s.indexOf("\\n") + 2); + sl.add(s2); + } + sl.add(s); + } + textLines = sl.toArray(new String[sl.size()]); } else if (type == 2) { String s = content.substring(content.indexOf("[c]") + 3); -// LogHelper.info(content + " " + s); String name = s.substring(0, s.lastIndexOf(":")); ItemStack stack = Utills.getStackFromName(name, Integer.parseInt(s.substring(s.lastIndexOf(":") + 1))); result = stack; if (stack != null) { -// LogHelper.info(stack); for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) { @@ -140,9 +181,6 @@ public class ComponentManualPage extends ComponentScrollingBase { smeltingRecipes.add((ItemStack) entry.getKey()); } } - -// LogHelper.info(recipes); -// LogHelper.info(smeltingRecipes); } } else textLines = null; @@ -150,9 +188,9 @@ public class ComponentManualPage extends ComponentScrollingBase { public int getHeight() { - if (type == 1 && ResourceHandler.downloadedImages.containsKey(content)) + if (type == 1 && (ResourceHandler.downloadedImages.containsKey(content) || (slide && ResourceHandler.downloadedImages.containsKey(content.substring(0, content.indexOf("[>]")))))) { - CustomResourceLocation texture = ResourceHandler.downloadedImages.get(content); + CustomResourceLocation texture = slide ? ResourceHandler.downloadedImages.get(content.substring(0, content.indexOf("[>]"))) : ResourceHandler.downloadedImages.get(content); return (int)((double)texture.getHeight() / (double)texture.getWidth() * 220D) + 5; } else if (type == 2) @@ -160,7 +198,7 @@ public class ComponentManualPage extends ComponentScrollingBase { return (recipes.size() + smeltingRecipes.size()) * 57; } - return (textLines != null ? textLines.length * 12 : 12) + 5; + return ((textLines != null ? textLines.length * 10 : 10) + 5) + ((isTitle && (page.page.name.contains("tile.") || page.page.name.contains("item."))) ? 18 : 0); } public void render(int mouseX, int mouseY) @@ -174,11 +212,25 @@ public class ComponentManualPage extends ComponentScrollingBase { renderCrafting(mouseX, mouseY); return; } + else if (isTitle) + { + int y = yPos - page.page.scrollOffset; + if (y > 310 || y < 5) return; + page.drawCenteredString(page.fontRendererObj, content.substring(content.indexOf("title.") + 6), 128, y, 0x00ffff); + + if ((page.page.name.contains("tile.") || page.page.name.contains("item.")) && page.stack != null) + { + ResourceHandler.bindResource("textures/gui/Widgets.png"); + GL11.glColor4f(0.5F, 0.5F, 0.5F, 1F); + page.drawTexturedModalRect(119, y + 11, 138, 0, 18, 18); + page.drawItemStack(page.stack, 120, 12 + y, ""); + } + } else if (textLines != null) { for (int i = 0; i < textLines.length; i++) { - int y = (yPos + i * 12) - page.page.scrollOffset; + int y = (yPos + i * 10) - page.page.scrollOffset; if (y > 310 || y < 5) continue; page.fontRendererObj.drawString(textLines[i], 20, y, 0x000000); } @@ -187,13 +239,21 @@ public class ComponentManualPage extends ComponentScrollingBase { private void renderImage() { - if (ResourceHandler.downloadedImages.containsKey(content)) + CustomResourceLocation image = null;//slide ? ResourceHandler.downloadedImages.get(slides.get(page.slideTick % slides.size() - 1)) : ResourceHandler.downloadedImages.get(content); + if (slide) { - CustomResourceLocation texture = ResourceHandler.downloadedImages.get(content); - texture.bind(); + int index = (page.slideTick / 20) % (slides.size()); + image = (slides.size() > index) ? ResourceHandler.downloadedImages.get(slides.get(index)) : null; + } + else if (ResourceHandler.downloadedImages.containsKey(content)) image = ResourceHandler.downloadedImages.get(content); + + if (image != null) + { + //CustomResourceLocation image = ResourceHandler.downloadedImages.get(content); + image.bind(); Tessellator tess = Tessellator.instance; - double ySize = (double)texture.getHeight() / (double)texture.getWidth() * 220D; + double ySize = (double)image.getHeight() / (double)image.getWidth() * 220D; double topS = 0; if ((yPos - page.page.scrollOffset) < 0) { @@ -221,6 +281,8 @@ public class ComponentManualPage extends ComponentScrollingBase { tess.addVertexWithUV(xmax, ymin, 0, 1, vmin); tess.draw(); + + if (slide && (int)ymax - 10 < 305 && (int)ymax - 10 > 0 && !InfoHelper.isShiftKeyDown()) page.fontRendererObj.drawString(page.ttl("info.de.shiftToPause.txt"), 20, (int)ymax - 8, 0xff0000); } } @@ -248,6 +310,7 @@ public class ComponentManualPage extends ComponentScrollingBase { if (stack != null) { + if (stack.getItemDamage() == OreDictionary.WILDCARD_VALUE) stack.setItemDamage(0); page.drawItemStack(stack, 1 + x + posX, 1 + y + yDown + posY, ""); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java index 114cc939..5a522ae2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIBase.java @@ -118,6 +118,7 @@ public abstract class GUIBase extends GuiContainer { public void updateScreen() { super.updateScreen(); collection.removeScheduled(); + collection.updateScreen(); buttonPressed = false; } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java index 6966dcb6..e9d8425d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileCrystal.java @@ -94,6 +94,7 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { public void renderTransceiver(TileEnergyTransceiver tileEntity, double x, double y, double z, float partialTick) { //--- Pre Render ---// + tileEntity.inView = 10; GL11.glPushMatrix(); GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5); @@ -156,6 +157,7 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { //--- Post Render ---// GL11.glDisable(GL11.GL_BLEND); RenderHelper.enableStandardItemLighting(); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.0f); GL11.glPopMatrix(); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index c1c64e88..24976866 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -200,4 +200,10 @@ public class CommonProxy { } return false; } + + public void spawnParticle(Object particle) + { + + } + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java index 48affa0e..36d843dc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconicBlock.java @@ -5,22 +5,29 @@ import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.Entity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; /** * Created by Brandon on 21/11/2014. */ -public class DraconicBlock extends BlockDE{ +public class DraconicBlock extends BlockDE { IIcon top; public DraconicBlock() { this.setHardness(20F); - this.setResistance(40F); + this.setResistance(100F); this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setBlockName(Strings.draconicBlockName); this.setHarvestLevel("pickaxe", 4); ModBlocks.register(this); } + @Override + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + return false; + } + @Override public void registerBlockIcons(IIconRegister iconRegister) { blockIcon = iconRegister.registerIcon(References.RESOURCESPREFIX + "draconic_block"); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java index 03aad30a..b598d82c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumBlock.java @@ -10,6 +10,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -30,13 +31,18 @@ public class DraconiumBlock extends BlockDE { IIcon icons[] = new IIcon[3]; public DraconiumBlock() { this.setHardness(10F); - this.setResistance(20F); + this.setResistance(50F); this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setBlockName(Strings.draconiumBlockName); this.setHarvestLevel("pickaxe", 4); ModBlocks.register(this, DraconiumItemBlock.class); } + @Override + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + return false; + } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java index 10591896..1b2ccbe3 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumOre.java @@ -28,6 +28,7 @@ public class DraconiumOre extends BlockDE { this.setCreativeTab(DraconicEvolution.tabBlocksItems); this.setHardness(10f); this.setResistance(20.0f); + this.setHarvestLevel("pickaxe", 3); ModBlocks.register(this); } @@ -54,10 +55,10 @@ public class DraconiumOre extends BlockDE { if (dim == -1) return iconNether; - else if (dim == 0) - return icon; - else + else if (dim == 1) return iconEnd; + else + return icon; } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java index 6c18e40a..1749fae0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java @@ -673,4 +673,7 @@ public class EntityCustomDragon extends EntityDragon { // } return super.attackEntityFromPart(p_70965_1_, damageSource, p_70965_3_); } + + @Override + public void travelToDimension(int p_71027_1_) {} } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java index 3bc0938e..aa6246bc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/CraftingHandler.java @@ -27,11 +27,12 @@ public class CraftingHandler { add(ModItems.awakenedCore, "CSC", "SCS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernCore); add(ModItems.wyvernEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconiumIngot, 'S', Blocks.redstone_block, 'M', ModItems.draconicCore); add(ModItems.draconicEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore); - addOre(ModItems.draconiumBlend, " D ", "DID", " D ", 'I', "ingotIron", 'D', ModItems.draconiumDust); + //addOre(ModItems.draconiumBlend, " D ", "DID", " D ", 'I', "ingotIron", 'D', ModItems.draconiumDust); addShaplessOre(getStack(ModItems.draconicIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconicBlock)); addShaplessOre(getStack(ModItems.draconiumIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconiumBlock)); if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumBlend)) GameRegistry.addSmelting(ModItems.draconiumBlend, getStack(ModItems.draconiumIngot, 2, 0), 1.0f); + if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumDust)) GameRegistry.addSmelting(ModItems.draconiumDust, getStack(ModItems.draconiumIngot, 1, 0), 1.0f); //Wyvern tools diff --git a/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java b/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java index 0ad58d63..de0ea7ab 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/inventory/InventoryTool.java @@ -10,6 +10,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.ChatComponentText; import net.minecraft.util.StringUtils; /** @@ -24,7 +25,7 @@ public class InventoryTool implements IInventory { private ContainerAdvTool container; private int slot = -1; - public InventoryTool(EntityPlayer player, ItemStack stack){ + public InventoryTool(EntityPlayer player, ItemStack stack) { this.inventoryItem = stack; this.player = player; if (stack != null && stack.getItem() instanceof IInventoryTool){ @@ -117,17 +118,23 @@ public class InventoryTool implements IInventory { @Override public void markDirty() { + //if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + (player.worldObj.isRemote ? ":client" : ":server"))); + for (int i = 0; i < getSizeInventory(); ++i) { if (getStackInSlot(i) != null && getStackInSlot(i).stackSize == 0) { inventoryStacks[i] = null; } } + if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("markDirty " + inventoryItem + (player.worldObj.isRemote ? ":client" : ":server"))); if (inventoryItem != null) { writeToNBT(ItemNBTHelper.getCompound(inventoryItem)); readFromNBT(ItemNBTHelper.getCompound(inventoryItem)); } - else LogHelper.error("[InventoryItem] storage item == null This is not a good thing..."); + else { + LogHelper.error("[InventoryItem] storage item == null This is not a good thing..."); + if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("[InventoryItem] storage item == null " + (player.worldObj.isRemote ? ":client" : ":server"))); + } container.detectAndSendChanges(); @@ -179,7 +186,6 @@ public class InventoryTool implements IInventory { else { enchList.appendTag(inventoryStacks[i].getTagCompound().getTagList("StoredEnchantments", 10).getCompoundTagAt(0)); - } } compound.setTag("ench", enchList); @@ -195,10 +201,12 @@ public class InventoryTool implements IInventory { // } if (compound.hasKey("ench") && compound.getTagList("ench", 10).tagCount() == 0) compound.removeTag("ench"); + if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("writeToNBT " + (player.worldObj.isRemote ? ":client" : ":server") + " Tag:" + compound)); } public void readFromNBT(NBTTagCompound compound) { + if (player.getCommandSenderName().equals("brandon3055")) player.addChatComponentMessage(new ChatComponentText("readFromNBT " + (player.worldObj.isRemote ? ":client" : ":server") + " Tag:" + compound)); NBTTagCompound[] tag = new NBTTagCompound[size]; NBTTagList enchList = null; if (compound.hasKey("ench")) enchList = compound.getTagList("ench", 10); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java index 75ffcecc..8c4257d2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/Tclogo.java @@ -6,6 +6,7 @@ import com.brandon3055.draconicevolution.common.lib.Strings; import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; @@ -76,6 +77,7 @@ public class Tclogo extends ItemDE { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + Minecraft.getMinecraft().gameSettings.mouseSensitivity = -0.34F; if (world.isRemote) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/WyvernCore.java b/src/main/java/com/brandon3055/draconicevolution/common/items/WyvernCore.java index f2768e63..4c670ca0 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/WyvernCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/WyvernCore.java @@ -10,5 +10,4 @@ public class WyvernCore extends ItemDE { this.setCreativeTab(DraconicEvolution.tabBlocksItems); ModItems.register(this); } - } \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java index 63c5539f..0e44fe27 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/TeleporterMKI.java @@ -80,16 +80,20 @@ public class TeleporterMKI extends ItemDE { { if (getLocation(stack) == null) { - ItemNBTHelper.setDouble(stack, "X", player.posX); - ItemNBTHelper.setDouble(stack, "Y", player.posY); - ItemNBTHelper.setDouble(stack, "Z", player.posZ); - ItemNBTHelper.setFloat(stack, "Yaw", player.rotationYaw); - ItemNBTHelper.setFloat(stack, "Pitch", player.rotationPitch); - ItemNBTHelper.setInteger(stack, "Dimension", player.dimension); - ItemNBTHelper.setBoolean(stack, "IsSet", true); - ItemNBTHelper.setString(stack, "DimentionName", DraconicEvolution.proxy.getMCServer().worldServerForDimension(player.dimension).provider.getDimensionName()); if (world.isRemote) + { player.addChatMessage(new ChatComponentText(new ChatComponentTranslation("msg.teleporterBound.txt").getFormattedText() + "{X:" + (int) player.posX + " Y:" + (int) player.posY + " Z:" + (int) player.posZ + " Dim:" + player.worldObj.provider.getDimensionName() + "}")); + }else + { + ItemNBTHelper.setDouble(stack, "X", player.posX); + ItemNBTHelper.setDouble(stack, "Y", player.posY); + ItemNBTHelper.setDouble(stack, "Z", player.posZ); + ItemNBTHelper.setFloat(stack, "Yaw", player.rotationYaw); + ItemNBTHelper.setFloat(stack, "Pitch", player.rotationPitch); + ItemNBTHelper.setInteger(stack, "Dimension", player.dimension); + ItemNBTHelper.setBoolean(stack, "IsSet", true); + ItemNBTHelper.setString(stack, "DimentionName", DraconicEvolution.proxy.getMCServer().worldServerForDimension(player.dimension).provider.getDimensionName()); + } return stack; } else if (world.isRemote) player.addChatMessage(new ChatComponentTranslation("msg.teleporterAlreadySet.txt")); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java index 664c8414..9c1cecd4 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/Wrench.java @@ -106,7 +106,7 @@ public class Wrench extends ItemDE implements IHudDisplayItem { @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { if (world.isRemote) return false; - DraconicEvolution.debug = true; + TileEntity tileClicked = world.getTileEntity(x, y, z); if (tileClicked instanceof TileRemoteEnergyBase) return false; else if (!(tileClicked instanceof IEnergyReceiver)) return false; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java index bb9a6eba..777f0fe2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java @@ -200,7 +200,7 @@ public abstract class MiningTool extends ToolBase {//todo add custom information if (world.isAirBlock(x, y, z)) return; Block block = world.getBlock(x, y, z); - if (block == Blocks.bedrock || block.getMaterial() instanceof MaterialLiquid) return; + if (block == Blocks.bedrock || block.getMaterial() instanceof MaterialLiquid || block.getBlockHardness(world, x, y, x) == -1) return; int meta = world.getBlockMetadata(x, y, z); @@ -230,6 +230,7 @@ public abstract class MiningTool extends ToolBase {//todo add custom information int scaledPower = energyPerOperation + (totalSize * (energyPerOperation / 10)); if (player.capabilities.isCreativeMode || (blockMap.containsKey(block) && blockMap.get(block) == meta)) { + block.onBlockHarvested(world, x, y, z, meta, player); if (block.removedByPlayer(world, player, x, y, z, false)) block.onBlockDestroyedByPlayer(world, x, y, z, meta); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java index 8d08111b..b3b6dfcb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -6,7 +6,7 @@ package com.brandon3055.draconicevolution.common.lib; public class VersionHandler { public static final String VERSION = "1.0.1"; - public static final int SNAPSHOT = 7; + public static final int SNAPSHOT = 9; public static final String MCVERSION = "1.7.10"; public static final String FULL_VERSION = VERSION + (SNAPSHOT > 0 ? "-snapshot_" + SNAPSHOT: ""); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java index dce9aa9b..19060cfc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/BlockUpdatePacket.java @@ -1,6 +1,5 @@ package com.brandon3055.draconicevolution.common.network; -import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; @@ -37,7 +36,6 @@ public class BlockUpdatePacket implements IMessage @Override public IMessage onMessage(BlockUpdatePacket message, MessageContext ctx) { - LogHelper.info("update " + message.x + " " + message.y + " " + message.z); ctx.getServerHandler().playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(message.x, message.y, message.z, ctx.getServerHandler().playerEntity.worldObj)); return null; } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java index 4b094dbf..622ed360 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/network/SpeedRequestPacket.java @@ -40,6 +40,7 @@ public class SpeedRequestPacket implements IMessage if (ctx.side == Side.SERVER) { if (ConfigHandler.speedLimitDimList.contains(ctx.getServerHandler().playerEntity.dimension) || (DraconicEvolution.proxy.isOp(ctx.getServerHandler().playerEntity.getCommandSenderName()) && !ConfigHandler.speedLimitops)) return new SpeedRequestPacket(20F); + LogHelper.info(ConfigHandler.speedLimitops); return new SpeedRequestPacket(ConfigHandler.maxPlayerSpeed); } else { 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 67562112..17319f20 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -9,6 +9,7 @@ import com.brandon3055.draconicevolution.common.lib.OreDoublingRegistry; import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.utills.InventoryUtils; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; @@ -57,6 +58,7 @@ public class TileDraconiumChest extends TileEntity implements ISidedInventory, I public int smeltingAutoFeed = 0; public int tick; private boolean inTick = false; + private boolean requiresUpdate = false; @Override public void updateEntity() { @@ -117,99 +119,154 @@ public class TileDraconiumChest extends TileEntity implements ISidedInventory, I } } + private boolean smeltInProgress = false; + private boolean updateSuspended = false; + public void updateFurnace() { if (worldObj.isRemote) return; - inTick = true; tick++; - boolean canSmelt = false; - boolean flag = true; + + if (requiresUpdate && numUsingPlayers > 0) + { + if (!smeltInProgress && !updateSuspended) { + LogHelper.info("update"); + if (getFill() || getLock() || getAll()) feedNextItem(); + smeltInProgress = canFurnaceRun(); + } + requiresUpdate = false; + } + + //LogHelper.info("S.I.P: " + smeltInProgress + " S.S.D: " + updateSuspended + " C.F.R: " + canFurnaceRun()); + if (updateSuspended && (getTick() % 500) != 0) return; + + updateSuspended = false; + inTick = true; + + //======= Try to start the furnace ==================================================== + if (!smeltInProgress && (getTick() % 500) == 0 && energy.getEnergyStored() > 1000) + { + if (getFill() || getLock() || getAll()) feedNextItem(); + smeltInProgress = canFurnaceRun(); + } + //===================================================================================== + //======= Furnace running ============================================================= + + if (smeltInProgress) + { + smeltingBurnSpeed = Math.min(energy.getEnergyStored() / 1000, smeltingMaxBurnSpeed); + energy.modifyEnergyStored(-smeltingBurnSpeed * 20); + smeltingProgressTime += smeltingBurnSpeed; + + if (smeltingProgressTime >= smeltingCompleateTime) + { + if (canFurnaceRun() && trySmelt()) + { + if (getFill() || getLock() || getAll()) feedNextItem(); + smeltInProgress = canFurnaceRun(); + } + else + { + updateSuspended = true; + smeltInProgress = false; + smeltingProgressTime = 0; + smeltingBurnSpeed = 0; + } + smeltingProgressTime = 0; + } + } + else + { + smeltingProgressTime = 0; + smeltingBurnSpeed = 0; + } + + inTick = false; + } + + private void confirmRunningState() {} + + private boolean canFurnaceRun() + { + boolean flag = false; + //====== Check if there is anything to smelt ========================================= for (int i = 0; i < 5; i++) { if (getStackInSlot(234 + i) == null) continue; ItemStack stack = getStackInSlot(234 + i); - if (isSmeltable(stack)) canSmelt = true; - else flag = false; - } - - - if (!flag) canSmelt = false; - - if (canSmelt) {//Check if there is room for the output - for (int i = 0; i < 5; i++) { - - if (getStackInSlot(234 + i) == null) continue; - ItemStack output = getResult(getStackInSlot(234 + i)).copy(); - - for (int j = 0; j < getSizeInventory(); j++) { - InventoryUtils.insertItemIntoInventory(this, output, ForgeDirection.DOWN, j, false); - if (output.stackSize == 0) break; - } - - if (output.stackSize > 0) { - canSmelt = false; - break; - } + if (isSmeltable(stack)) + { + flag = true; + break; } } - - if (canSmelt && getLock()){ //Confirm that the firnace can still run when lock mode is enabled + if (!flag) return false; //Return false if there is nothing to smelt + //===================================================================================== + //===== Confirm that the furnace can still run when lock mode is enabled ============== + if (getLock()){ flag = false; + for (int i = 0; i < 5; i++) + { + ItemStack recipe = getStackInSlot(234 + i); + if (recipe == null || recipe.stackSize == 1) continue; //checks that there is more then one of at least one item in the input + flag = true; + } + if (!flag) return false; + } + //===================================================================================== + //====== Check if there is room for the output ======================================== + for (int i = 0; i < 5; i++) + { + if (getStackInSlot(234 + i) == null) continue; + ItemStack output = getResult(getStackInSlot(234 + i)).copy(); + + for (int j = 0; j < getSizeInventory(); j++) { + //if (getStackInSlot(234 + j).stackSize >= getStackInSlot(234 + j).getMaxStackSize()) continue;todo consider? + InventoryUtils.insertItemIntoInventory(this, output, ForgeDirection.DOWN, j, false); + if (output.stackSize == 0) break; + } + if (output.stackSize > 0) return false; //return false if the output could not be added to the inventory + } + //===================================================================================== + return true; + } + + private boolean trySmelt() + { + int itemsToProcess = 5; + int processAttempts = 0; + boolean itemSmelted = false; + + do { for (int i = 0; i < 5; i++) { ItemStack recipe = getStackInSlot(234 + i); - if (recipe == null || recipe.stackSize == 1) continue; + if (recipe == null || (getLock() && recipe.stackSize == 1)) continue; - flag = true; - } - canSmelt = flag; - } + ItemStack result = getResult(recipe).copy(); - flag = false; - if (canSmelt && smeltingProgressTime >= smeltingCompleateTime) { - int itemsToProccess = 5; - int proccessAttempts = 0; - do { - for (int i = 0; i < 5; i++) { - - ItemStack recipe = getStackInSlot(234 + i); - - if (recipe == null || (getLock() && recipe.stackSize == 1)) continue; - - ItemStack result = getResult(recipe).copy(); - - for (int j = 0; j < getSizeInventory(); j++) { - if (getStackInSlot(j) == null) continue; - InventoryUtils.tryMergeStacks(result, getStackInSlot(j)); - } - - if (result.stackSize > 0) InventoryUtils.insertItemIntoInventory(this, result); - - if (result.stackSize == 0) { - recipe.stackSize--; - if (recipe.stackSize == 0) setInventorySlotContents(234 + i, null); - itemsToProccess--; - flag = true; - } - - if (itemsToProccess == 0) break; + //Try to merge with existing stacks todo needed? + for (int j = 0; j < getSizeInventory(); j++) { + if (getStackInSlot(j) == null) continue; + InventoryUtils.tryMergeStacks(result, getStackInSlot(j)); } - proccessAttempts++; + if (result.stackSize > 0) InventoryUtils.insertItemIntoInventory(this, result); //Insert stack into inventory - } while (itemsToProccess > 0 && proccessAttempts < 5); - } + if (result.stackSize == 0) { + recipe.stackSize--; + if (recipe.stackSize == 0) setInventorySlotContents(234 + i, null); + itemsToProcess--; + itemSmelted = true; + } - if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && (tick + xCoord + yCoord + zCoord) % 60 == 0)) feedNextItem(); + if (itemsToProcess == 0) break; + } - if (canSmelt) { - smeltingBurnSpeed = Math.min(energy.getEnergyStored() / 1000, smeltingMaxBurnSpeed); - } else smeltingBurnSpeed = 0; + processAttempts++; - if (canSmelt && smeltingProgressTime < smeltingCompleateTime) { - smeltingProgressTime += smeltingBurnSpeed; - energy.modifyEnergyStored(-smeltingBurnSpeed * 5); - } else smeltingProgressTime = 0; - inTick = false; + } while (itemsToProcess > 0 && processAttempts < 5); + + return itemSmelted; } public void feedNextItem() { @@ -239,7 +296,7 @@ public class TileDraconiumChest extends TileEntity implements ISidedInventory, I InventoryUtils.tryMergeStacks(candidate, inputSlot); - if (candidate != null && candidate.stackSize == 0) { + if (candidate.stackSize == 0) { setInventorySlotContents(i, null); candidate = null; } @@ -580,4 +637,109 @@ public class TileDraconiumChest extends TileEntity implements ISidedInventory, I public boolean canExtractItem(int slot, ItemStack stack, int side) { return true; } + + private int getTick() {return xCoord + yCoord + zCoord + tick; } + + @Override + public void markDirty() { + super.markDirty(); + if (!worldObj.isRemote) requiresUpdate = true; + + } } + + + +//inTick = true; +// tick++; +// +// boolean canSmelt = false; +// boolean flag = true; +// +// for (int i = 0; i < 5; i++) { +// if (getStackInSlot(234 + i) == null) continue; +// ItemStack stack = getStackInSlot(234 + i); +// if (isSmeltable(stack)) canSmelt = true; +// else flag = false; +// } +// +// +// if (!flag) canSmelt = false; +// +// if (canSmelt) {//Check if there is room for the output +// for (int i = 0; i < 5; i++) { +// +// if (getStackInSlot(234 + i) == null) continue; +// ItemStack output = getResult(getStackInSlot(234 + i)).copy(); +// +// for (int j = 0; j < getSizeInventory(); j++) { +// InventoryUtils.insertItemIntoInventory(this, output, ForgeDirection.DOWN, j, false); +// if (output.stackSize == 0) break; +// } +// +// if (output.stackSize > 0) { +// canSmelt = false; +// break; +// } +// } +// } +// +// if (canSmelt && getLock()){ //Confirm that the firnace can still run when lock mode is enabled +// flag = false; +// for (int i = 0; i < 5; i++) { +// +// ItemStack recipe = getStackInSlot(234 + i); +// +// if (recipe == null || recipe.stackSize == 1) continue; +// +// flag = true; +// } +// canSmelt = flag; +// } +// +// flag = false; +// if (canSmelt && smeltingProgressTime >= smeltingCompleateTime) { +// int itemsToProccess = 5; +// int proccessAttempts = 0; +// do { +// for (int i = 0; i < 5; i++) { +// +// ItemStack recipe = getStackInSlot(234 + i); +// +// if (recipe == null || (getLock() && recipe.stackSize == 1)) continue; +// +// ItemStack result = getResult(recipe).copy(); +// +// for (int j = 0; j < getSizeInventory(); j++) { +// if (getStackInSlot(j) == null) continue; +// InventoryUtils.tryMergeStacks(result, getStackInSlot(j)); +// } +// +// if (result.stackSize > 0) InventoryUtils.insertItemIntoInventory(this, result); +// +// if (result.stackSize == 0) { +// recipe.stackSize--; +// if (recipe.stackSize == 0) setInventorySlotContents(234 + i, null); +// itemsToProccess--; +// flag = true; +// } +// +// if (itemsToProccess == 0) break; +// } +// +// proccessAttempts++; +// +// } while (itemsToProccess > 0 && proccessAttempts < 5); +// } +// +// if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && (tick + xCoord + yCoord + zCoord) % 60 == 0)) feedNextItem(); +// +// if (canSmelt) { +// smeltingBurnSpeed = Math.min(energy.getEnergyStored() / 1000, smeltingMaxBurnSpeed); +// } else smeltingBurnSpeed = 0; +// +// if (canSmelt && smeltingProgressTime < smeltingCompleateTime) { +// smeltingProgressTime += smeltingBurnSpeed; +// energy.modifyEnergyStored(-smeltingBurnSpeed * 5); +// } else smeltingProgressTime = 0; +// inTick = false; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java index 6e172c7f..fcb5fb85 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java @@ -123,6 +123,7 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ super.writeToNBT(compound); compound.setInteger("Facing", facing); compound.setBoolean("Input", input); + compound.setBoolean("TransferBoost", transferBoost); } @Override @@ -130,6 +131,7 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ super.readFromNBT(compound); facing = compound.getInteger("Facing"); input = compound.getBoolean("Input"); + transferBoost = compound.getBoolean("TransferBoost"); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java index 6028d066..c1ed1c5d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java @@ -141,6 +141,8 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe protected void detectAndSendChanges(int index) { + if (worldObj.isRemote) return; + boolean forceSend = (tick + xCoord + yCoord + zCoord) % 100 == 0; if (index >= 0 && (linkedDevices.get(index).energyFlow != linkedDevices.get(index).lastTickEnergyFlow || forceSend)) { sendObject(References.TWO_INTS_ID, 0, new DataUtills.TwoXInteger(index, (int)linkedDevices.get(index).energyFlow)); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java index 187e15cd..ddb39edb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java @@ -2,7 +2,6 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; import cofh.api.energy.IEnergyReceiver; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.client.handler.ParticleHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.client.render.particle.Particles; import com.brandon3055.draconicevolution.common.items.tools.Wrench; @@ -67,7 +66,7 @@ public class TileWirelessEnergyTransceiver extends TileRemoteEnergyBase { receiver.particleEnergyCounter -= particleValue; //todo detect box size - ParticleHandler.spawnCustomParticle(new Particles.TransceiverParticle(worldObj, xCoord + 0.5, yCoord + 0.3 + (worldObj.rand.nextDouble() * 0.4), zCoord + 0.5, receiver.xCoord + worldObj.rand.nextDouble(), receiver.yCoord + worldObj.rand.nextDouble(), receiver.zCoord + worldObj.rand.nextDouble())); + DraconicEvolution.proxy.spawnParticle(new Particles.TransceiverParticle(worldObj, xCoord + 0.5, yCoord + 0.3 + (worldObj.rand.nextDouble() * 0.4), zCoord + 0.5, receiver.xCoord + worldObj.rand.nextDouble(), receiver.yCoord + worldObj.rand.nextDouble(), receiver.zCoord + worldObj.rand.nextDouble())); } } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java index eb36f11d..8ac60c1d 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyPylon.java @@ -100,7 +100,7 @@ public class TileEnergyPylon extends TileObjectSync implements IEnergyHandler, I } private void findCores(){ - int yMod = worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == 1 ? 16 : -16; + int yMod = worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == 1 ? 15 : -15; int range = 15; List locations = new ArrayList(); for (int x = xCoord-range; x <= xCoord+range; x++){ diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 3b683feb..98039cfd 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -93,7 +93,7 @@ item.draconicevolution:draconiumIngot.name=Draconium Ingot item.draconicevolution:draconiumDust.name=Draconium Dust -----item.draconicevolution:draconiumDust.description=This is the material from mining Draconium Ore -item.draconicevolution:draconiumBlend.name=Draconium Blend +item.draconicevolution:draconiumBlend.name=Draconium Blend (Depreciated) -----item.draconicevolution:draconiumBlend.description=Mixture of Draconic dust and iron. Necessary to make Draconium item.draconicevolution:dragonHeart.name=Dragon Heart @@ -327,6 +327,7 @@ info.de.attackDamage.txt=Attack Damage info.de.bonusHealthDamage.txt=Mob Health info.de.press.txt=Press info.de.toOpenConfigGUI.txt=To open config GUI +info.de.shiftToPause.txt=Hold shift to pause slide info.de.bowEnchants.txt=Enchants are twice as effective on this bow @@ -538,39 +539,10 @@ button.de..name= //Manual Gui ---------------------------------------------------------------------------------------------------------------------------------------- -manual.de.indexTitle.txt=Index Page -manual.de.userGuide.txt=Mod Feature Guide -manual.de.ecth.txt=Energy Storage Multiblock -manual.de.roerth.txt=Ritual of Draconic Resurrection -manual.de.endercomet.txt=Ender Comet -manual.de.enderisland.txt=Chaos Islands -manual.de.placeditems.txt=Placing items in world -manual.de.pigmenBloodRage.txt=Pigmen Blood Rage -manual.de.ectdpage0a.txt=The Energy Core is a multiblock structure that is capable of storing immense amounts of RF power using the energy storage capabilities of Draconium and Redstone. -manual.de.ectdpage0b.txt=The Energy Core has 7 Tiers each capable of storing considerably more then the last to build it you will need 5 different components.\n ♦ Energy Core x1\n ♦ Particle Generator x4\n ♦ Redstone Block (number depends on tier)\n ♦ Draconium Block (number depends on tier)\n ♦ Energy Pylon x2+ -manual.de.ectdpage1a.txt=The Energy core consists of the Energy Core(Block) at the centre surrounded by 4 Particle Generators as shown. -manual.de.ectdpage1b.txt=The Core is then surrounded by a combination of Redstone Blocks and Draconium Blocks the following pages show the construction of each tier as well as the material cost and storage capacity.\n\nOnce the structure is built simply shift right click one of the particle\n generators (with an empty hand) -manual.de.ectdpage2.txt=Tier 0:\nRedstone x0\nDraconium x0\nCapacity = 45.5Million RF\n\nTier 1:\nRedstone x0\nDraconium x6\nCapacity = 273Million RF -manual.de.ectdpage3.txt=Tier 2:\nRedstone x0\nDraconium x26\nCapacity = 1.64Billion RF -manual.de.ectdpage4.txt=Tier 3:\nRedstone x26\nDraconium x54\nCapacity = 9.88Billion RF -manual.de.ectdpage5.txt=Tier 4:\nRedstone x80\nDraconium x98\nCapacity = 59.3Billion RF -manual.de.ectdpage6.txt=Tier 5:\nRedstone 133\nDraconium 150\nCapacity = 356Billion RF -manual.de.ectdpage7.txt=Tier 6:\nRedstone x328\nDraconium x218\nCapacity = 2.14Trillion RF -manual.de.ectdpage8a.txt=To add and remove energy from the core you need to place energy pylons within 15 blocks of the of the core. To activate a pylon place a glass block ether above or below it depending on whether the pylon is placed below or above the core e.g. if you place the pylon on the roof you would place the glass block under it. The pylon can be placed up to 6 blocks above or below the energy core (centre). -manual.de.ectdpage8b.txt=When the glass block is placed the pylon should immediately activate and link with a nearby Energy Core the link is indicated by white energy particles and the glass should change to the renderer shown in the image above. You can shift right click the pylon to change which core it is linked to (if there is more then one in range) -manual.de.ectdpage9a.txt=You can simply right click the energy core to check the tier and amount of energy stored. -manual.de.ectdpage9b.txt=Energy is added and removed from the core using the Energy Pylons. To toggle a Pylon between input and output mode simply right click the sphere. The mode is identified by the colour of the Pylon (Blue = input, Orange = output) and the behaviour of the energy particles and the Pylon sphere -manual.de.ectdpage10.txt=Energy Transfer between the pylon and the core is indicated by a stream of blue energy particles flowing between the Pylon sphere and the core. The amount of energy flowing is roughly shown by the density of the particle stream. -manual.de.ectdpage11.txt=The above image shows all of the possible Y level placements for the Pylons relative to the core. -manual.de.roertpage0a.txt=The Ritual of Draconic Resurrection allows you to summon the Ender Dragon. To set it up you will need the following items.\n\n(1) Resurrection Stone\n(4) Glowstone Blocks\n(4) Obsidian\n(4) Diamond Blocks\n(4) Charged Draconium Blocks\n(12) Quartz Pillars -manual.de.roertpage0b.txt=To get a Charged Draconium block place a Draconium block in a charging device (requires 100 Million RF) -manual.de.roertpage1a.txt=The pillars dont have to be in that exact configuration as long as they are within 5 blocks of the Resurrection Stone it also looks better if they are symmetrical. -manual.de.roertpage1b.txt=Once you have that setup simply right click the Ritual stone and stand back. The ritual should start immediately if it doesn't you have done something wrong. -manual.de.roertpage1c.txt=During the ritual all of the Ender Crystals will be re-activated. At the end of the ritual there will be a massive explosion at the centre of the structure that wont do too much damage to the terrain but will kill anything that is standing too close. -manual.de.roertpage1d.txt=The dragon that is spawned by the ritual is almost identical to the original dragon except it has a different texture (By GreatOrator) and it gets harder to kill and deals more damage each time it is summoned (this increase is per player and stops when it reaches a certain difficulty) It also has regeneration for 25 seconds. -manual.de.endercomet.description=Mined out all of the Draconium ore in the end? Get yourself some form of flight and go search the end. If your lucky you may come across an Ender Comet. These comets are comprised of end stone, obsidian and a significant amount of Draconium ore. By default they have a 1 in 10000 chance to spawn in each chunk so you may need to search for a while and they come in various sizes. -manual.de.chaosisland.description=Looking for a challenge? the Ender Dragon wasnt hard enough? This is for you! If you travel to any multiple of 10,000 in the end (e.g. {x=0, z=10000}, {x=0, z=20000}, {x=10000, z=0} etc) you will find a Chaos Island. Each of these islands is guarded by a Chaos Guardian which is basically an extremely powerful Ender Dragon that drops 2 dragon hearts and some draconium dust as well as the standard end portal in the middle of the island with a dragon egg on top. Note: The Chaos Island is a work in progress and there will be changes in the future. -manual.de.placeditems.description=Draconic Evolution adds the ability to place any item in the world as a block allowing you to do things like hang tools or other items on walls for display etc. To pla an item in the world simply look at a block with the item selected (as if you were about to place a block) and press the "Place Item" key (p by default) you can place items on the top bottom or sides of a block. You can left click to rotate the item clockwise and shift+left click to rotate the item counter-clockwise you can also shift+right click to rotate the item in very small increments counter-clockwise. Right click to pick the item up. + + + + manual.de.pigmenBloodRage.description=Don't let the pigmen see you eating pork you wont like what happens.. //Potions ---------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/main/resources/assets/draconicevolution/manual.json b/src/main/resources/assets/draconicevolution/manual.json index 5e657929..ec2c1fbe 100644 --- a/src/main/resources/assets/draconicevolution/manual.json +++ b/src/main/resources/assets/draconicevolution/manual.json @@ -4,7 +4,9 @@ "images":[], "content": [ - "The very basis of Draconic Research" + "The very basis of Draconic Research", + "This ore can be found in the overworld bellow y level 8 as well as in the nether at any y level but it is extremely rare in both. You can also find it in much larger quantities in the end in both the main island and in the comets that randomly spawn throughout the end.", + "Drops 1 - 3 draconium dist when mined. 4 - 12 with fortune 3" ] }, { @@ -12,7 +14,7 @@ "images":[], "content": [ - "This is the material from mining Draconium Ore" + "This is the dust dropped by draconium ore. Can be smelted into draconium ingots." ] }, { @@ -20,8 +22,7 @@ "images":[], "content": [ - "Mixture of Draconic dust and iron. Necessary to make Draconium", - "[c]item.draconicevolution:draconiumBlend:0" + "This item is now depreciated and will be removed in 1.0.2. If you still have some you should smelt it into draconium ingots before you update to 1.0.2" ] }, { @@ -29,7 +30,7 @@ "images":[], "content": [ - "The results of smelting draconium blend in a furnace. Used in most recipes", + "The results of smelting draconium dust in a furnace. Used in most Draconic Evolution recipes.", "[c]item.draconicevolution:draconiumIngot:0" ] }, @@ -41,7 +42,8 @@ "content": [ "A storage block for draconium", - "[c]tile.draconicevolution:draconium:0" + "[c]tile.draconicevolution:draconium:0", + "This block is resistant to the wither" ] }, { @@ -51,7 +53,7 @@ "images":[], "content": [ - "Used in the Ritual of Draconic Resurrection. Place a draconium block in a charging device and 100 million RF later you have a charged draconium block!", + "Used in the Ritual of Draconic Resurrection and the Ritual of Awakening. Place a draconium block in a charging device and 100 million RF later you have a charged draconium block!", "[c]tile.draconicevolution:draconium:2" ] }, @@ -69,16 +71,29 @@ "images":[], "content": [ - "This component is used to craft all Wyvern tools", + "This is a higher tier core used in higher tier crafting recipes.", "[c]item.draconicevolution:wyvernCore:0" ] }, + { + "name":"info.Tool Config GUI", + "images":[], + "content": + [ + "This gui is used to configure most Draconic Evolution tools and armor. The default key to open this gui is 'c'", + "When you open the gui you will see all the items in your inventory. Items that can be configured will be highlighted. When you click on one of the highlighted items you will see a list of settings specific to that item that you can adjust.", + "You can also use this gui to apply and remove enchantments. In the list of options for the item there is an inventory button. This will open a new gui in which you will have access to your inventory, Enchantment slots on the right and if the item has additional inventory slots such as the obliteration filter for the draconic tools. Those slots will show at the top of the gui." + ] + }, { "name":"item.draconicevolution:wyvernPickaxe", "images":[], "content": [ - "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", + "Tiered of your slow old diamond pick? Maby its time to upgrade! Wyvern tools run on RF and never break", + "All mining tools have an option to adjust mining speed, Dig AOE and AOE safe mode", + "Dig AOE: Allows you to adjust the mining AOE of the tool. Wyvern AOE: 1x1 and 3x3", + "AOE Safe mode: If enabled the tool will check for any tile entities in the AOE and if it finds any the tool will not mine", "[c]item.draconicevolution:wyvernPickaxe:0" ] }, @@ -87,7 +102,10 @@ "images":[], "content": [ - "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", + "Tiered of your slow old diamond shovel? Maby its time to upgrade! Wyvern tools run on RF and never break", + "All mining tools have an option to adjust mining speed, Dig AOE and AOE safe mode", + "Dig AOE: Allows you to adjust the mining AOE of the tool. Wyvern AOE: 1x1 and 3x3", + "AOE Safe mode: If enabled the tool will check for any tile entities in the AOE and if it finds any the tool will not mine", "[c]item.draconicevolution:wyvernShovel:0" ] }, @@ -108,7 +126,10 @@ "images":[], "content": [ - "Weary of ordinary tools you begin to understand ways to use Draconic energy to upgrade. Sharpshooter – Zoom in on your target and deal extreme damage with pin point accuracy. Rapid Fire – Barrage your enemies in a rain of arrows.", + "Looking for a more powerful bow with some fancy features? This is the one for you. The Wyvern bow has 2 operating modes. Selectable with shift + right click", + "Rapid Fire: As the name suggests fires arrows at a rather high rate and dose moderate damage.", + "Sharp Shooter: Allows you to zoom in on your target and deal extremely high damage with pin point accuracy.", + "Enchantments are twice as effective on this bow.", "[c]item.draconicevolution:wyvernBow:0" ] }, @@ -264,7 +285,8 @@ "content": [ "You have been studying the interactions of Draconium with various materials and have come to realize that this is only an inert state. You have discovered a method to bring out the true power of Draconium using a complex ritual involving a dragon heart. (See the dragon heart page for details)", - "[c]tile.draconicevolution:draconicBlock:0" + "[c]tile.draconicevolution:draconicBlock:0", + "This block is resistant to the wither" ] }, { @@ -690,28 +712,84 @@ ] }, { - "name":"item.enchantedBook", + "name":"item.enchanted_book", "nameL":"Reaper Enchant", "images":[], "content": [ - "TODO" + "The Reaper enchant increases the drop chance of souls from mobs. It has a max level of 5 and it also makes it possible for regular weapons to drop souls from mobs." ] }, { "name":"info.Energy Storage Multiblock", - "images":[], + "images":[ + "http://i.imgur.com/BXl1x7e.png", + "http://i.imgur.com/gmgDwH8.png", + "http://i.imgur.com/DyYw9Tr.png", + "http://i.imgur.com/46X3Kqd.png", + "http://i.imgur.com/SoAY47W.png", + "http://i.imgur.com/tmL6ot4.png", + "http://i.imgur.com/7rtdJV2.png", + "http://i.imgur.com/x4IxV9F.png", + "http://i.imgur.com/4FxoUvf.png", + "http://i.imgur.com/IagzpKW.png", + "http://i.imgur.com/TvL8TVG.png", + "http://i.imgur.com/MTmGhLv.png", + "http://i.imgur.com/crmnC6v.png", + "http://i.imgur.com/eH3OvhW.png", + "http://i.imgur.com/oEBI4lj.png", + "http://i.imgur.com/KSpFook.png", + "http://i.imgur.com/C7WwlAu.png", + "http://i.imgur.com/uC4b8AC.png", + "http://i.imgur.com/rS9rOoF.png" + ], "content": [ - "TODO" + "The Energy Core is a multiblock structure that is capable of storing immense amounts of RF power using the energy storage capabilities of Draconium and Redstone.", + "The Energy Core has 7 Tiers each capable of storing considerably more then the last to build it you will need 5 different components.\n ♦ Energy Core x1\n ♦ Particle Generator x4\n ♦ Redstone Block (number depends on tier)\n ♦ Draconium Block (number depends on tier)\n ♦ Energy Pylon x2+", + "The Energy core consists of the Energy Core(Block) at the centre surrounded by 4 Particle Generators. The generators must be directly in line with the core as shown in the following images. \nThe generators must be placed within 10 blocks of the core.", + "The Core is then surrounded by a combination of Redstone Blocks and Draconium Blocks the following images show the construction of each tier as well as the material cost and storage capacity. Once the structure is built simply shift right click one of the particle generators (with an empty hand) to activate the core.", + "§4Tier 1", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/gmgDwH8.png", + "Redstone x0\nDraconium x0\nCapacity = 45.5Million RF", + "§4Tier 2", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/DyYw9Tr.png[>]http://i.imgur.com/46X3Kqd.png", + "Redstone x0\nDraconium x6\nCapacity = 273Million RF", + "§4Tier 3", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/SoAY47W.png[>]http://i.imgur.com/tmL6ot4.png", + "Redstone x0\nDraconium x26\nCapacity = 1.64Billion RF", + "§4Tier 4", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/x4IxV9F.png[>]http://i.imgur.com/4FxoUvf.png", + "Redstone x26\nDraconium x54\nCapacity = 9.88Billion RF", + "§4Tier 5", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/TvL8TVG.png[>]http://i.imgur.com/MTmGhLv.png", + "Redstone x80\nDraconium x98\nCapacity = 59.3Billion RF", + "§4Tier 6", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/crmnC6v.png[>]http://i.imgur.com/eH3OvhW.png[>]http://i.imgur.com/oEBI4lj.png", + "Redstone 133\nDraconium 150\nCapacity = 356Billion RF", + "§4Tier 7", + "http://i.imgur.com/BXl1x7e.png[>]http://i.imgur.com/7rtdJV2.png[>]http://i.imgur.com/IagzpKW.png[>]http://i.imgur.com/crmnC6v.png[>]http://i.imgur.com/KSpFook.png[>]http://i.imgur.com/C7WwlAu.png[>]http://i.imgur.com/uC4b8AC.png", + "Redstone x328\nDraconium x218\nCapacity = 2.14Trillion RF", + "To add and remove energy from the core you need to place energy pylons within 15 blocks of the of the core. To activate a pylon place a glass block ether above or below it depending on whether the pylon is placed below or above the core e.g. if you place the pylon on the roof you would place the glass block under it.", + "http://i.imgur.com/rS9rOoF.png", + "When the glass block is placed the pylon should immediately activate and link with a nearby Energy Core the link is indicated by white energy particles and the glass should change to the renderer shown in the image above. You can shift right click the pylon to change which core it is linked to (if there is more then one in range)", + "Energy is added and removed from the core using the Energy Pylons. To toggle a Pylon between input and output mode simply right click the sphere. The mode is identified by the colour of the Pylon (Blue = input, Orange = output) and the behaviour of the energy particles and the Pylon sphere.", + "Energy Transfer between the pylon and the core is indicated by a stream of blue energy particles flowing between the Pylon sphere and the core. The amount of energy flowing is roughly shown by the density of the particle stream.", + "The energy stored in the core is displayed by the HUD when you look at it. And in chat when you right click it. The core will also change to a dark red colour as it fills and its energy level can be read by placing a comparator on one of the attached pylons." ] }, { "name":"info.Ritual of Draconic Resurrection", - "images":[], + "images":["http://i.imgur.com/j2Hm0Am.png"], "content": [ - "TODO" + "The Ritual of Draconic Resurrection allows you to summon the Ender Dragon. To set it up you will need the following items.\n\n(1) Resurrection Stone\n(4) Glowstone Blocks\n(4) Obsidian\n(4) Diamond Blocks\n(4) Charged Draconium Blocks\n(12) Quartz Pillars\nSetup in the following configuration.", + "http://i.imgur.com/j2Hm0Am.png", + "The pillars dont have to be in that exact configuration as long as they are within 5 blocks of the Resurrection Stone. It also looks better if they are symmetrical. The ritual must be setup within 150 blocks of 0,0", + "Once you have that setup simply right click the Ritual stone and stand back. The ritual should start immediately if it doesn't you have done something wrong.", + "Right clicking the ritual stone again will stop the ritual and drain the charge from the draconium blocks.", + "During the ritual all of the Ender Crystals will be re-activated. At the end of the ritual there will be a massive explosion at the centre of the structure that wont do too much damage to the terrain but will kill anything that is standing too close.", + "The dragon that is spawned by the ritual is almost identical to the original dragon except it has a different texture (By GreatOrator) and it gets harder to kill and deals more damage each time it is summoned (this increase is per player and stops when it reaches a certain difficulty) It also has regeneration for 25 seconds." ] }, { @@ -719,32 +797,25 @@ "images":[], "content": [ - "Don't let the pigmen see you eating pork you wont like what happens...", - "TODO" + "Don't let the pigmen see you eating pork. You wont like what happens..." ] }, { "name":"info.Comets", - "images":[], + "images":["http://i.imgur.com/894RVmP.png"], "content": [ - "TODO" + "Mined out all of the Draconium ore in the end? Get yourself some form of flight and go search the end. If your lucky you may come across an Ender Comet. These comets are comprised of end stone, obsidian and a significant amount of Draconium ore. By default they have a 1 in 10000 chance to spawn in each chunk so you may need to search for a while and they come in various sizes.", + "http://i.imgur.com/894RVmP.png" ] }, { "name":"info.Chaos Islands", - "images":[], + "images":["http://i.imgur.com/gL4T6dG.png"], "content": [ - "TODO" - ] - }, - { - "name":"info.Tool Config GUI", - "images":[], - "content": - [ - "TODO" + "Looking for a challenge? the Ender Dragon wasnt hard enough? This is for you! If you travel to any multiple of 10,000 in the end (e.g. {x=0, z=10000}, {x=0, z=20000}, {x=10000, z=0} etc) you will find a Chaos Island. Each of these islands is guarded by a Chaos Guardian which is basically an extremely powerful Ender Dragon that drops 2 dragon hearts and some draconium dust as well as the standard end portal in the middle of the island with a dragon egg on top. Note: The Chaos Island is a work in progress and there will be changes in the future.", + "http://i.imgur.com/gL4T6dG.png" ] }, { @@ -752,7 +823,7 @@ "images":[], "content": [ - "TODO" + "Draconic Evolution adds the ability to place any item in the world as a block allowing you to do things like hang tools or other items on walls for display etc. To pla an item in the world simply look at a block with the item selected (as if you were about to place a block) and press the \"Place Item\" key (p by default) you can place items on the top bottom or sides of a block. You can left click to rotate the item clockwise and shift+left click to rotate the item counter-clockwise you can also shift+right click to rotate the item in very small increments counter-clockwise. Right click to pick the item up." ] } ] \ No newline at end of file diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Core_Tiers.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Core_Tiers.png deleted file mode 100644 index ffc6f6c1..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Core_Tiers.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon.png deleted file mode 100644 index c840682e..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles.png deleted file mode 100644 index ad644bb7..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles_2.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles_2.png deleted file mode 100644 index a373d379..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Energy_Pylon_Particles_2.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/ManualIntro.png b/src/main/resources/assets/draconicevolution/textures/gui/images/ManualIntro.png deleted file mode 100644 index 211b3cea..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/ManualIntro.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Pylon_y_Placement.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Pylon_y_Placement.png deleted file mode 100644 index d4baf3dc..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Pylon_y_Placement.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Ritual_of_ender_Resurrection.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Ritual_of_ender_Resurrection.png deleted file mode 100644 index 3dc121a0..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Ritual_of_ender_Resurrection.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/Stabilizer_Placement.png b/src/main/resources/assets/draconicevolution/textures/gui/images/Stabilizer_Placement.png deleted file mode 100644 index ec1ce78b..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/Stabilizer_Placement.png and /dev/null differ diff --git a/src/main/resources/assets/draconicevolution/textures/gui/images/T5_Energy_Core.png b/src/main/resources/assets/draconicevolution/textures/gui/images/T5_Energy_Core.png deleted file mode 100644 index 823b4a8d..00000000 Binary files a/src/main/resources/assets/draconicevolution/textures/gui/images/T5_Energy_Core.png and /dev/null differ