From 02c15a1ddb0430718df7dcda5e81072c81aa831e Mon Sep 17 00:00:00 2001 From: brandon3055 Date: Tue, 24 Feb 2015 04:55:47 +1100 Subject: [PATCH] 24/02/2015 --- Change Log.txt | 15 +- VERSION.json | 6 + build.gradle | 2 + gradle/wrapper/gradle-wrapper.properties | 2 +- .../draconicevolution/DraconicEvolution.java | 9 +- .../draconicevolution/client/ClientProxy.java | 10 +- .../client/handler/HudHandler.java | 2 +- .../client/interfaces/ConfigGUI.java | 2 + .../client/interfaces/GUITeleporter.java | 6 +- .../componentguis/GUIToolConfig.java | 13 ++ .../componentguis/GUIToolInventory.java | 1 + .../ComponentConfigItemButton.java | 7 +- .../client/model/ModelTeleporterStand.java | 2 +- .../render/block/RenderDraconiumChest.java | 2 +- .../render/particle/ParticleEnergyBeam.java | 13 +- .../render/particle/ParticleEnergyField.java | 132 +++++++++++++ .../render/particle/ParticleEnergyRing.java | 116 ------------ .../client/render/tile/RenderTileCrystal.java | 5 +- .../render/tile/RenderTileEnergyInfiser.java | 17 +- .../render/tile/RenderTileEnergyPylon.java | 4 - .../draconicevolution/common/CommonProxy.java | 4 +- .../common/blocks/BlockCustomDrop.java | 3 +- .../common/blocks/DraconiumChest.java | 17 +- .../itemblocks/DraconiumChestItemBlock.java | 10 + .../common/blocks/machine/EnergyCrystal.java | 76 +++++++- .../common/container/ContainerAdvTool.java | 13 ++ .../container/ContainerDraconiumChest.java | 21 ++- .../common/entity/EntityCustomDragon.java | 22 ++- .../common/handler/ConfigHandler.java | 12 +- .../common/items/tools/Wrench.java | 75 +++++++- .../common/lib/References.java | 4 +- .../common/lib/VersionHandler.java | 13 ++ .../tileentities/TileDraconiumChest.java | 130 ++++++++++--- .../common/tileentities/TileTestBlock.java | 6 +- .../energynet/IRemoteEnergyHandler.java | 5 + .../energynet/TileEnergyRelay.java | 19 +- .../energynet/TileEnergyTransceiver.java | 103 ++++++++++- .../energynet/TileRemoteEnergyBase.java | 174 ++++++++++++++---- .../TileEnergyStorageCore.java | 34 ++-- .../common/utills/UpdateChecker.java | 43 +++++ .../common/world/DraconicWorldGenerator.java | 6 +- .../assets/draconicevolution/lang/en_US.lang | 37 ++++ .../textures/particle/particles.png | Bin 33325 -> 33333 bytes .../textures/particle/particles.png.mcmeta | 1 + 44 files changed, 931 insertions(+), 263 deletions(-) create mode 100644 VERSION.json create mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java delete mode 100644 src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyRing.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java create mode 100644 src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java create mode 100644 src/main/resources/assets/draconicevolution/textures/particle/particles.png.mcmeta diff --git a/Change Log.txt b/Change Log.txt index f26b4d3b..415b41f5 100644 --- a/Change Log.txt +++ b/Change Log.txt @@ -1,10 +1,23 @@ ######## 1.0.1-Snap Shot(?) ######## -reduced default particle view range to 64 blocks. +-fixed up and down arrows in advanced dislocator GUI. +-fixed chaos guardian not spawning a portal on servers. +-re added the ability to change mining aoe of the tools with shift right click. +-fixed item config gui crash (needs server testing to confirm). +-optimized draconium chest packet handling. +-added config option to disable ore generation. +-blocked cheaty method of killing the dragon on servers by going out of its update range. +-added config option to disable the HUD info. +-added Energy Relay [WIP] +-added Advanced Energy Relay [WIP] +-added Energy Transceiver [WIP] +-added Advanced Energy Transceiver [WIP] +-added Crystal Wrench [WIP] ######## 1.0.1-Snap Shot(3) ######## --fixed spawner display mob shaking when disabled +-fixed spawner display mob shaking when disabled. -removed energy cost for Draconic Chest flight. -added tool config gui. -safety flame can now be extinguished without breaking the block it is placed on. diff --git a/VERSION.json b/VERSION.json new file mode 100644 index 00000000..62b6a83b --- /dev/null +++ b/VERSION.json @@ -0,0 +1,6 @@ +{ + "Version":"1.0.1" + "Snapshot":4 + "MCVersion":"1.0.1-snapshot_4" + "ReleaseNote":"This is a release note!" +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index efb594ef..0ca1a5cc 100644 --- a/build.gradle +++ b/build.gradle @@ -75,3 +75,5 @@ processResources exclude 'mcmod.info' } } + +sourceSets { main { output.resourcesDir = output.classesDir } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 662430a8..a9bbffb5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Tue May 06 21:57:37 CEST 2014 +#Fri Feb 20 03:02:45 EST 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java index 1ebe051b..80bb78dc 100644 --- a/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java +++ b/src/main/java/com/brandon3055/draconicevolution/DraconicEvolution.java @@ -30,7 +30,7 @@ public class DraconicEvolution { // TODO Update Licence and add change log to gi public static final String networkChannelName = "DEvolutionNC"; public static SimpleNetworkWrapper network; - public static boolean debug = true;//todo + public static boolean debug = false;//todo public static Enchantment reaperEnchant; @@ -54,13 +54,6 @@ public class DraconicEvolution { // TODO Update Licence and add change log to gi proxy.preInit(event); - /* - public static Achievement ultimatePower; - ultimatePower = new Achievement("achievment.ultimatePower", "Ultimate Power!!!", 1, -2, ModItems.draconicDestructionStaff, null).registerStat(); - AchievementPage draconicEvolution = new AchievementPage("Draconic Evolution", ultimatePower); - AchievementPage.registerAchievementPage(draconicEvolution); - */ - } @Mod.EventHandler diff --git a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java index 33e1639c..c050b456 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/ClientProxy.java @@ -12,7 +12,7 @@ import com.brandon3055.draconicevolution.client.render.entity.RenderDragonHeart; import com.brandon3055.draconicevolution.client.render.item.RenderBow; import com.brandon3055.draconicevolution.client.render.item.RenderMobSoul; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; -import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyRing; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.client.render.tile.*; import com.brandon3055.draconicevolution.common.CommonProxy; import com.brandon3055.draconicevolution.common.ModBlocks; @@ -188,16 +188,16 @@ public class ClientProxy extends CommonProxy { } @Override - public ParticleEnergyRing energyRing(World worldObj, double x, double y, double z, int powerFlow, boolean advanced, ParticleEnergyRing oldBeam, boolean render) { + public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) { if (!worldObj.isRemote) return null; - ParticleEnergyRing beam = oldBeam; + ParticleEnergyField beam = oldBeam; boolean inRange = ParticleHandler.isInRange(x, y, z, 50); if (beam == null || beam.isDead) { if (inRange) { - beam = new ParticleEnergyRing(worldObj, x, y, z, 8, powerFlow, advanced); + beam = new ParticleEnergyField(worldObj, x, y, z, 8, type, advanced); FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam); } @@ -209,7 +209,7 @@ public class ClientProxy extends CommonProxy { } else { - beam.update(powerFlow, render); + beam.update(render); } return beam; } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java index b02095fb..1aee3b04 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java @@ -34,7 +34,7 @@ public class HudHandler { @SubscribeEvent @SideOnly(Side.CLIENT) public void drawHUD(RenderGameOverlayEvent.Post event) { - if (event.type == RenderGameOverlayEvent.ElementType.ALL) { + if (ConfigHandler.enableHudDisplay && event.type == RenderGameOverlayEvent.ElementType.ALL) { if (hudList == null) return; Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java index cd2e0b86..c11f8412 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/ConfigGUI.java @@ -16,4 +16,6 @@ public class ConfigGUI extends GuiConfig { configElements.addAll(new ConfigElement(ConfigHandler.config.getCategory("spawner")).getChildElements()); configElements.addAll(new ConfigElement(ConfigHandler.config.getCategory("long range dislocator")).getChildElements()); } + + } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java index d910469d..9a033e8a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/GUITeleporter.java @@ -303,7 +303,7 @@ public class GUITeleporter extends GuiScreen @SuppressWarnings("unchecked") @Override - public void initGui(){ + public void initGui(){//todo Localization buttonList.clear(); int posX = (this.width - xSize) / 2; int posY = (this.height - ySize) / 2; @@ -314,13 +314,13 @@ public class GUITeleporter extends GuiScreen buttonList.add(new GuiButtonAHeight(1, posX + 112, posY + 58, 66, 12, "Set Here")); buttonList.add(new GuiButtonAHeight(2, posX + 112, posY + 71, 66, 12, "Remove")); - buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, "▲ ▲ ▲")); + buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, "UP")); buttonList.add(new GuiButtonAHeight(4, posX + 112, posY + 112, 66, 12, "Add New")); buttonList.add(new GuiButtonAHeight(5, posX + 112, posY + 125, 66, 12, "Add Fuel")); buttonList.add(new GuiButtonAHeight(6, posX+xSize-63, posY-15, 60, 15, "Cancel")); - buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, "▼ ▼ ▼")); + buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, "DOWN")); ((GuiButton) buttonList.get(6)).visible = false; textBeingEdited = new GuiTextField(fontRendererObj, posX+3, posY-14, xSize-67, 12); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolConfig.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolConfig.java index 93669087..4bef2a75 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolConfig.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolConfig.java @@ -7,6 +7,7 @@ import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.utills.IConfigurableItem; import com.brandon3055.draconicevolution.common.utills.IInventoryTool; import com.brandon3055.draconicevolution.common.utills.ItemConfigField; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; @@ -74,6 +75,18 @@ public class GUIToolConfig extends GUIBase { setLevel(0); } + public void updateItemButtons() + { + LogHelper.info("Update Buttons"); + for (ComponentBase component : collection.getComponents()) + { + if (component instanceof ComponentConfigItemButton) + { + ((ComponentConfigItemButton) component).refreshState(); + } + } + } + @Override protected void mouseClicked(int x, int y, int button) { super.mouseClicked(x, y, button); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolInventory.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolInventory.java index e9cce3ef..b56c60ff 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolInventory.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/componentguis/GUIToolInventory.java @@ -53,6 +53,7 @@ public class GUIToolInventory extends GUIBase { public void buttonClicked(int id) { super.buttonClicked(id); if (guiToolConfig == null) guiToolConfig = new GUIToolConfig(player, container); + guiToolConfig.updateItemButtons(); Minecraft.getMinecraft().displayGuiScreen(guiToolConfig); guiToolConfig.setLevel(1); container.setSlotsActive(false); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/guicomponents/ComponentConfigItemButton.java b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/guicomponents/ComponentConfigItemButton.java index b164ff98..328e4b3c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/interfaces/guicomponents/ComponentConfigItemButton.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/interfaces/guicomponents/ComponentConfigItemButton.java @@ -27,7 +27,12 @@ public class ComponentConfigItemButton extends ComponentBase { super(x, y); this.slot = slot; this.inventory = player.inventory; - if (inventory.getStackInSlot(slot) != null && ((inventory.getStackInSlot(slot).getItem() instanceof IConfigurableItem && !((IConfigurableItem) inventory.getStackInSlot(slot).getItem()).getFields(inventory.getStackInSlot(slot), slot).isEmpty()) || inventory.getStackInSlot(slot).getItem() instanceof IInventoryTool)) hasValidItem = true; + refreshState(); + } + + public void refreshState() + { + hasValidItem = (inventory.getStackInSlot(slot) != null && ((inventory.getStackInSlot(slot).getItem() instanceof IConfigurableItem && !((IConfigurableItem) inventory.getStackInSlot(slot).getItem()).getFields(inventory.getStackInSlot(slot), slot).isEmpty()) || inventory.getStackInSlot(slot).getItem() instanceof IInventoryTool)); } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelTeleporterStand.java b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelTeleporterStand.java index e048df7c..bdaf3002 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/model/ModelTeleporterStand.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/model/ModelTeleporterStand.java @@ -59,7 +59,7 @@ public class ModelTeleporterStand extends ModelBase { } public void render() { - final float scale = 1F / 16F; + final float scale = 1F / 16; plate.render(scale); holders.render(scale); diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java index 5f85027b..36a3ce4f 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/block/RenderDraconiumChest.java @@ -1,7 +1,7 @@ package com.brandon3055.draconicevolution.client.render.block; -import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import net.minecraft.client.model.ModelChest; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; 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 8f3b8379..75840660 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 @@ -140,7 +140,7 @@ public class ParticleEnergyBeam extends EntityFX { if (!renderParticle) return; tessellator.draw(); GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); + //GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); float var9 = 1.0F; float slide = (float) getPlayer().ticksExisted; float size = (float) flow / 100f * 2f; //0.7F; @@ -148,7 +148,7 @@ public class ParticleEnergyBeam extends EntityFX { else Minecraft.getMinecraft().renderEngine.bindTexture(beamTextureBasic); GL11.glTexParameterf(3553, 10242, 10497.0F); GL11.glTexParameterf(3553, 10243, 10497.0F); - GL11.glDisable(2884); + GL11.glDisable(GL11.GL_CULL_FACE); float var11 = slide + partialTick; float var12 = -var11 * 0.2F - (float) MathHelper.floor_float(-var11 * 0.1F); GL11.glBlendFunc(770, 1); @@ -165,7 +165,7 @@ public class ParticleEnergyBeam extends EntityFX { double var44 = -0.15D * (double)size; double var17 = 0.15D * (double)size; - + GL11.glTranslated(0.03, 0, 0); for(int t = 0; t < 2; ++t) { double var29 = (double)(this.length * var9); double var31 = 0D; @@ -190,6 +190,7 @@ public class ParticleEnergyBeam extends EntityFX { var17 = 0.15D * (double)1; //GL11.glColor4f(1f, 1f, 1f, 1f); + //GL11.glTranslated(0.1, 0, 0); for(int t = 0; t < 2; ++t) { double var29 = (double)(this.length * var9); double var31 = 0D; @@ -210,10 +211,10 @@ public class ParticleEnergyBeam extends EntityFX { } - GL11.glDepthMask(true); + //GL11.glDepthMask(true); GL11.glBlendFunc(770, 771); - GL11.glEnable(2884); - GL11.glPopAttrib(); + GL11.glEnable(GL11.GL_CULL_FACE); + // GL11.glPopAttrib(); GL11.glPopMatrix(); 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 new file mode 100644 index 00000000..e80aa424 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyField.java @@ -0,0 +1,132 @@ +package com.brandon3055.draconicevolution.client.render.particle; + +import com.brandon3055.draconicevolution.client.handler.ResourceHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.EntityFX; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.world.World; +import org.lwjgl.opengl.GL11; + +/** + * Created by Brandon on 9/02/2015. + */ +public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particle? Maby? + /** + * Particle Type 0 = Energy Ring, 1 = single particle + */ + private int type; + private boolean advanced; + private boolean renderParticle = true; + + public ParticleEnergyField(World world, double x, double y, double z, int maxAge, int type, boolean advanced) { + super(world, x, y, z, 0.0D, 0.0D, 0.0D); + this.particleRed = 1F; + this.particleGreen = 1F; + this.particleBlue = 1F; + this.noClip = true; + this.motionX = 0.0D; + this.motionY = 0.0D; + this.motionZ = 0.0D; + this.particleMaxAge = maxAge; + this.type = type; + this.advanced = advanced; + this.setSize(1F, 1F); + } + + public void update(boolean render) + { + for (this.renderParticle = render; this.particleMaxAge - this.particleAge < 4; ++this.particleMaxAge) {} + } + + @Override + public void onUpdate() { + + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; + + + if (this.particleAge++ >= this.particleMaxAge) + { + this.setDead(); + } + } + + + @Override + public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { + if (!renderParticle) return; + tessellator.draw(); + GL11.glPushMatrix(); + //GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); + GL11.glDepthMask(false); + ResourceHelper.bindParticles(); + + float minU = 0.0F + 0.125F * (advanced ? 4 : 3); + float maxU = 0.0F + 0.125F * (advanced ? 5 : 4);//minU + 0.124F; + float minV = 0F;//(float)this.particleTextureIndexY / 32.0F; + float maxV = 0.123F;//minV + 0.124F; + float drawScale = 0.2f; + + if (this.particleIcon != null) + { + minU = this.particleIcon.getMinU(); + maxU = this.particleIcon.getMaxU(); + minV = this.particleIcon.getMinV(); + maxV = this.particleIcon.getMaxV(); + } + + float drawX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) partialTick - interpPosX); + float drawY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) partialTick - interpPosY); + float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTick - interpPosZ); + + + if (type == 0) + { + tessellator.startDrawingQuads(); + tessellator.setBrightness(200); + tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1f); + + double pCount = Minecraft.getMinecraft().gameSettings.fancyGraphics ? 35 : 15; + for (int i = 0; i < pCount; i++) + { + double rot = i / pCount * (3.141 * 2D) + particleAge / 3D;//1D;//i / 10D; + double offset = 0.4; + double ox = Math.sin(rot) * offset; + double oz = Math.cos(rot) * offset; + + float drawXX = drawX + (float) ox; + float drawZZ = drawZ + (float) oz; + + tessellator.addVertexWithUV((double) (drawXX - rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZZ - rotZ * drawScale - rotXY * drawScale), (double) maxU, (double) maxV); + tessellator.addVertexWithUV((double) (drawXX - rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZZ - rotZ * drawScale + rotXY * drawScale), (double) maxU, (double) minV); + tessellator.addVertexWithUV((double) (drawXX + rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZZ + rotZ * drawScale + rotXY * drawScale), (double) minU, (double) minV); + tessellator.addVertexWithUV((double) (drawXX + rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZZ + rotZ * drawScale - rotXY * drawScale), (double) minU, (double) maxV); + } + + tessellator.draw(); + } + else + { + + tessellator.startDrawingQuads(); + tessellator.setBrightness(200); + tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1f); + + tessellator.addVertexWithUV((double) (drawX - rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZ - rotZ * drawScale - rotXY * drawScale), (double) maxU, (double) maxV); + tessellator.addVertexWithUV((double) (drawX - rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZ - rotZ * drawScale + rotXY * drawScale), (double) maxU, (double) minV); + tessellator.addVertexWithUV((double) (drawX + rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZ + rotZ * drawScale + rotXY * drawScale), (double) minU, (double) minV); + tessellator.addVertexWithUV((double) (drawX + rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZ + rotZ * drawScale - rotXY * drawScale), (double) minU, (double) maxV); + + tessellator.draw(); + } + + +// GL11.glDepthMask(true); + //GL11.glPopAttrib(); + GL11.glPopMatrix(); + + ResourceHelper.bindDefaultParticles(); + tessellator.startDrawingQuads(); + } +} \ No newline at end of file diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyRing.java b/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyRing.java deleted file mode 100644 index bde9f691..00000000 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/particle/ParticleEnergyRing.java +++ /dev/null @@ -1,116 +0,0 @@ -package com.brandon3055.draconicevolution.client.render.particle; - -import com.brandon3055.draconicevolution.client.handler.ResourceHelper; -import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - -/** - * Created by Brandon on 9/02/2015. - */ -public class ParticleEnergyRing extends EntityFX { - /** - * Power flow integer Ranges from 0 to 100 - */ - private int flow; - private boolean advanced; - private boolean renderParticle = true; - - public ParticleEnergyRing(World world, double x, double y, double z, int maxAge, int flow, boolean advanced) { - super(world, x, y, z, 0.0D, 0.0D, 0.0D); - this.particleRed = 1F; - this.particleGreen = 1F; - this.particleBlue = 1F; - this.noClip = true; - this.motionX = 0.0D; - this.motionY = 0.0D; - this.motionZ = 0.0D; - this.particleMaxAge = maxAge; - this.flow = flow; - this.advanced = advanced; - this.setSize(1F, 1F); - } - - public void update(int flow, boolean render) - { - this.renderParticle = render; - for (this.flow = 100; this.particleMaxAge - this.particleAge < 4; ++this.particleMaxAge) {} - } - - @Override - public void onUpdate() { - - this.prevPosX = this.posX; - this.prevPosY = this.posY; - this.prevPosZ = this.posZ; - - - if (this.particleAge++ >= this.particleMaxAge) - { - this.setDead(); - } - } - - - @Override - public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, float rotYZ, float rotXY) { - if (!renderParticle) return; - tessellator.draw(); - GL11.glPushMatrix(); - //GL11.glPushAttrib(GL11.GL_ATTRIB_STACK_DEPTH); - GL11.glDepthMask(false); - ResourceHelper.bindParticles(); - - float minU = 0.0F + 0.125F * (advanced ? 4 : 3); - float maxU = 0.0F + 0.125F * (advanced ? 5 : 4);//minU + 0.124F; - float minV = 0F;//(float)this.particleTextureIndexY / 32.0F; - float maxV = 0.1245F;//minV + 0.124F; - float drawScale = 0.2f; - - if (this.particleIcon != null) - { - minU = this.particleIcon.getMinU(); - maxU = this.particleIcon.getMaxU(); - minV = this.particleIcon.getMinV(); - maxV = this.particleIcon.getMaxV(); - } - - float drawX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) partialTick - interpPosX); - float drawY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) partialTick - interpPosY); - float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTick - interpPosZ); - - - tessellator.startDrawingQuads(); - tessellator.setBrightness(200); - tessellator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, 1f); - double pCount = Minecraft.getMinecraft().gameSettings.fancyGraphics ? 35 : 15; - for (int i = 0; i < pCount; i++) - { - double rot = i / pCount * (3.141 * 2D) + particleAge / 3D;//1D;//i / 10D; - double offset = 0.4; - double ox = Math.sin(rot) * offset; - double oz = Math.cos(rot) * offset; - - float drawXX = drawX + (float)ox; - float drawZZ = drawZ + (float)oz; - - tessellator.addVertexWithUV((double) (drawXX - rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZZ - rotZ * drawScale - rotXY * drawScale), (double) maxU, (double) maxV); - tessellator.addVertexWithUV((double) (drawXX - rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZZ - rotZ * drawScale + rotXY * drawScale), (double) maxU, (double) minV); - tessellator.addVertexWithUV((double) (drawXX + rotX * drawScale + rotYZ * drawScale), (double) (drawY + rotXZ * drawScale), (double) (drawZZ + rotZ * drawScale + rotXY * drawScale), (double) minU, (double) minV); - tessellator.addVertexWithUV((double) (drawXX + rotX * drawScale - rotYZ * drawScale), (double) (drawY - rotXZ * drawScale), (double) (drawZZ + rotZ * drawScale - rotXY * drawScale), (double) minU, (double) maxV); - - - } - tessellator.draw(); - - - GL11.glDepthMask(true); - //GL11.glPopAttrib(); - GL11.glPopMatrix(); - - ResourceHelper.bindDefaultParticles(); - tessellator.startDrawingQuads(); - } -} \ No newline at end of file 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 607cdb2a..3cbfa60e 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 @@ -72,7 +72,8 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { modelCrystal.renderAll(); - GL11.glDisable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0f); +// GL11.glDisable(GL11.GL_ALPHA_TEST); //--- Render Overlay ---// @@ -84,6 +85,7 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { //--- Post Render ---// GL11.glDisable(GL11.GL_BLEND); + RenderHelper.enableStandardItemLighting(); GL11.glPopMatrix(); } @@ -151,6 +153,7 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer { //--- Post Render ---// GL11.glDisable(GL11.GL_BLEND); + RenderHelper.enableStandardItemLighting(); GL11.glPopMatrix(); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java index 9a49ba55..abc63aa1 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyInfiser.java @@ -24,11 +24,11 @@ public class RenderTileEnergyInfiser extends TileEntitySpecialRenderer public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f) { GL11.glPushMatrix(); - + GL11.glTranslatef((float) x, (float) y, (float) z); TileEnergyInfuser tile = (TileEnergyInfuser) tileEntity; renderBlock(tile); - + GL11.glPopMatrix(); } @@ -40,19 +40,26 @@ public class RenderTileEnergyInfiser extends TileEntitySpecialRenderer tessellator.setColorRGBA(255, 255, 255, 255); //tessellator.setBrightness(200); - tessellator.setColorOpaque_F(1f, 1f, 1f); + //tessellator.setColorOpaque_F(1f, 1f, 1f); //OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)l1, (float)l2); - +// GL11.glEnable(GL11.GL_CULL_FACE); +// GL11.glDisable(GL11.GL_ALPHA_TEST); +// GL11.glEnable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_ALPHA_TEST); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); +// GL11.glDepthMask(true); drawBase(tessellator); drawWings(tessellator, tile); renderChargingItem(tile); + GL11.glDisable(GL11.GL_ALPHA_TEST); +// GL11.glDepthMask(false); } private void drawBase(Tessellator tess){ GL11.glPushMatrix(); tess.startDrawingQuads(); - tess.setNormal(0.0F, 0.0F, 1.0F); + tess.setNormal(0F, 0F, 1.0F); double srcXMin = 0D; double srcYMin = 0D; diff --git a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java index 6aea89f4..4b9c3d74 100644 --- a/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java +++ b/src/main/java/com/brandon3055/draconicevolution/client/render/tile/RenderTileEnergyPylon.java @@ -98,10 +98,6 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer { GL11.glPopMatrix(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); - GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_TEXTURE_2D); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java index d76a3876..7d9dbf26 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/CommonProxy.java @@ -4,7 +4,7 @@ import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.creativetab.DETab; import com.brandon3055.draconicevolution.client.interfaces.GuiHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; -import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyRing; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.common.achievements.Achievements; import com.brandon3055.draconicevolution.common.entity.*; import com.brandon3055.draconicevolution.common.handler.ConfigHandler; @@ -177,7 +177,7 @@ public abstract class CommonProxy { return null; } - public ParticleEnergyRing energyRing(World worldObj, double x, double y, double z, int powerFlow, boolean advanced, ParticleEnergyRing oldBeam, boolean render) { + public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) { return null; } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java index c71216a9..a71daf3e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/BlockCustomDrop.java @@ -23,8 +23,7 @@ public abstract class BlockCustomDrop extends BlockContainerDE { /**If true the tile will drop its inventory when broken*/ protected abstract boolean dropInventory(); - /**If true the tile will a custom block with custom data when broken - * use getCustomTileEntityCrop to specify the lock that should be dropped*/ + /**If true the tile will drop a custom block with custom data when broken*/ protected abstract boolean hasCustomDropps(); /**Use to specify custom drops*/ diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java index 72fde10a..1703ef0b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/DraconiumChest.java @@ -6,8 +6,8 @@ import com.brandon3055.draconicevolution.common.ModBlocks; import com.brandon3055.draconicevolution.common.blocks.itemblocks.DraconiumChestItemBlock; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.lib.Strings; -import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; +import com.brandon3055.draconicevolution.common.utills.ICustomItemData; import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -39,6 +39,9 @@ import static net.minecraftforge.common.util.ForgeDirection.UP; * Created by Brandon on 28/10/2014. */ public class DraconiumChest extends BlockCustomDrop { + + private static final String[] STORAGE_BLACKLIST = new String[] {"tile.thermalexpansion.strongbox", "item.thermalexpansion.satchel", "tile.draconicevolution:draconiumChest"}; + public DraconiumChest() { super(Material.iron); this.setBlockName(Strings.draconiumChestName); @@ -49,11 +52,21 @@ public class DraconiumChest extends BlockCustomDrop { ModBlocks.register(this, DraconiumChestItemBlock.class); } + + public static boolean isStackValid(ItemStack stack) + { + for (int i = 0; i < STORAGE_BLACKLIST.length; i++) + if (stack.getUnlocalizedName().contains(STORAGE_BLACKLIST[i])) return false; + return true; + } + + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float cx, float cy, float cz) { TileEntity tileEntity = world.getTileEntity(x, y, z); if (!(tileEntity instanceof TileDraconiumChest)) return false; TileDraconiumChest te = (TileDraconiumChest) tileEntity; + if (player.isSneaking()) { te.editMode = !te.editMode; if (world.isRemote)player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.DARK_GREEN + "" + StatCollector.translateToLocal("msg.draconiumChestEditmode.txt") + EnumChatFormatting.DARK_AQUA + " " + String.valueOf(te.editMode))); @@ -255,4 +268,6 @@ public class DraconiumChest extends BlockCustomDrop { } droppes.add(stack); } + + } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java index fc42bc5a..fd1f5423 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/itemblocks/DraconiumChestItemBlock.java @@ -34,4 +34,14 @@ public class DraconiumChestItemBlock extends ItemBlockCustomData { public boolean hasCustomEntity(ItemStack stack) { return true; } + + @Override + public boolean getShareTag() { + return false; + } + + @Override + public boolean isDamageable() { + return false; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java index a311d23c..69e0f727 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/blocks/machine/EnergyCrystal.java @@ -18,7 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -89,6 +91,66 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock } } + @Override + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + if (meta == 1 || meta == 0) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F); + else if (meta == 2 || meta == 3) + { + TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; + if (tile != null) + { + switch (tile.facing) + { + case 0: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.59F, z + 0.37F, x + 0.63F, y + 1.0F, z + 0.63F); + case 1: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.0F, z + 0.37F, x + 0.63F, y + 0.41F, z + 0.63F); + case 2: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.37F, z + 0.59F, x + 0.63F, y + 0.63F, z + 1.0F); + case 3: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.37F, z + 0.0F, x + 0.63F, y + 0.63F, z + 0.41F); + case 4: + return AxisAlignedBB.getBoundingBox(x + 0.59F, y + 0.37F, z + 0.37F, x + 1.0F, y + 0.63F, z + 0.63F); + case 5: + return AxisAlignedBB.getBoundingBox(x + 0.0F, y + 0.37F, z + 0.37F, x + 0.41F, y + 0.63F, z + 0.63F); + } + } + } + + return super.getCollisionBoundingBoxFromPool(world, x, y, z); + } + + @Override + public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { + int meta = world.getBlockMetadata(x, y, z); + if (meta == 1 || meta == 0) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F); + else if (meta == 2 || meta == 3) + { + TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null; + if (tile != null) + { + switch (tile.facing) + { + case 0: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.59F, z + 0.37F, x + 0.63F, y + 1.0F, z + 0.63F); + case 1: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.0F, z + 0.37F, x + 0.63F, y + 0.41F, z + 0.63F); + case 2: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.37F, z + 0.59F, x + 0.63F, y + 0.63F, z + 1.0F); + case 3: + return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.37F, z + 0.0F, x + 0.63F, y + 0.63F, z + 0.41F); + case 4: + return AxisAlignedBB.getBoundingBox(x + 0.59F, y + 0.37F, z + 0.37F, x + 1.0F, y + 0.63F, z + 0.63F); + case 5: + return AxisAlignedBB.getBoundingBox(x + 0.0F, y + 0.37F, z + 0.37F, x + 0.41F, y + 0.63F, z + 0.63F); + } + } + } + + return super.getSelectedBoundingBoxFromPool(world, x, y, z); + } + @Override public boolean hasTileEntity(int metadata) { return true; @@ -136,7 +198,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock } @Override - public List getDisplayData(World world, int x, int y, int z) { + public List getDisplayData(World world, int x, int y, int z) {//todo Localization List list = new ArrayList(); IRemoteEnergyHandler tile = world.getTileEntity(x, y, z) instanceof IRemoteEnergyHandler ? (IRemoteEnergyHandler) world.getTileEntity(x, y, z) : null; if (tile != null) @@ -144,6 +206,14 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock list.add(InfoHelper.HITC()+getLocalizedName()); list.add("RF: " + tile.getEnergyStored(ForgeDirection.DOWN)); list.add("Cap: " + tile.getCapacity() + "%"); + if (tile instanceof TileEnergyTransceiver) { + String x5 = ((TileEnergyTransceiver) tile).getPowerTier() > 0 && ((TileEnergyTransceiver) tile).transferBoost ? StatCollector.translateToLocal("info.de.5xTransfer.txt") : ""; + list.add(((TileEnergyTransceiver)tile).getInput() ? StatCollector.translateToLocal("info.de.modeIn.txt") + x5 : StatCollector.translateToLocal("info.de.modeOut.txt") + x5); + } + if (tile instanceof TileRemoteEnergyBase) { + list.add(StatCollector.translateToLocal("info.de.connections.txt") + ": " + ((TileRemoteEnergyBase) tile).linkedDevices.size() + "/" + tile.getMaxConnections()); + } + if (tile instanceof TileRemoteEnergyBase) { for (LinkedEnergyDevice l : ((TileRemoteEnergyBase) tile).linkedDevices) @@ -155,4 +225,8 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock return list; } + @Override + public int damageDropped(int dmg) { + return dmg; + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java index 7bd5321a..db3c325c 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerAdvTool.java @@ -29,6 +29,7 @@ public class ContainerAdvTool extends ContainerDataSync { this.inventoryTool = inventory; this.inventoryTool.setContainer(this); this.player = invPlayer.player; + setSlotsActive(false); } public void setSlotsActive(boolean active) { @@ -56,6 +57,18 @@ public class ContainerAdvTool extends ContainerDataSync { addSlotToContainer(new SlotEnchantment(inventoryTool, inventoryTool.size + y, 173, 19 + y * 21)); } } + else + { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new SlotPlayerInv(player.inventory, x, -1000 + 8 + 18 * x, -1000 + 103, inventoryItemSlot)); + } + + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 9; x++) { + addSlotToContainer(new SlotPlayerInv(player.inventory, x + y * 9 + 9, -1000 + 8 + 18 * x, -1000 + 45 + y * 18, inventoryItemSlot)); + } + } + } if (player.worldObj.isRemote) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java index 7b0e35cb..f243d35e 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/container/ContainerDraconiumChest.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.container; import cofh.api.energy.IEnergyContainerItem; +import com.brandon3055.draconicevolution.common.blocks.DraconiumChest; import com.brandon3055.draconicevolution.common.inventory.InventoryCraftingChest; import com.brandon3055.draconicevolution.common.inventory.InventoryCraftingChestResult; import com.brandon3055.draconicevolution.common.tileentities.TileDraconiumChest; @@ -54,7 +55,7 @@ public class ContainerDraconiumChest extends Container { { for (int chestCol = 0; chestCol < 26; chestCol++) { - addSlotToContainer(new Slot(tile, chestCol + (chestRow * 26), 8 + chestCol * 18, 15 + chestRow * 18)); + addSlotToContainer(new SlotDChest(tile, chestCol + (chestRow * 26), 8 + chestCol * 18, 15 + chestRow * 18)); } } @@ -88,7 +89,7 @@ public class ContainerDraconiumChest extends Container { { for (int gridRow = 0; gridRow < 3; ++gridRow) { - addSlotToContainer(new Slot(craftMatrix, gridRow + (gridCol * 3), xOffset + (gridRow * 18), yOffset + (gridCol * 18))); + addSlotToContainer(new SlotDChest(craftMatrix, gridRow + (gridCol * 3), xOffset + (gridRow * 18), yOffset + (gridCol * 18))); } } } @@ -242,4 +243,20 @@ public class ContainerDraconiumChest extends Container { return 1; } } + + public class SlotDChest extends Slot { + + + public SlotDChest(IInventory inventory, int id, int x, int y) { + super(inventory, id, x, y); + + } + + @Override + public boolean isItemValid(ItemStack stack) + { + return DraconiumChest.isStackValid(stack); + } + + } } 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 97b52a66..2216f98b 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/entity/EntityCustomDragon.java @@ -48,8 +48,7 @@ public class EntityCustomDragon extends EntityDragon { this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(health); this.getEntityAttribute(SharedMonsterAttributes.knockbackResistance).setBaseValue(health); this.attackDamage = attack; - //LogHelper.info(attackDamage); - this.addPotionEffect(new PotionEffect(10, 600, 10, false));; + this.addPotionEffect(new PotionEffect(10, 600, 10, false)); } @Override @@ -298,6 +297,7 @@ public class EntityCustomDragon extends EntityDragon { @Override protected void onDeathUpdate() { + if (deathTicks == 0 && !isUber) { for (int ix = -150; ix < 150; ix++) { @@ -597,6 +597,9 @@ public class EntityCustomDragon extends EntityDragon { super.writeToNBT(compound); compound.setFloat("AttackDamage", attackDamage); compound.setBoolean("IsUber", isUber); + compound.setInteger("PortalX", portalX); + compound.setInteger("PortalY", portalY); + compound.setInteger("PortalZ", portalZ); } @Override @@ -605,6 +608,9 @@ public class EntityCustomDragon extends EntityDragon { attackDamage = compound.getFloat("AttackDamage"); isUber = compound.getBoolean("IsUber"); this.dataWatcher.updateObject(12, isUber ? (byte)1: (byte)0); + portalX = compound.getInteger("PortalX"); + portalY = compound.getInteger("PortalY"); + portalZ = compound.getInteger("PortalZ"); } @Override @@ -625,4 +631,16 @@ public class EntityCustomDragon extends EntityDragon { public boolean getIsUber(){ return isUber; } + + @Override + public boolean attackEntityFrom(DamageSource damageSource, float dmg) { + if (damageSource.getEntity() != null && getDistanceToEntity(damageSource.getEntity()) > 100) return false; + return super.attackEntityFrom(damageSource, dmg); + } + + @Override + public boolean attackEntityFromPart(EntityDragonPart p_70965_1_, DamageSource damageSource, float p_70965_3_) { + if (damageSource.getEntity() != null && getDistanceSqToEntity(damageSource.getEntity()) > 100) return false; + return super.attackEntityFromPart(p_70965_1_, damageSource, p_70965_3_); + } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java index 4860b58d..0c457eb5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/ConfigHandler.java @@ -18,7 +18,6 @@ public class ConfigHandler { public static int cometRarity; public static int hudX; public static int hudY; - public static String[] obliterationList; public static boolean generateEnderComets; public static boolean generateChaosIslands; public static boolean pigmenBloodRage; @@ -26,6 +25,10 @@ public class ConfigHandler { public static boolean showUnlocalizedNames; public static boolean disableLore; public static boolean invertDPDSB; + public static boolean disableOreSpawnEnd; + public static boolean disableOreSpawnOverworld; + public static boolean disableOreSpawnNether; + public static boolean enableHudDisplay; //spawner public static String[] spawnerList; @@ -46,7 +49,6 @@ public class ConfigHandler { private static String[] defaultSpawnerList = new String[] {"ExampleMob1", "ExampleMob2", "ExampleMob3 (these examples can be deleted)"}; - private static String[] defaultObliterationList = new String[] {"tile.stonebrick", "tile.gravel", "tile.dirt", "tile.stone", "tile.dirt", "tile.sandStone", "tile.sand", "tile.grass", "tile.hellrock"}; public static void init(File confFile) { if (config == null) { @@ -64,7 +66,6 @@ public class ConfigHandler { disableXrayBlock = config.get(Configuration.CATEGORY_GENERAL, "Disable Xray Block", 0, "Disable Distortion Flame 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0); teleporterUsesPerPearl = config.get(Configuration.CATEGORY_GENERAL, "Teleporter Uses PerPearl", 1, "Charm of Dislocation uses per Ender pearl").getInt(1); bowBlockDamage = config.get(Configuration.CATEGORY_GENERAL, "Bow Block Damage", true, "Dose Draconic bow explosion damage blocks").getBoolean(true); - obliterationList = config.getStringList("Oblit Mode List", Configuration.CATEGORY_GENERAL, defaultObliterationList, "List of block (unlocalized)names that will be destroyed by tools in obliteration mode. To find the unlocalized name of a block see the \"Show Unlocalized Names\" config option"); showUnlocalizedNames = config.get(Configuration.CATEGORY_GENERAL, "Show Unlocalized Names", false, "If set to true the unlocalized name of every block and item will be displayed in its tool tip").getBoolean(false); soulDropChance = config.get(Configuration.CATEGORY_GENERAL, "soulDropChance", 1000, "Mobs have a 1 in this number chance to drop a soul", 1, Integer.MAX_VALUE).getInt(1000); passiveSoulDropChance = config.get(Configuration.CATEGORY_GENERAL, "passiveSoulDropChance", 800, "Passive (Animals) Mobs have a 1 in this number chance to drop a soul", 1, Integer.MAX_VALUE).getInt(800); @@ -76,7 +77,10 @@ public class ConfigHandler { invertDPDSB = config.get(Configuration.CATEGORY_GENERAL, "InvertDPDSB", false, "Invert Dislocator Pedestal display name shift behavior").getBoolean(false); hudX = config.get(Configuration.CATEGORY_GENERAL, "Hud Display X pos", 7).getInt(7); hudY = config.get(Configuration.CATEGORY_GENERAL, "Hud Display Y pos", 874).getInt(874); - + disableOreSpawnEnd = config.get(Configuration.CATEGORY_GENERAL, "Disable Ore Spawn (End)", false, "Set to true to prevent draconium ore from spawning in the end").getBoolean(false); + disableOreSpawnNether = config.get(Configuration.CATEGORY_GENERAL, "Disable Ore Spawn (Nether)", false, "Set to true to prevent draconium ore from spawning in the nether").getBoolean(false); + disableOreSpawnOverworld = config.get(Configuration.CATEGORY_GENERAL, "Disable Ore Spawn (Overworld)", false, "Set to true to prevent draconium ore from spawning in the overworld").getBoolean(false); + enableHudDisplay = config.get(Configuration.CATEGORY_GENERAL, "Enable HUD info", true, "Set to false to disable the HUD info for tools and blocks").getBoolean(true); //Spawner spawnerListType = config.get("spawner", "listType", false, "Sets weather the spawner list is a white list or a black list (true = white list false = black list)").getBoolean(false); 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 3e5043c5..d5e69844 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 @@ -4,17 +4,30 @@ import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; import com.brandon3055.draconicevolution.common.items.ItemDE; import com.brandon3055.draconicevolution.common.lib.Strings; +import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem; +import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper; +import com.brandon3055.draconicevolution.common.utills.UpdateChecker; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import java.util.ArrayList; import java.util.List; /** * Created by Brandon on 23/08/2014. */ -public class Wrench extends ItemDE { +public class Wrench extends ItemDE implements IHudDisplayItem{ + + public static final String BIND_MODE = "bind"; + public static final String UNBIND_MODE = "unBind"; + public static final String CLEAR_BINDINGS = "unBindAll"; + public static final String MODE_SWITCH = "modeSwitch"; public Wrench() { @@ -24,10 +37,66 @@ public class Wrench extends ItemDE { ModItems.register(this); } + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + + new UpdateChecker(); + + if (player.isSneaking()) cycleMode(stack, world, player); + else if (ItemNBTHelper.getCompound(stack).hasKey("LinkData") && ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").getBoolean("Bound")) ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").setBoolean("Bound", false); + return super.onItemRightClick(stack, world, player); + } + + static final String[] modes = new String[] {BIND_MODE, UNBIND_MODE, CLEAR_BINDINGS, MODE_SWITCH}; + + private static void cycleMode(ItemStack stack, World world, EntityPlayer player) + { + String currentMode = ItemNBTHelper.getString(stack, "Mode", "bind"); + int mode = 0; + for (String s : modes) + { + if (s.equals(currentMode)) + { + if (mode + 1 >= modes.length) currentMode = modes[0]; + else currentMode = modes[mode + 1]; + break; + } + mode++; + } + ItemNBTHelper.setString(stack, "Mode", currentMode); + if (world.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.wrenchMode." + currentMode + ".txt")); + } + @SuppressWarnings("unchecked") @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { - //list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.safetyMatch.txt")); + public void addInformation(ItemStack stack, EntityPlayer p_77624_2_, List list, boolean bool) { + list.add(StatCollector.translateToLocal("msg.de.wrenchMode." + ItemNBTHelper.getString(stack, "Mode", "bind") + ".txt")); + NBTTagCompound linkDat = null; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("LinkData")) linkDat = stack.getTagCompound().getCompoundTag("LinkData"); + if (linkDat != null && linkDat.getBoolean("Bound")) + { + list.add(StatCollector.translateToLocal("msg.de.boundTo.txt") + ": [X:" + linkDat.getInteger("XCoord") + ", Y:" + linkDat.getInteger("YCoord") + ", Z:" + linkDat.getInteger("ZCoord") + "]"); + list.add(StatCollector.translateToLocal("msg.de.rightClickUnbind.txt")); + } + } + + @Override + public List getDisplayData(ItemStack stack) { + List list = new ArrayList(); + list.add(StatCollector.translateToLocal("msg.de.wrenchMode." + ItemNBTHelper.getString(stack, "Mode", "bind") + ".txt")); + NBTTagCompound linkDat = null; + if (stack.hasTagCompound() && stack.getTagCompound().hasKey("LinkData")) linkDat = stack.getTagCompound().getCompoundTag("LinkData"); + if (linkDat != null && linkDat.getBoolean("Bound")) + { + list.add(StatCollector.translateToLocal("msg.de.boundTo.txt") + ": [X:" + linkDat.getInteger("XCoord") + ", Y:" + linkDat.getInteger("YCoord") + ", Z:" + linkDat.getInteger("ZCoord") + "]"); + list.add(StatCollector.translateToLocal("msg.de.rightClickUnbind.txt")); + } + return list; + } + + public static String getMode(ItemStack stack) + { + return ItemNBTHelper.getString(stack, "Mode", "bind"); } } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java index 00481422..ca7ae16a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/References.java @@ -3,8 +3,8 @@ package com.brandon3055.draconicevolution.common.lib; public final class References { public static final String MODID = "DraconicEvolution"; public static final String MODNAME = "Draconic Evolution"; - public static final String VERSION = "1.0.1-snapshot_3"; - public static final String MCVERSION = "1.7.10"; + public static final String VERSION = VersionHandler.FULL_VERSION; + public static final String MCVERSION = VersionHandler.MCVERSION; public static final String CLIENTPROXYLOCATION = "com.brandon3055.draconicevolution.client.ClientProxy"; public static final String SERVERPROXYLOCATION = "com.brandon3055.draconicevolution.common.ServerProxy"; public static final String GUIFACTORY = "com.brandon3055.draconicevolution.client.interfaces.DEGUIFactory"; diff --git a/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java new file mode 100644 index 00000000..7c053d69 --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/lib/VersionHandler.java @@ -0,0 +1,13 @@ +package com.brandon3055.draconicevolution.common.lib; + +/** + * Created by Brandon on 24/02/2015. + */ +public class VersionHandler +{ + public static final String VERSION = "1.0.1"; + public static final int SNAPSHOT = 4; + 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/tileentities/TileDraconiumChest.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java index 6cbd0547..5f14a5d9 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileDraconiumChest.java @@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyContainerItem; import cofh.api.energy.IEnergyHandler; import com.brandon3055.draconicevolution.common.ModBlocks; +import com.brandon3055.draconicevolution.common.blocks.DraconiumChest; import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest; import com.brandon3055.draconicevolution.common.lib.OreDoublingRegistry; import com.brandon3055.draconicevolution.common.utills.EnergyStorage; @@ -13,6 +14,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; @@ -297,9 +299,21 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg @Override public Packet getDescriptionPacket() { - NBTTagCompound tagCompound = new NBTTagCompound(); - this.writeToNBT(tagCompound); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tagCompound); + NBTTagCompound compound = new NBTTagCompound(); + compound.setByte("facing", (byte) facing); + compound.setInteger("Red", red); + compound.setInteger("Green", green); + compound.setInteger("Blue", blue); + compound.setBoolean("Edit", editMode); + compound.setByte("AutoFeed", (byte) smeltingAutoFeed); + if (customName != null && customName.length() > 0)compound.setString("CustomName", customName); + energy.writeToNBT(compound); + super.writeToNBT(compound); + + return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, compound); +// NBTTagCompound tagCompound = new NBTTagCompound(); +// this.writeToNBT(tagCompound); +// return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, 1, tagCompound); } @Override @@ -400,7 +414,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg @Override public boolean isItemValidForSlot(int i, ItemStack itemstack) { - return true; + return DraconiumChest.isStackValid(itemstack); } @Override @@ -465,28 +479,31 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg @Override public void writeDataToItem(NBTTagCompound compound, ItemStack stack) { - NBTTagCompound[] tag = new NBTTagCompound[items.length]; + + NBTTagList tagList = new NBTTagList(); for (int i = 0; i < items.length; i++) { - tag[i] = new NBTTagCompound(); - - if (items[i] != null) { - tag[i] = items[i].writeToNBT(tag[i]); + if (items[i] != null) + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setShort("IS", (short)i); + items[i].writeToNBT(tag); + tagList.appendTag(tag); } - - compound.setTag("Item" + i, tag[i]); } for (int i = 0; i < itemsCrafting.length; i++) { - tag[i] = new NBTTagCompound(); - - if (itemsCrafting[i] != null) { - tag[i] = itemsCrafting[i].writeToNBT(tag[i]); + if (itemsCrafting[i] != null) + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setShort("CS", (short)i); + itemsCrafting[i].writeToNBT(tag); + tagList.appendTag(tag); } - - compound.setTag("CraftingItem" + i, tag[i]); } + compound.setTag("Inventory", tagList); + compound.setInteger("Red", red); compound.setInteger("Green", green); compound.setInteger("Blue", blue); @@ -498,16 +515,22 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg @Override public void readDataFromItem(NBTTagCompound compound, ItemStack stack) { - NBTTagCompound[] tag = new NBTTagCompound[items.length]; - for (int i = 0; i < items.length; i++) { - tag[i] = compound.getCompoundTag("Item" + i); - items[i] = ItemStack.loadItemStackFromNBT(tag[i]); - } - - for (int i = 0; i < itemsCrafting.length; i++) { - tag[i] = compound.getCompoundTag("CraftingItem" + i); - itemsCrafting[i] = ItemStack.loadItemStackFromNBT(tag[i]); + if (compound.hasKey("Inventory")) + { + NBTTagList tagList = compound.getTagList("Inventory", 10); + for (int i = 0; i < tagList.tagCount(); i++) + { + NBTTagCompound tag = tagList.getCompoundTagAt(i); + if (tag.hasKey("IS")) + { + items[tag.getShort("IS")] = ItemStack.loadItemStackFromNBT(tag); + } + else if (tag.hasKey("CS")) + { + itemsCrafting[tag.getShort("CS")] = ItemStack.loadItemStackFromNBT(tag); + } + } } red = compound.getInteger("Red"); @@ -518,6 +541,61 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg energy.readFromNBT(compound); } +// @Override +// public void writeDataToItem(NBTTagCompound compound, ItemStack stack) { +// NBTTagCompound[] tag = new NBTTagCompound[items.length]; +// +// for (int i = 0; i < items.length; i++) { +// tag[i] = new NBTTagCompound(); +// +// if (items[i] != null) { +// tag[i] = items[i].writeToNBT(tag[i]); +// } +// +// compound.setTag("Item" + i, tag[i]); +// } +// +// for (int i = 0; i < itemsCrafting.length; i++) { +// tag[i] = new NBTTagCompound(); +// +// if (itemsCrafting[i] != null) { +// tag[i] = itemsCrafting[i].writeToNBT(tag[i]); +// } +// +// compound.setTag("CraftingItem" + i, tag[i]); +// } +// +// compound.setInteger("Red", red); +// compound.setInteger("Green", green); +// compound.setInteger("Blue", blue); +// compound.setBoolean("Edit", editMode); +// compound.setByte("AutoFeed", (byte) smeltingAutoFeed); +// if (hasCustomInventoryName()) stack.setStackDisplayName(customName); +// energy.writeToNBT(compound); +// } + +// @Override +// public void readDataFromItem(NBTTagCompound compound, ItemStack stack) { +// NBTTagCompound[] tag = new NBTTagCompound[items.length]; +// +// for (int i = 0; i < items.length; i++) { +// tag[i] = compound.getCompoundTag("Item" + i); +// items[i] = ItemStack.loadItemStackFromNBT(tag[i]); +// } +// +// for (int i = 0; i < itemsCrafting.length; i++) { +// tag[i] = compound.getCompoundTag("CraftingItem" + i); +// itemsCrafting[i] = ItemStack.loadItemStackFromNBT(tag[i]); +// } +// +// red = compound.getInteger("Red"); +// green = compound.getInteger("Green"); +// blue = compound.getInteger("Blue"); +// editMode = compound.getBoolean("Edit"); +// smeltingAutoFeed = compound.getByte("AutoFeed"); +// energy.readFromNBT(compound); +// } + @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { return this.energy.receiveEnergy(maxReceive, simulate); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java index 7a46f125..99ce8e4a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/TileTestBlock.java @@ -2,7 +2,7 @@ package com.brandon3055.draconicevolution.common.tileentities; import cofh.api.energy.IEnergyHandler; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyBeam; -import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyRing; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import com.brandon3055.draconicevolution.common.utills.LogHelper; import com.brandon3055.draconicevolution.common.utills.Utills; @@ -26,14 +26,14 @@ public class TileTestBlock extends TileEntity implements IEnergyHandler { public float modelRotation; //Use a map for the beam to each target (Target, Beam) private ParticleEnergyBeam beam = null; - private ParticleEnergyRing ring = null; + private ParticleEnergyField ring = null; @Override public void updateEntity() { //beam = DraconicEvolution.proxy.energyBeam(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 0.5, 4.5, 0.5, 100, true, beam); - //ring = DraconicEvolution.proxy.energyRing(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, ClientEventHandler.elapsedTicks % 100, true, ring); + //ring = DraconicEvolution.proxy.energyField(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, ClientEventHandler.elapsedTicks % 100, true, ring); if (worldObj.isRemote) return; for (ForgeDirection d : ForgeDirection.VALID_DIRECTIONS) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/IRemoteEnergyHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/IRemoteEnergyHandler.java index c49b70ef..a9b50009 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/IRemoteEnergyHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/IRemoteEnergyHandler.java @@ -1,6 +1,7 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; import cofh.api.energy.IEnergyHandler; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; import net.minecraft.entity.player.EntityPlayer; /** @@ -24,4 +25,8 @@ public interface IRemoteEnergyHandler extends IEnergyHandler { double getBeamY(); double getBeamZ(); + + EnergyStorage getStorage(); + + int getMaxConnections(); } diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java index ebbdf1ca..346c1af5 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java @@ -1,14 +1,14 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; import com.brandon3055.draconicevolution.DraconicEvolution; -import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyRing; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import net.minecraft.nbt.NBTTagCompound; /** * Created by Brandon on 10/02/2015. */ public class TileEnergyRelay extends TileRemoteEnergyBase { - private ParticleEnergyRing ring; + private ParticleEnergyField ring; public TileEnergyRelay(){} @@ -20,17 +20,17 @@ public class TileEnergyRelay extends TileRemoteEnergyBase { @Override public int getCap() { - return 50000 + (powerTier * 450000); + return 50000 + (powerTier * 4500000); } @Override public int getRec() { - return 50000 + (powerTier * 450000); + return 50000 + (powerTier * 4500000); } @Override public int getExt() { - return 50000 + (powerTier * 450000); + return 50000 + (powerTier * 4500000); } @Override @@ -39,7 +39,7 @@ public class TileEnergyRelay extends TileRemoteEnergyBase { if (worldObj.isRemote) { - ring = DraconicEvolution.proxy.energyRing(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 0, powerTier == 1, ring, inView > 0); + ring = DraconicEvolution.proxy.energyField(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 0, powerTier == 1, ring, inView > 0); return; } } @@ -66,7 +66,7 @@ public class TileEnergyRelay extends TileRemoteEnergyBase { *return double between 0 to 100*/ public double getFlow(double localCap, double remoteCap) { - return Math.max(0, Math.min(100, (localCap - remoteCap) * 10D/*Flow Multiplier*/)); + return Math.max(0, Math.min(100, (localCap - remoteCap) * 100D/*Flow Multiplier*/)); } @Override @@ -83,4 +83,9 @@ public class TileEnergyRelay extends TileRemoteEnergyBase { public double getBeamZ() { return zCoord + 0.5D; } + + @Override + public int getMaxConnections() { + return powerTier == 0 ? 10 : 20; + } } 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 2c4d2429..3b119927 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 @@ -1,6 +1,14 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; +import cofh.api.energy.IEnergyHandler; +import com.brandon3055.draconicevolution.DraconicEvolution; +import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.common.items.tools.Wrench; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; /** * Created by Brandon on 16/02/2015. @@ -8,6 +16,9 @@ import net.minecraft.nbt.NBTTagCompound; public class TileEnergyTransceiver extends TileRemoteEnergyBase{ public int facing = 0;//0=up, 1=down, 3=north, 2=south, 4=east, 5=west + private boolean input = false; + public boolean transferBoost = false; + private ParticleEnergyField particle; public TileEnergyTransceiver() {} @@ -20,8 +31,62 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ @Override public void updateEntity() { super.updateEntity(); + + if (!worldObj.isRemote) + { + ForgeDirection direction = ForgeDirection.getOrientation(facing).getOpposite(); + TileEntity adjacentTile = worldObj.getTileEntity(xCoord + direction.offsetX, yCoord + direction.offsetY, zCoord + direction.offsetZ); + if (!input && adjacentTile instanceof IEnergyHandler) + { + IEnergyHandler handler = (IEnergyHandler) adjacentTile; + storage.extractEnergy(handler.receiveEnergy(direction.getOpposite(), storage.extractEnergy(storage.getMaxExtract(), true), false), false); + if (transferBoost) + { + for (int i = 0; i < 4; i++) storage.extractEnergy(handler.receiveEnergy(direction.getOpposite(), storage.extractEnergy(storage.getMaxExtract(), true), false), false); + } + } + else if (input && adjacentTile instanceof IEnergyHandler) + { + IEnergyHandler handler = (IEnergyHandler) adjacentTile; + if (transferBoost) + { + for (int i = 0; i < 4; i++) storage.receiveEnergy(handler.extractEnergy(direction.getOpposite(), storage.receiveEnergy(storage.getMaxExtract(), true), false), false); + } + } + } + + if (worldObj.isRemote) particle = DraconicEvolution.proxy.energyField(worldObj, getBeamX(), getBeamY(), getBeamZ(), 1, powerTier == 1, particle, inView > 0); } + @Override + public boolean handleOther(EntityPlayer player, ItemStack wrench) { + String mode = Wrench.getMode(wrench); + + if (mode.equals(Wrench.MODE_SWITCH)) + { + if (powerTier == 0) + { + input = !input; + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + else + { + if (!transferBoost) transferBoost = true; + else + { + input = !input; + transferBoost = false; + } + } + } + + return true; + } + + public boolean getInput() { return input; } + + public void setInput(boolean input) { this.input = input;} + @Override public double getBeamX() { return xCoord + 0.5; @@ -39,28 +104,60 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase{ @Override public int getCap() { - return 50000 + (powerTier * 450000); + return powerTier == 0 ? 50000 : 10000000; } @Override public int getRec() { - return 50000 + (powerTier * 450000); + return powerTier == 0 ? 50000 : 10000000; } @Override public int getExt() { - return 50000 + (powerTier * 450000); + return powerTier == 0 ? 50000 : 10000000; } @Override public void writeToNBT(NBTTagCompound compound) { super.writeToNBT(compound); compound.setInteger("Facing", facing); + compound.setBoolean("Input", input); } @Override public void readFromNBT(NBTTagCompound compound) { super.readFromNBT(compound); facing = compound.getInteger("Facing"); + input = compound.getBoolean("Input"); + } + + @Override + public boolean canConnectEnergy(ForgeDirection from) { + return from == ForgeDirection.getOrientation(facing).getOpposite(); + } + + @Override + public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { + return from == ForgeDirection.getOrientation(facing).getOpposite() && input ? storage.receiveEnergy(maxReceive, simulate) : 0; + } + + @Override + public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { + return from == ForgeDirection.getOrientation(facing).getOpposite() && !input ? storage.extractEnergy(maxExtract, simulate) : 0; + } + + @Override + public int getEnergyStored(ForgeDirection from) { + return storage.getEnergyStored(); + } + + @Override + public int getMaxEnergyStored(ForgeDirection from) { + return storage.getMaxEnergyStored(); + } + + @Override + public int getMaxConnections() { + return powerTier == 0 ? 2 : 4; } } 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 e9d4329f..004aaf25 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 @@ -2,19 +2,21 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.items.tools.Wrench; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; import com.brandon3055.draconicevolution.common.utills.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; import java.util.ArrayList; @@ -23,13 +25,14 @@ import java.util.List; /** * Created by Brandon on 10/02/2015. */ -public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRemoteEnergyHandler { +public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRemoteEnergyHandler {//todo optimize (add cutoff, explore possible cach optimization) /**The tier of the relay (0-1)*/ protected int powerTier; protected EnergyStorage storage = new EnergyStorage(0); public List linkedDevices = new ArrayList(); protected int lastTickEnergy; + private int tick = 0; public byte inView = 0; @@ -48,22 +51,42 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe @Override public void updateEntity() { + tick++; + //worldObj.theProfiler.startSection("DE REB"); updateLinkedDevices(); + if (linkedDevices.size() == 0) detectAndSendChanges(-1); if (worldObj.isRemote && inView > 0) --inView; + //worldObj.theProfiler.endSection(); } //**********Distribution Logic********** private void updateLinkedDevices() { - //LogHelper.info(storage.getEnergyStored()); + boolean inView = false; +// if (worldObj.isRemote) +// { +// MovingObjectPosition mop = Minecraft.getMinecraft().thePlayer.rayTrace(5, 0); +// if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && mop.blockX == xCoord && mop.blockY == yCoord && mop.blockZ == zCoord) inView = true;//todo remove +// } + + + if (inView)LogHelper.info("######Start#######"); + for (LinkedEnergyDevice device : linkedDevices) { if (!device.isValid(worldObj)) { - linkedDevices.remove(device); - updateLinkedDevices(); - return; + if (worldObj.getChunkFromBlockCoords(device.xCoord, device.zCoord).isChunkLoaded) + { + linkedDevices.remove(device); + updateLinkedDevices(); + return; + } + else + { + continue; + } } IRemoteEnergyHandler remoteTile = device.getEnergyTile(worldObj); @@ -81,7 +104,7 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe if (remoteTile instanceof TileEnergyRelay) rType = 1; else rType = 0; } - + if (inView) LogHelper.info(device.energyFlow); device.beam = DraconicEvolution.proxy.energyBeam(worldObj, getBeamX(), getBeamY(), getBeamZ(), remoteTile.getBeamX(), remoteTile.getBeamY(), remoteTile.getBeamZ(), (int)device.energyFlow, getPowerTier() == 1, device.beam, true, rType); } else @@ -91,15 +114,18 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe double difference = getCapacity() - remoteTile.getCapacity(); - int energyToEqual = (int)(((difference / 100D) * (double)remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN)) / 2.1D); + int energyToEqual = (int)(((difference / 100D) * (double)remoteTile.getStorage().getMaxEnergyStored()) / 2.1D); - double maxFlow = Math.min(energyToEqual, Math.min(transferCap, remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN) - remoteTile.getEnergyStored(ForgeDirection.UNKNOWN))); + double maxFlow = Math.min(energyToEqual, Math.min(transferCap, remoteTile.getStorage().getMaxEnergyStored() - remoteTile.getStorage().getEnergyStored())); device.energyFlow = getFlow(getCapacity(), remoteTile.getCapacity()); int flow = (int) ((device.energyFlow / 100D) * maxFlow); - storage.extractEnergy(remoteTile.receiveEnergy(ForgeDirection.UNKNOWN, storage.extractEnergy(flow, true), false), false); + int transfered = storage.extractEnergy(remoteTile.getStorage().receiveEnergy(storage.extractEnergy(flow, true), false), false); + + if (inView)LogHelper.info(transfered); + device.energyFlow = Math.min(((double)transfered / 10000D) * 100D, 100D); //LogHelper.info("dif:" + difference + " flow:" + getFlow(getCapacity(), remoteTile.getCapacity()) + " EtoE:" + energyToEqual + " tfrd:" + transfered + " X:" + xCoord + " lCap:" + getCapacity() + " rCap:" + remoteTile.getCapacity() + " strd:" + storage.getEnergyStored() + " T:" + type + " mxflw:" + maxFlow); @@ -107,18 +133,21 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe //if (device.energyFlow > 0)LogHelper.info(device.energyFlow + " " + transfered); //if (device.energyFlow == 0) LogHelper.info(device.getEnergyTile(worldObj));//todo clean up detectAndSendChanges(linkedDevices.indexOf(device)); + if (inView) LogHelper.info(device.energyFlow); } } + if (inView)LogHelper.info("#######END########"); } protected void detectAndSendChanges(int index) { - if (linkedDevices.get(index).energyFlow != linkedDevices.get(index).lastTickEnergyFlow) { + 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)); linkedDevices.get(index).lastTickEnergyFlow = linkedDevices.get(index).energyFlow; } - if (getEnergyStored(ForgeDirection.UNKNOWN) != lastTickEnergy) sendObject(References.INT_ID, 1, getEnergyStored(ForgeDirection.UNKNOWN)); + if (storage.getEnergyStored() != lastTickEnergy || forceSend) sendObject(References.INT_ID, 1, storage.getEnergyStored()); } @SideOnly(Side.CLIENT) @@ -134,7 +163,7 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe @Override public double getCapacity() { - return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D; + return ((double) storage.getEnergyStored() / (double) storage.getMaxEnergyStored()) * 100D; } /**Calculates the energy flow based on the local buffer @@ -149,14 +178,25 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe return powerTier; } - public void onBlockActivated(EntityPlayer player) { + public void onBlockActivated(EntityPlayer player) + { + ItemStack wrench = player.getHeldItem(); - if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.wrench) + if (wrench != null && wrench.getItem() == Items.stick) { - ItemStack wrench = player.getHeldItem(); - NBTTagCompound linkDat = null; - if (wrench.hasTagCompound() && wrench.getTagCompound().hasKey("LinkData")) linkDat = wrench.getTagCompound().getCompoundTag("LinkData"); + for (LinkedEnergyDevice ld : linkedDevices) + { + if (ld.beam != null) LogHelper.info(ld.beam.getFlow()); + } + } + if (wrench == null || wrench.getItem() != ModItems.wrench) return; + String mode = Wrench.getMode(wrench); + NBTTagCompound linkDat = null; + if (wrench.hasTagCompound() && wrench.getTagCompound().hasKey("LinkData")) linkDat = wrench.getTagCompound().getCompoundTag("LinkData"); + + if (mode.equals(Wrench.BIND_MODE)) + { if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound")) { handleBinding(player, linkDat.getInteger("XCoord"), linkDat.getInteger("YCoord"), linkDat.getInteger("ZCoord"), true); @@ -170,34 +210,101 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe linkDat.setInteger("ZCoord", zCoord); linkDat.setBoolean("Bound", true); ItemNBTHelper.getCompound(wrench).setTag("LinkData", linkDat); - if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.posSaved")); + if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.posSaved.txt")); } } - else { - if (!player.isSneaking())receiveEnergy(ForgeDirection.UNKNOWN, 100000, false); - else extractEnergy(ForgeDirection.UNKNOWN, 100000, false); - LogHelper.info(getEnergyStored(ForgeDirection.UNKNOWN)); + else if (mode.equals(Wrench.UNBIND_MODE)) + { + if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound")) + { + for (LinkedEnergyDevice ld : linkedDevices) + { + if (ld.xCoord == linkDat.getInteger("XCoord") && ld.yCoord == linkDat.getInteger("YCoord") && ld.zCoord == linkDat.getInteger("ZCoord")) + { + + if (!(ld.getTile(worldObj) instanceof TileRemoteEnergyBase)) + { + LogHelper.error("TileRemoteEnergyBase - UNBIND - Remote tile invalid (This should be reported)"); + break; + } + + for (LinkedEnergyDevice rld : ((TileRemoteEnergyBase)ld.getTile(worldObj)).linkedDevices) + { + if (rld.xCoord == xCoord && rld.yCoord == yCoord && rld.zCoord == zCoord) + { + ((TileRemoteEnergyBase)ld.getTile(worldObj)).linkedDevices.remove(rld); + break; + } + } + + linkedDevices.remove(ld); + break; + } + } + + linkDat.setBoolean("Bound", false); + } + else + { + linkDat = new NBTTagCompound(); + linkDat.setInteger("XCoord", xCoord); + linkDat.setInteger("YCoord", yCoord); + linkDat.setInteger("ZCoord", zCoord); + linkDat.setBoolean("Bound", true); + ItemNBTHelper.getCompound(wrench).setTag("LinkData", linkDat); + if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.posSaved.txt")); + } + } + else if (mode.equals(Wrench.CLEAR_BINDINGS)) + { + for (LinkedEnergyDevice ld : linkedDevices) + { + if (!(ld.getTile(worldObj) instanceof TileRemoteEnergyBase)) + { + LogHelper.error("TileRemoteEnergyBase - UNBIND - Remote tile invalid (This should be reported)"); + break; + } + + for (LinkedEnergyDevice rld : ((TileRemoteEnergyBase)ld.getTile(worldObj)).linkedDevices) + { + if (rld.xCoord == xCoord && rld.yCoord == yCoord && rld.zCoord == zCoord) + { + ((TileRemoteEnergyBase)ld.getTile(worldObj)).linkedDevices.remove(rld); + break; + } + } + + } + + linkedDevices.clear(); + } + else + { + handleOther(player, wrench); } } @Override public boolean handleBinding(EntityPlayer player, int x, int y, int z, boolean callOther) { - int range = (powerTier + 1) * 10; + int range = (powerTier + 1) * 25; IRemoteEnergyHandler tile = worldObj.getTileEntity(x, y, z) instanceof IRemoteEnergyHandler ? (IRemoteEnergyHandler) worldObj.getTileEntity(x, y, z) : null; if (tile == null || (x == xCoord && y == yCoord && z == zCoord)) { - if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.invalidTile")); + if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.invalidTile.txt")); return false; } else if (Utills.getDistanceAtoB(xCoord, yCoord, zCoord, x, y, z) > range) { - if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.outOfRange")); + if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.outOfRange.txt")); + return false; + } + else if (linkedDevices.size() >= getMaxConnections()) + { + if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.maxConnections.txt")); return false; } - - if (callOther && !tile.handleBinding(player, xCoord, yCoord, zCoord, false)) { @@ -205,7 +312,7 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe return false; } - if (callOther && worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.linked")); + if (callOther && worldObj.isRemote) player.addChatComponentMessage(new ChatComponentTranslation("msg.de.linked.txt")); for (LinkedEnergyDevice ld : linkedDevices) { @@ -218,18 +325,23 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe return true; } + public boolean handleOther(EntityPlayer player, ItemStack wrench) { return false; } + @Override + public EnergyStorage getStorage() { + return storage; + } //************************************** @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - return storage.receiveEnergy(maxReceive, simulate); + return 0; } @Override public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - return storage.extractEnergy(maxExtract, simulate); + return 0; } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java index ee980c93..79edff13 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java @@ -224,8 +224,8 @@ public class TileEnergyStorageCore extends TileObjectSync { break; case 1: if (!testForOrActivateDraconium(xCoord + 1, yCoord, zCoord, setBlocks, activate) || !testForOrActivateDraconium(xCoord - 1, yCoord, zCoord, setBlocks, activate) || !testForOrActivateDraconium(xCoord, yCoord + 1, zCoord, setBlocks, activate) || !testForOrActivateDraconium(xCoord, yCoord - 1, zCoord, setBlocks, activate) || !testForOrActivateDraconium(xCoord, yCoord, zCoord + 1, setBlocks, activate) || !testForOrActivateDraconium(xCoord, yCoord, zCoord - 1, setBlocks, activate)) return false; - if (!isAir(xCoord+1, yCoord+1, zCoord, setBlocks) || !isAir(xCoord, yCoord+1, zCoord+1, setBlocks) || !isAir(xCoord-1, yCoord+1, zCoord, setBlocks) || !isAir(xCoord, yCoord+1, zCoord-1, setBlocks) || !isAir(xCoord+1, yCoord-1, zCoord, setBlocks) || !isAir(xCoord, yCoord-1, zCoord+1, setBlocks) || !isAir(xCoord-1, yCoord-1, zCoord, setBlocks) || !isAir(xCoord, yCoord-1, zCoord-1, setBlocks) || !isAir(xCoord+1, yCoord, zCoord+1, setBlocks) || !isAir(xCoord-1, yCoord, zCoord-1, setBlocks) || !isAir(xCoord+1, yCoord, zCoord-1, setBlocks) || !isAir(xCoord-1, yCoord, zCoord+1, setBlocks)) return false; - if (!isAir(xCoord+1, yCoord+1, zCoord+1, setBlocks) || !isAir(xCoord-1, yCoord+1, zCoord-1, setBlocks) || !isAir(xCoord+1, yCoord+1, zCoord-1, setBlocks) || !isAir(xCoord-1, yCoord+1, zCoord+1, setBlocks) || !isAir(xCoord+1, yCoord-1, zCoord+1, setBlocks) || !isAir(xCoord-1, yCoord-1, zCoord-1, setBlocks) || !isAir(xCoord+1, yCoord-1, zCoord-1, setBlocks) || !isAir(xCoord-1, yCoord-1, zCoord+1, setBlocks)) return false; + if (!isReplacable(xCoord + 1, yCoord + 1, zCoord, setBlocks) || !isReplacable(xCoord, yCoord + 1, zCoord + 1, setBlocks) || !isReplacable(xCoord - 1, yCoord + 1, zCoord, setBlocks) || !isReplacable(xCoord, yCoord + 1, zCoord - 1, setBlocks) || !isReplacable(xCoord + 1, yCoord - 1, zCoord, setBlocks) || !isReplacable(xCoord, yCoord - 1, zCoord + 1, setBlocks) || !isReplacable(xCoord - 1, yCoord - 1, zCoord, setBlocks) || !isReplacable(xCoord, yCoord - 1, zCoord - 1, setBlocks) || !isReplacable(xCoord + 1, yCoord, zCoord + 1, setBlocks) || !isReplacable(xCoord - 1, yCoord, zCoord - 1, setBlocks) || !isReplacable(xCoord + 1, yCoord, zCoord - 1, setBlocks) || !isReplacable(xCoord - 1, yCoord, zCoord + 1, setBlocks)) return false; + if (!isReplacable(xCoord + 1, yCoord + 1, zCoord + 1, setBlocks) || !isReplacable(xCoord - 1, yCoord + 1, zCoord - 1, setBlocks) || !isReplacable(xCoord + 1, yCoord + 1, zCoord - 1, setBlocks) || !isReplacable(xCoord - 1, yCoord + 1, zCoord + 1, setBlocks) || !isReplacable(xCoord + 1, yCoord - 1, zCoord + 1, setBlocks) || !isReplacable(xCoord - 1, yCoord - 1, zCoord - 1, setBlocks) || !isReplacable(xCoord + 1, yCoord - 1, zCoord - 1, setBlocks) || !isReplacable(xCoord - 1, yCoord - 1, zCoord + 1, setBlocks)) return false; break; case 2: if (!testOrActivateRect(1, 1, 1, "draconiumBlock", setBlocks, activate)) return false; @@ -266,7 +266,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int z = zCoord - zDim; z <= zCoord + zDim; z++){ if (block.equals("air")){ - if (!(x == xCoord && y == yCoord && z == zCoord) && !isAir(x, y, z, set)) return false; + if (!(x == xCoord && y == yCoord && z == zCoord) && !isReplacable(x, y, z, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && y == yCoord && z == zCoord) && !testForOrActivateRedstone(x, y, z, set, activate)) return false; @@ -290,7 +290,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (y == yCoord-size || y == yCoord+size || z == zCoord-size || z==zCoord+size) { if (block.equals("air")) { - if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !isAir(xCoord + dist, y, z, set)) + if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !isReplacable(xCoord + dist, y, z, set)) return false; } else if (block.equals("redstone")) { if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !testForOrActivateRedstone(xCoord + dist, y, z, set, activate)) @@ -310,7 +310,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (y == yCoord-size || y == yCoord+size || z == zCoord-size || z==zCoord+size) { if (block.equals("air")) { - if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !isAir(xCoord - dist, y, z, set)) + if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !isReplacable(xCoord - dist, y, z, set)) return false; } else if (block.equals("redstone")) { if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !testForOrActivateRedstone(xCoord - dist, y, z, set, activate)) @@ -331,7 +331,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (x == xCoord-size || x == xCoord+size || z == zCoord-size || z == zCoord+size) { if (block.equals("air")){ - if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !isAir(x, yCoord + dist, z, set)) return false; + if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !isReplacable(x, yCoord + dist, z, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !testForOrActivateRedstone(x, yCoord + dist, z, set, activate)) return false; @@ -351,7 +351,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (x == xCoord-size || x == xCoord+size || z == zCoord-size || z==zCoord+size) { if (block.equals("air")){ - if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !isAir(x, yCoord - dist, z, set)) return false; + if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !isReplacable(x, yCoord - dist, z, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !testForOrActivateRedstone(x, yCoord - dist, z, set, activate)) return false; @@ -372,7 +372,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (y == yCoord-size || y == yCoord+size || x == xCoord-size || x == xCoord+size) { if (block.equals("air")){ - if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !isAir(x, y, zCoord + dist, set)) return false; + if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !isReplacable(x, y, zCoord + dist, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !testForOrActivateRedstone(x, y, zCoord + dist, set, activate)) return false; @@ -392,7 +392,7 @@ public class TileEnergyStorageCore extends TileObjectSync { if (y == yCoord-size || y == yCoord+size || x == xCoord-size || x==xCoord+size) { if (block.equals("air")){ - if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !isAir(x, y, zCoord - dist, set)) return false; + if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !isReplacable(x, y, zCoord - dist, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !testForOrActivateRedstone(x, y, zCoord - dist, set, activate)) return false; @@ -416,7 +416,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int z=zCoord-1; z<=zCoord+1;z++){ if (block.equals("air")){ - if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !isAir(xCoord + dist, y, z, set)) return false; + if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !isReplacable(xCoord + dist, y, z, set)) return false; } else if (block.equals("redstone")){ if (!(xCoord + dist == xCoord && y == yCoord && z == zCoord) && !testForOrActivateRedstone(xCoord + dist, y, z, set, activate)) return false; @@ -434,7 +434,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int z=zCoord-1; z<=zCoord+1;z++){ if (block.equals("air")){ - if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !isAir(xCoord - dist, y, z, set)) return false; + if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !isReplacable(xCoord - dist, y, z, set)) return false; } else if (block.equals("redstone")){ if (!(xCoord - dist == xCoord && y == yCoord && z == zCoord) && !testForOrActivateRedstone(xCoord - dist, y, z, set, activate)) return false; @@ -453,7 +453,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int z=zCoord-1; z<=zCoord+1;z++){ if (block.equals("air")){ - if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !isAir(x, yCoord + dist, z, set)) return false; + if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !isReplacable(x, yCoord + dist, z, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && yCoord + dist == yCoord && z == zCoord) && !testForOrActivateRedstone(x, yCoord + dist, z, set, activate)) return false; @@ -471,7 +471,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int z=zCoord-1; z<=zCoord+1;z++){ if (block.equals("air")){ - if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !isAir(x, yCoord - dist, z, set)) return false; + if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !isReplacable(x, yCoord - dist, z, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && yCoord - dist == yCoord && z == zCoord) && !testForOrActivateRedstone(x, yCoord - dist, z, set, activate)) return false; @@ -490,7 +490,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int x=xCoord-1; x<=xCoord+1;x++){ if (block.equals("air")){ - if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !isAir(x, y, zCoord + dist, set)) return false; + if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !isReplacable(x, y, zCoord + dist, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && y == yCoord && zCoord + dist == zCoord) && !testForOrActivateRedstone(x, y, zCoord + dist, set, activate)) return false; @@ -508,7 +508,7 @@ public class TileEnergyStorageCore extends TileObjectSync { for (int x=xCoord-1; x<=xCoord+1;x++){ if (block.equals("air")){ - if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !isAir(x, y, zCoord - dist, set)) return false; + if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !isReplacable(x, y, zCoord - dist, set)) return false; } else if (block.equals("redstone")){ if (!(x == xCoord && y == yCoord && zCoord - dist == zCoord) && !testForOrActivateRedstone(x, y, zCoord - dist, set, activate)) return false; @@ -574,12 +574,12 @@ public class TileEnergyStorageCore extends TileObjectSync { return false; } - private boolean isAir(int x, int y, int z, boolean set){ + private boolean isReplacable(int x, int y, int z, boolean set){ if (set){ worldObj.setBlock(x, y, z, Blocks.air); return true; }else - return worldObj.getBlock(x, y, z) == Blocks.air; + return worldObj.getBlock(x, y, z).isReplaceable(worldObj, x, y, z); } public boolean isOnline(){ diff --git a/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java b/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java new file mode 100644 index 00000000..4d396cea --- /dev/null +++ b/src/main/java/com/brandon3055/draconicevolution/common/utills/UpdateChecker.java @@ -0,0 +1,43 @@ +package com.brandon3055.draconicevolution.common.utills; + +/** + * Created by Brandon on 24/02/2015. + */ +public class UpdateChecker +{ + private final UpdateCheckThread thread; + + public UpdateChecker() + { + thread = new UpdateCheckThread(); + thread.start(); + } + + + + public class UpdateCheckThread extends Thread + { + private String version; + private int snapshot; + private String note; + private boolean checkComplete = false; + private boolean checkFaild = false; + + @Override + public void run() { + LogHelper.info("Thread Run"); + try + { + LogHelper.info("Thread going to sleep"); + Thread.sleep(4000L); + LogHelper.info("Thread resuming"); + } + catch (InterruptedException e) + { + checkFaild = true; + e.printStackTrace(); + } + } + } + +} diff --git a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java index 3eccdeed..cc9f4890 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/world/DraconicWorldGenerator.java @@ -31,7 +31,7 @@ public class DraconicWorldGenerator implements IWorldGenerator { } public void generateSurface(Random random, int x, int z, World world) {// minVainSise, maxVainSize, spawnChance(Def2), minY, maxY - addOreSpawn(ModBlocks.draconiumOre, world, random, x, z, 3, 4, 2, 2, 8); + if (!ConfigHandler.disableOreSpawnOverworld) addOreSpawn(ModBlocks.draconiumOre, world, random, x, z, 3, 4, 2, 2, 8); } public void generateEnd(Random random, int x, int z, World world) { @@ -42,11 +42,11 @@ public class DraconicWorldGenerator implements IWorldGenerator { int cX = x/16; int cZ = z/16; if (ConfigHandler.generateChaosIslands && Math.sqrt(x*x + z*z) > 9000 && cX%625 == 0 && cZ%625 == 0) new WorldGenEnderIsland().generate(world, random, x1, 100 , z1); - addOreSpawn(ModBlocks.draconiumOre, world, random, x, z, 4, 5, 10, 1, 70); + if (!ConfigHandler.disableOreSpawnEnd) addOreSpawn(ModBlocks.draconiumOre, world, random, x, z, 4, 5, 10, 1, 70); } public void generateNether(final Random random, final int chunkX, final int chunkZ, final World world) { - addOreSpawn(ModBlocks.draconiumOre, world, random, chunkX, chunkZ, 3, 4, 5, 1, 125); + if (!ConfigHandler.disableOreSpawnNether) addOreSpawn(ModBlocks.draconiumOre, world, random, chunkX, chunkZ, 3, 4, 5, 1, 125); } /**Generate Ore * Block to generate diff --git a/src/main/resources/assets/draconicevolution/lang/en_US.lang b/src/main/resources/assets/draconicevolution/lang/en_US.lang index 99b0130f..3973a43a 100644 --- a/src/main/resources/assets/draconicevolution/lang/en_US.lang +++ b/src/main/resources/assets/draconicevolution/lang/en_US.lang @@ -75,6 +75,18 @@ tile.draconicevolution:draconiumChest.description=Using your draconic knowledge tile.draconicevolution:draconicBlock.name=Awakened Draconium Block tile.draconicevolution:draconicBlock.description=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) +tile.draconicevolution:energyCrystal0.name=Energy Relay [WIP] +tile.draconicevolution:energyCrystal0.description= + +tile.draconicevolution:energyCrystal1.name=Advanced Energy Relay [WIP] +tile.draconicevolution:energyCrystal1.description= + +tile.draconicevolution:energyCrystal2.name=Energy Transceiver [WIP] +tile.draconicevolution:energyCrystal2.description= + +tile.draconicevolution:energyCrystal3.name=Advanced Energy Transceiver [WIP] +tile.draconicevolution:energyCrystal3.description= + //Item Information ---------------------------------------------------------------------------------------------------------------------------------------- item.draconicevolution:awakenedCore.name=Awakened Core @@ -205,6 +217,10 @@ item.draconicevolution:creativeStructureSpawnerEnderIsland.name=Spawn Ender Isla item.draconicevolution:infoTablet.name=Draconic Evolution Information Tablet +item.draconicevolution:wrench.name=Crystal Wrench [WIP] +item.draconicevolution:wrench.description= + + //Item Groups ---------------------------------------------------------------------------------------------------------------------------------------- itemGroup.toolsAndWeapons=Draconic Evolution Tools & Weapons itemGroup.blocksAndItems=Draconic Evolution Blocks & Items @@ -262,6 +278,20 @@ msg.draconiumChestEditL4.txt=Right click with paper to copy the colour to other msg.draconiumChestEdit2.txt=Please use a single peace of paper msg.de.dragonDeath.txt=§5The heart is temporarily awakened by the dragons explosive §5death +//Energy Net +msg.de.wrenchMode.bind.txt=Function: Bind +msg.de.wrenchMode.unBind.txt=Function: Un-Bind +msg.de.wrenchMode.unBindAll.txt=Function: Un-Bind All +msg.de.wrenchMode.modeSwitch.txt=Function: Mode Change +msg.de.rightClickUnbind.txt=Right click air to un-bind +msg.de.boundTo.txt=Bound To +msg.de.posSaved.txt=Position Saved +msg.de.invalidTile.txt=Target Invalid +msg.de.outOfRange.txt=Target out of range +msg.de.maxConnections.txt=Connection limit reached +msg.de.linked.txt=Devices Linked + + //Tool Tips ---------------------------------------------------------------------------------------------------------------------------------------- info.teleporterInfUnset1.txt=Unbound info.teleporterInfUnset2.txt=Shift right click to bind your current @@ -321,6 +351,13 @@ info.de.hudDisplayConfigTxt3.txt=################### info.de.hudDisplayConfigInfo1.txt=Click and drag HUD info.de.hudDisplayConfigInfo2.txt=to change location +//Energy Net +info.de.modeIn.txt=Mode: Input +info.de.modeOut.txt=Mode: Output +info.de.5xTransfer.txt= (5x Transfer) +info.de.connections.txt=Connections + + enchantment.draconicevolution.reaperEnchant=Reaper //Achievements ---------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/main/resources/assets/draconicevolution/textures/particle/particles.png b/src/main/resources/assets/draconicevolution/textures/particle/particles.png index 76626c3f22aa408a5819d7df1cb3297afd7667b8..8368455e4d1d915ac730c67738aed88691338d96 100644 GIT binary patch delta 33268 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 Z`~#7iE?Bet24VmJ002ovPDHLkV1ms;)};Ud delta 33232 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