From fa5621e00bbc5fddaa34e4e74e9c6975503143cc Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Sat, 7 Mar 2015 17:48:24 +1100 Subject: [PATCH] 07/03/2015 --- .../draconicevolution/client/ClientProxy.java | 3 +- .../client/gui/GuiHandler.java | 4 +- .../client/gui/componentguis/GUIManual.java | 169 ++++++++++++++++++ .../client/gui/componentguis/ManualPage.java | 27 +++ .../guicomponents/ComponentIndexButton.java | 41 +++++ .../guicomponents/ComponentScrollingBase.java | 8 +- .../client/gui/guicomponents/GUIBase.java | 4 + .../gui/guicomponents/GUIScrollingBase.java | 7 +- .../client/handler/ResourceHandler.java | 87 +++++++++ .../client/handler/ResourceHelper.java | 39 ---- .../render/particle/ParticleCustom.java | 6 +- .../render/particle/ParticleDistortion.java | 6 +- .../render/particle/ParticleEnergy.java | 6 +- .../render/particle/ParticleEnergyBeam.java | 4 +- .../render/particle/ParticleEnergyField.java | 6 +- .../client/render/particle/Particles.java | 14 +- .../blocks/itemblocks/DraconiumItemBlock.java | 5 +- .../common/items/Tclogo.java | 6 + .../assets/draconicevolution/manual.json | 57 ------ .../textures/gui/manualBottom.png | Bin 0 -> 11562 bytes .../textures/gui/manualTop.png | Bin 0 -> 5814 bytes 21 files changed, 374 insertions(+), 125 deletions(-) create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentIndexButton.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java delete mode 100644 src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHelper.java delete mode 100644 src/main/resources/assets/draconicevolution/manual.json create mode 100644 src/main/resources/assets/draconicevolution/textures/gui/manualBottom.png create mode 100644 src/main/resources/assets/draconicevolution/textures/gui/manualTop.png diff --git a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 95c9caaa..3097c46e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -4,6 +4,7 @@ import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; import com.brandon3055.draconicevolution.client.handler.HudHandler; import com.brandon3055.draconicevolution.client.handler.ParticleHandler; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.client.keybinding.KeyBindings; import com.brandon3055.draconicevolution.client.keybinding.KeyInputHandler; import com.brandon3055.draconicevolution.client.render.block.*; @@ -49,7 +50,7 @@ public class ClientProxy extends CommonProxy { System.out.println("on Client side"); super.preInit(event); - + ResourceHandler.init(event); // downloadLocation = event.getModConfigurationDirectory().getParentFile().getAbsolutePath() + "/mods/derspack"; // downloadLocation = downloadLocation.replaceAll("\\\\", "/"); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java index 29de700a..697d7082 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/GuiHandler.java @@ -1,8 +1,8 @@ package com.brandon3055.draconicevolution.client.gui; import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual; import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig; -import com.brandon3055.draconicevolution.client.gui.manual.GuiManual; import com.brandon3055.draconicevolution.common.container.*; import com.brandon3055.draconicevolution.common.inventory.InventoryTool; import com.brandon3055.draconicevolution.common.tileentities.*; @@ -144,7 +144,7 @@ public class GuiHandler implements IGuiHandler { } break; case GUIID_MANUAL: - return new GuiManual(); + return new GUIManual(); case GUIID_DISSENCHANTER: TileEntity dissenchanter = world.getTileEntity(x, y, z); if (dissenchanter != null && dissenchanter instanceof TileDissEnchanter) { 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 new file mode 100644 index 00000000..791dd378 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/GUIManual.java @@ -0,0 +1,169 @@ +package com.brandon3055.draconicevolution.client.gui.componentguis; + +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentCollection; +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentIndexButton; +import com.brandon3055.draconicevolution.client.gui.guicomponents.ComponentTexturedRect; +import com.brandon3055.draconicevolution.client.gui.guicomponents.GUIScrollingBase; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; +import com.brandon3055.draconicevolution.common.container.DummyContainer; +import com.brandon3055.draconicevolution.common.utills.LogHelper; +import com.google.gson.stream.JsonReader; +import org.lwjgl.opengl.GL11; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Brandon on 6/03/2015. + */ +public class GUIManual extends GUIScrollingBase { + + private static List pageList = new ArrayList(); + + public GUIManual() { + super(new DummyContainer(), 0, 0); + this.xSize = 255; + this.ySize = 325; + } + + @Override + public void initGui() { + super.initGui(); + loadPages(); + } + + public static final String GR_BACKGROUND = "BACKGROUND"; + public static final String GR_INTRO = "INTRO"; + public static final String GR_INDEX = "INDEX"; + public static final String GR_4 = "BACKGROUND"; + + @Override + protected ComponentCollection assembleComponents() { + 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); + + for (int i = 0; i < 35; i ++) + { + collection.addComponent(new ComponentIndexButton(20, 20 + i * 12, this)).setGroup(GR_INDEX); + pageLength += 12; + } + + + return collection; + } + + @Override + public void handleScrollInput(int direction) { + scrollOffset += direction * 5; + if (scrollOffset < 0) scrollOffset = 0; + if (scrollOffset > pageLength - ySize + 40) scrollOffset = pageLength - ySize + 40; + if (pageLength + 40 <= ySize) scrollOffset = 0; + } + + @Override + public void drawScreen(int mouseX, int mouseY, float par3) { + super.drawScreen(mouseX, mouseY, par3); + + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + + GL11.glPushMatrix(); + GL11.glEnable(GL11.GL_BLEND); + + ResourceHandler.bindResource("textures/gui/manualBottom.png"); + GL11.glColor4f(1f, 1f, 1f, 1f); + drawTexturedModalRect(0, ySize - 34, 0, 69, 256, 34); + drawTexturedModalRect(0, 0, 0, 103, 256, 34); + + GL11.glDisable(GL11.GL_BLEND); + GL11.glPopMatrix(); + + } + + + public static void loadPages() + { + LogHelper.info("loading pages"); + + try + { + pageList.clear(); + File manualJSON = new File(ResourceHandler.getSaveFolder(), "manual.json"); + JsonReader reader = new JsonReader(new FileReader(manualJSON)); + List images; + List content; + + reader.beginArray(); + + //Read next page + while (reader.hasNext()) + { + String name; + images = new ArrayList(); + content = new ArrayList(); + + reader.beginObject(); + + //Read page name + String s = reader.nextName(); + if (s.equals("name")) + { + name = reader.nextString(); + } + else throw new IOException("Error reading manual.json (invalid name in place of \"name\" [Found:\"" + s + "\"])"); + + //Read page images + s = reader.nextName(); + if (s.equals("images")) + { + reader.beginArray(); + while (reader.hasNext()) + { + images.add(reader.nextString()); + } + reader.endArray(); + } + else throw new IOException("Error reading manual.json (invalid name in place of \"images\" [Found:\"" + s + "\"])"); + + //Read page content + s = reader.nextName(); + if (s.equals("content")) + { + reader.beginArray(); + while (reader.hasNext()) + { + content.add(reader.nextString()); + } + reader.endArray(); + } + else throw new IOException("Error reading manual.json (invalid name in place of \"content\" [Found:\"" + s + "\"])"); + + reader.endObject(); + + pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]))); + } + + reader.endArray(); + + } + catch (FileNotFoundException e) + { + e.printStackTrace(); + } + catch (IOException e) + { + e.printStackTrace(); + } + + for (ManualPage p : pageList) LogHelper.info(p.getLocalizedName()); + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java new file mode 100644 index 00000000..a9628af7 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/componentguis/ManualPage.java @@ -0,0 +1,27 @@ +package com.brandon3055.draconicevolution.client.gui.componentguis; + +import net.minecraft.util.StatCollector; + +/** + * Created by Brandon on 7/03/2015. + */ +public class ManualPage { + + public String name; + public String[] imageURLs; + public String[] content; + + public ManualPage(String name, String[] imageURLs, String[] content) + { + this.name = name; + this.imageURLs = imageURLs; + this.content = content; + } + + public String getLocalizedName() + { + return (name.contains("item.") || name.contains("tile.")) ? StatCollector.translateToLocal(name) : name.contains("info.") ? name.substring(name.indexOf("info.") + 5) : "Invalid Name Data"; + } + + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentIndexButton.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentIndexButton.java new file mode 100644 index 00000000..67c70032 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentIndexButton.java @@ -0,0 +1,41 @@ +package com.brandon3055.draconicevolution.client.gui.guicomponents; + +import net.minecraft.client.Minecraft; + +/** + * Created by Brandon on 7/03/2015. + */ +public class ComponentIndexButton extends ComponentScrollingBase { + + public ComponentIndexButton(int x, int y, GUIScrollingBase gui) { + super(x, y, gui); + } + + @Override + public void handleScrollInput(int direction) { + //this.y += direction * 10; + } + + @Override + public int getWidth() { + return 200; + } + + @Override + public int getHeight() { + return 12; + } + + @Override + public void renderBackground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { + int sy = y - gui.scrollOffset; + if (sy > 1 && sy + getHeight() < gui.getYSize()) + { + fontRendererObj.drawString("!!!!!!!!!!! Test !!!!!!!!!! " + y/12, x, sy, 0xffffff); + } + } + + @Override + public void renderForground(Minecraft minecraft, int offsetX, int offsetY, int mouseX, int mouseY) { + } +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentScrollingBase.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentScrollingBase.java index 5f8e8541..d91466b7 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentScrollingBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/ComponentScrollingBase.java @@ -4,8 +4,14 @@ package com.brandon3055.draconicevolution.client.gui.guicomponents; * Created by Brandon on 6/03/2015. */ public abstract class ComponentScrollingBase extends ComponentBase { - public ComponentScrollingBase(int x, int y) { + + protected GUIScrollingBase gui; + public int scrollOffset; + public int componentLength; + + public ComponentScrollingBase(int x, int y, GUIScrollingBase gui) { super(x, y); + this.gui = gui; } public abstract void handleScrollInput(int direction); 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 261ad1eb..ea74344c 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 @@ -121,4 +121,8 @@ public abstract class GUIBase extends GuiContainer { } public void buttonClicked(int id){buttonPressed = true;} + + public int getXSize() { return xSize; } + + public int getYSize() { return ySize; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIScrollingBase.java b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIScrollingBase.java index 09009aca..bc1ddd8e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIScrollingBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/gui/guicomponents/GUIScrollingBase.java @@ -7,6 +7,9 @@ import net.minecraft.inventory.Container; */ public abstract class GUIScrollingBase extends GUIBase { + public int scrollOffset; + public int pageLength; + public GUIScrollingBase(Container container, int xSize, int ySize) { super(container, xSize, ySize); } @@ -15,11 +18,11 @@ public abstract class GUIScrollingBase extends GUIBase { public void handleMouseInput() { int i = org.lwjgl.input.Mouse.getEventDWheel(); if (i != 0) { - handleScrollInput(i > 0 ? 1 : -1); + handleScrollInput(i > 0 ? -1 : 1); for (ComponentBase c : collection.getComponents()) { - if (c instanceof ComponentScrollingBase) ((ComponentScrollingBase) c).handleScrollInput(i > 0 ? 1 : -1); + if (c instanceof ComponentScrollingBase) ((ComponentScrollingBase) c).handleScrollInput(i > 0 ? -1 : 1); } } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java new file mode 100644 index 00000000..62fc6b98 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHandler.java @@ -0,0 +1,87 @@ +package com.brandon3055.draconicevolution.client.handler; + +import com.brandon3055.draconicevolution.common.lib.References; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EffectRenderer; +import net.minecraft.util.ResourceLocation; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +/** + * Created by Brandon on 8/02/2015. + */ +public class ResourceHandler { + private static ResourceLocation defaultParticles; + private static ResourceLocation particles = new ResourceLocation(References.RESOURCESPREFIX + "textures/particle/particles.png"); + private static Map cachedResources = new HashMap(); + + private static String savePath; + private static File saveFolder; + + + //-------------------- File Handling -----------------------// + public static void init(FMLPreInitializationEvent event) + { + savePath = event.getModConfigurationDirectory().getParentFile().getAbsolutePath() + "/mods/draconicevolution"; + } + + public static File getSaveFolder() + { + if (saveFolder == null) { saveFolder = new File(savePath); } + if (!saveFolder.exists()) saveFolder.mkdir(); + + return saveFolder; + } + + + //----------------------------------------------------------// + + + + + + + + + + public static void bindTexture(ResourceLocation texture) + { + Minecraft.getMinecraft().renderEngine.bindTexture(texture); + } + + /**Binds the vanilla particle sheet*/ + public static void bindDefaultParticles() + { + if (defaultParticles == null) + { + try + { + defaultParticles = (ResourceLocation) ReflectionHelper.getPrivateValue(EffectRenderer.class, null, "particleTextures", "field_110737_b"); + } + catch (Exception e) {} + } + if (defaultParticles != null) bindTexture(defaultParticles); + } + + public static void bindParticles() + { + bindTexture(particles); + } + + public static ResourceLocation getResource(String rs) + { + if (!cachedResources.containsKey(rs)) cachedResources.put(rs, new ResourceLocation(References.RESOURCESPREFIX + rs)); + return cachedResources.get(rs); + } + + public static void bindResource(String rs) + { + bindTexture(ResourceHandler.getResource(rs)); + } + + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHelper.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHelper.java deleted file mode 100644 index 4ef7768c..00000000 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/ResourceHelper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.brandon3055.draconicevolution.client.handler; - -import com.brandon3055.draconicevolution.common.lib.References; -import cpw.mods.fml.relauncher.ReflectionHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.util.ResourceLocation; - -/** - * Created by Brandon on 8/02/2015. - */ -public class ResourceHelper { - private static ResourceLocation defaultParticles; - private static ResourceLocation particles = new ResourceLocation(References.RESOURCESPREFIX + "textures/particle/particles.png"); - - public static void bindTexture(ResourceLocation texture) - { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - } - - /**Binds the vanilla particle sheet*/ - public static void bindDefaultParticles() - { - if (defaultParticles == null) - { - try - { - defaultParticles = (ResourceLocation) ReflectionHelper.getPrivateValue(EffectRenderer.class, null, "particleTextures", "field_110737_b"); - } - catch (Exception e) {} - } - if (defaultParticles != null) bindTexture(defaultParticles); - } - - public static void bindParticles() - { - bindTexture(particles); - } -} diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleCustom.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleCustom.java index 69247b4c..5b841acb 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleCustom.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleCustom.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.particle; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.particle.EntityFX; @@ -61,7 +61,7 @@ public class ParticleCustom extends EntityFX {//Note U=X V=Y tesselator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tesselator.startDrawingQuads(); tesselator.setBrightness(200);//make sure you have this!! @@ -92,7 +92,7 @@ public class ParticleCustom extends EntityFX tesselator.addVertexWithUV((double)(drawX + par3 * drawScale - par6 * drawScale), (double)(drawY - par4 * drawScale), (double)(drawZ + par5 * drawScale - par7 * drawScale), (double)minU, (double)maxV); tesselator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tesselator.startDrawingQuads(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleDistortion.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleDistortion.java index c9ab43d4..8f539c17 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleDistortion.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleDistortion.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.particle; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.particle.EntityFX; @@ -63,7 +63,7 @@ public class ParticleDistortion extends EntityFX { public void renderParticle(Tessellator tessellator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y tessellator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tessellator.startDrawingQuads(); tessellator.setBrightness(200);//make sure you have this!! @@ -94,7 +94,7 @@ public class ParticleDistortion extends EntityFX { tessellator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); tessellator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tessellator.startDrawingQuads(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergy.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergy.java index d9fe4f5c..b035a8ff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergy.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.particle; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; @@ -97,7 +97,7 @@ public class ParticleEnergy extends EntityFX { public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y tesselator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tesselator.startDrawingQuads(); tesselator.setBrightness(200);//make sure you have this!! @@ -128,7 +128,7 @@ public class ParticleEnergy extends EntityFX { tesselator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); tesselator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tesselator.startDrawingQuads(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyBeam.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyBeam.java index 75840660..89c90dad 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyBeam.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyBeam.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.render.particle; import com.brandon3055.draconicevolution.client.handler.ClientEventHandler; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.utills.Utills; import net.minecraft.client.Minecraft; @@ -218,7 +218,7 @@ public class ParticleEnergyBeam extends EntityFX { GL11.glPopMatrix(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tessellator.startDrawingQuads(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java index e80aa424..6cda8120 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.particle; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -60,7 +60,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl GL11.glPushMatrix(); //GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); GL11.glDepthMask(false); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); float minU = 0.0F + 0.125F * (advanced ? 4 : 3); float maxU = 0.0F + 0.125F * (advanced ? 5 : 4);//minU + 0.124F; @@ -126,7 +126,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl //GL11.glPopAttrib(); GL11.glPopMatrix(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tessellator.startDrawingQuads(); } } \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java index 621c705e..1a6a3e82 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/Particles.java @@ -1,6 +1,6 @@ package com.brandon3055.draconicevolution.client.render.particle; -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import com.brandon3055.draconicevolution.client.handler.ResourceHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.particle.EntityFX; @@ -121,7 +121,7 @@ public final class Particles { public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y tesselator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tesselator.startDrawingQuads(); tesselator.setBrightness(200);//make sure you have this!! @@ -172,7 +172,7 @@ public final class Particles { } tesselator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tesselator.startDrawingQuads(); } @@ -225,7 +225,7 @@ public final class Particles { public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y tesselator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tesselator.startDrawingQuads(); tesselator.setBrightness(200);//make sure you have this!! @@ -260,7 +260,7 @@ public final class Particles { tesselator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); tesselator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tesselator.startDrawingQuads(); } @@ -421,7 +421,7 @@ public final class Particles { public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y tesselator.draw(); - ResourceHelper.bindParticles(); + ResourceHandler.bindParticles(); tesselator.startDrawingQuads(); tesselator.setBrightness(200); @@ -453,7 +453,7 @@ public final class Particles { tesselator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV); tesselator.draw(); - ResourceHelper.bindDefaultParticles(); + ResourceHandler.bindDefaultParticles(); tesselator.startDrawingQuads(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java index f53378ab..5481a812 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumItemBlock.java @@ -49,7 +49,8 @@ public class DraconiumItemBlock extends ItemBlock implements IEnergyContainerIte @Override public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - if(container.getItemDamage() != 0) return 0; + if(container.getItemDamage() != 0 || container.stackSize <= 0) return 0; + maxReceive /= container.stackSize; if (container.stackTagCompound == null) { container.stackTagCompound = new NBTTagCompound(); } @@ -64,7 +65,7 @@ public class DraconiumItemBlock extends ItemBlock implements IEnergyContainerIte container.setItemDamage(2); container.setTagCompound(null); } - return energyReceived; + return energyReceived * container.stackSize; } @Override 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 dcfdb840..adef50db 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.utills.LogHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumAction; import net.minecraft.item.ItemStack; @@ -75,6 +76,7 @@ public class Tclogo extends ItemDE { @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if (world.isRemote) { String str = "A String"; @@ -88,6 +90,10 @@ public class Tclogo extends ItemDE { //player.addChatMessage(localIChatComponent); } + else + { + for (Object o : EntityList.classToStringMapping.values()) LogHelper.info(o); + } if (!player.isSneaking()) diff --git a/src/main/resources/assets/draconicevolution/manual.json b/src/main/resources/assets/draconicevolution/manual.json deleted file mode 100644 index 08260307..00000000 --- a/src/main/resources/assets/draconicevolution/manual.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "item.test.name": - { - "images":["www.image1", "www.image2"], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - - "block.test.name": - { - "images":["www.image1", "www.image2"], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - - "info.Ritual of Draconic Awakening": - { - "images":["www.image1", "www.image2"], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - }, - - "unlocalized name": - { - "images":["www.image1", "www.image2", "images that will be used on the page"], - "content": - [ - "line 1", - "line 2", - "line 3", - "www.image1", - "line 4", - "www.image2" - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/draconicevolution/textures/gui/manualBottom.png b/src/main/resources/assets/draconicevolution/textures/gui/manualBottom.png new file mode 100644 index 0000000000000000000000000000000000000000..39ab68b0fffb95fce66afa74f247ef636f4a505e GIT binary patch literal 11562 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/draconicevolution/textures/gui/manualTop.png b/src/main/resources/assets/draconicevolution/textures/gui/manualTop.png new file mode 100644 index 0000000000000000000000000000000000000000..79696f69f9d769234d4b5d0dd9d728ae001b6a03 GIT binary patch literal 5814 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 Aq5uE@ literal 0 HcmV?d00001