mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-11-20 20:22:10 +00:00
16/02/2015
This commit is contained in:
1 parent
d088e586c2
commit
73e7fb5663
12 files changed
+499
-257
No files matched your search
@@ -6,10 +6,7 @@ import com.brandon3055.draconicevolution.client.handler.HudHandler;
|
||||
import com.brandon3055.draconicevolution.client.handler.ParticleHandler;
|
||||
import com.brandon3055.draconicevolution.client.keybinding.KeyBindings;
|
||||
import com.brandon3055.draconicevolution.client.keybinding.KeyInputHandler;
|
||||
import com.brandon3055.draconicevolution.client.render.block.RenderDraconiumChest;
|
||||
import com.brandon3055.draconicevolution.client.render.block.RenderEnergyInfuser;
|
||||
import com.brandon3055.draconicevolution.client.render.block.RenderParticleGen;
|
||||
import com.brandon3055.draconicevolution.client.render.block.RenderTeleporterStand;
|
||||
import com.brandon3055.draconicevolution.client.render.block.*;
|
||||
import com.brandon3055.draconicevolution.client.render.entity.RenderDragon;
|
||||
import com.brandon3055.draconicevolution.client.render.entity.RenderDragonHeart;
|
||||
import com.brandon3055.draconicevolution.client.render.item.RenderBow;
|
||||
@@ -25,6 +22,7 @@ import com.brandon3055.draconicevolution.common.entity.EntityDragonHeart;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
|
||||
import cpw.mods.fml.client.FMLClientHandler;
|
||||
@@ -129,6 +127,7 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.draconiumChest), new RenderDraconiumChest());
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.particleGenerator), new RenderParticleGen());
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyInfuser), new RenderEnergyInfuser());
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.energyCrystal), new RenderCrystal());
|
||||
|
||||
//ISimpleBlockRendering
|
||||
RenderingRegistry.registerBlockHandler(new RenderTeleporterStand());
|
||||
@@ -145,6 +144,7 @@ public class ClientProxy extends CommonProxy {
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileTeleporterStand.class, new RenderTileTeleporterStand());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileDraconiumChest.class, new RenderTileDraconiumChest());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyRelay.class, new RenderTileCrystal());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyTransceiver.class, new RenderTileCrystal());
|
||||
|
||||
//Entitys
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCustomDragon.class, new RenderDragon());
|
||||
@@ -161,7 +161,7 @@ public class ClientProxy extends CommonProxy {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render) {
|
||||
public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render, int beamType) {
|
||||
if (!worldObj.isRemote) return null;
|
||||
ParticleEnergyBeam beam = oldBeam;
|
||||
boolean inRange = ParticleHandler.isInRange(x, y, z, 50) || ParticleHandler.isInRange(tx, ty, tz, 50);
|
||||
@@ -170,7 +170,7 @@ public class ClientProxy extends CommonProxy {
|
||||
{
|
||||
if (inRange)
|
||||
{
|
||||
beam = new ParticleEnergyBeam(worldObj, x, y, z, tx, ty, tz, 8, powerFlow, advanced, 3);
|
||||
beam = new ParticleEnergyBeam(worldObj, x, y, z, tx, ty, tz, 8, powerFlow, advanced, beamType);
|
||||
|
||||
FMLClientHandler.instance().getClient().effectRenderer.addEffect(beam);
|
||||
}
|
||||
|
||||
+33
-17
@@ -1,6 +1,7 @@
|
||||
package com.brandon3055.draconicevolution.client.handler;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.items.weapons.DraconicBow;
|
||||
import com.brandon3055.draconicevolution.common.items.weapons.WyvernBow;
|
||||
import com.brandon3055.draconicevolution.common.network.MountUpdatePacket;
|
||||
@@ -30,30 +31,45 @@ public class ClientEventHandler {
|
||||
private static int remountEntityID = 0;
|
||||
public static float energyCrystalAlphaValue = 0f;
|
||||
public static float energyCrystalAlphaTarget = 0f;
|
||||
public static boolean playerHoldingWrench = false;
|
||||
public static Minecraft mc;
|
||||
private static Random rand = new Random();
|
||||
|
||||
@SubscribeEvent
|
||||
public void tickEnd(TickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.START || event.type != TickEvent.Type.CLIENT || event.side != Side.CLIENT) return;
|
||||
elapsedTicks++;
|
||||
HudHandler.clientTick();
|
||||
|
||||
if (bowZoom && !lastTickBowZoom){
|
||||
previousSensitivity = Minecraft.getMinecraft().gameSettings.mouseSensitivity;
|
||||
Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity / 3;
|
||||
}else if (!bowZoom && lastTickBowZoom){
|
||||
Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity;
|
||||
if (mc == null) mc = Minecraft.getMinecraft();
|
||||
else if (mc.theWorld != null)
|
||||
{
|
||||
mc.theWorld.theProfiler.startSection("DE Client Tick Handler");
|
||||
|
||||
elapsedTicks++;
|
||||
HudHandler.clientTick();
|
||||
|
||||
if (bowZoom && !lastTickBowZoom)
|
||||
{
|
||||
previousSensitivity = Minecraft.getMinecraft().gameSettings.mouseSensitivity;
|
||||
Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity / 3;
|
||||
} else if (!bowZoom && lastTickBowZoom)
|
||||
{
|
||||
Minecraft.getMinecraft().gameSettings.mouseSensitivity = previousSensitivity;
|
||||
}
|
||||
|
||||
lastTickBowZoom = bowZoom;
|
||||
if (elapsedTicks - tickSet > 10) bowZoom = false;
|
||||
|
||||
if (energyCrystalAlphaValue < energyCrystalAlphaTarget) energyCrystalAlphaValue += 0.01f;
|
||||
if (energyCrystalAlphaValue > energyCrystalAlphaTarget) energyCrystalAlphaValue -= 0.01f;
|
||||
|
||||
if (Math.abs(energyCrystalAlphaTarget - energyCrystalAlphaValue) <= 0.02f) energyCrystalAlphaTarget = rand.nextFloat();
|
||||
|
||||
playerHoldingWrench = mc.thePlayer.getHeldItem() != null && mc.thePlayer.getHeldItem().getItem() == ModItems.wrench;
|
||||
|
||||
searchForPlayerMount();
|
||||
|
||||
mc.theWorld.theProfiler.endSection();
|
||||
}
|
||||
|
||||
lastTickBowZoom = bowZoom;
|
||||
if (elapsedTicks - tickSet > 10) bowZoom = false;
|
||||
|
||||
if (energyCrystalAlphaValue < energyCrystalAlphaTarget) energyCrystalAlphaValue += 0.01f;
|
||||
if (energyCrystalAlphaValue > energyCrystalAlphaTarget) energyCrystalAlphaValue -= 0.01f;
|
||||
|
||||
if (Math.abs(energyCrystalAlphaTarget - energyCrystalAlphaValue) <= 0.02f) energyCrystalAlphaTarget = rand.nextFloat();
|
||||
|
||||
searchForPlayerMount();
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
+62
@@ -0,0 +1,62 @@
|
||||
package com.brandon3055.draconicevolution.client.render.block;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 16/02/2015.
|
||||
*/
|
||||
public class RenderCrystal implements IItemRenderer {
|
||||
|
||||
private TileEnergyRelay relay1;
|
||||
private TileEnergyRelay relay2;
|
||||
private TileEnergyTransceiver transceiver1;
|
||||
private TileEnergyTransceiver transceiver2;
|
||||
|
||||
public RenderCrystal() {
|
||||
relay1 = new TileEnergyRelay(0);
|
||||
relay2 = new TileEnergyRelay(1);
|
||||
transceiver1 = new TileEnergyTransceiver(0);
|
||||
transceiver2 = new TileEnergyTransceiver(1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data)
|
||||
{
|
||||
GL11.glPushMatrix();
|
||||
GL11.glScalef(1.8F, 1.8F, 1.8F);
|
||||
if (type == ItemRenderType.ENTITY)
|
||||
{
|
||||
GL11.glTranslatef(-0.5F, 0.0F, -0.5F);
|
||||
}
|
||||
else if (type == ItemRenderType.EQUIPPED)
|
||||
{
|
||||
GL11.glRotated(45, -1, 0, 1);
|
||||
if (item.getItemDamage() < 2) GL11.glTranslatef(0.0F, -0.3F, 0.0F);
|
||||
else GL11.glTranslatef(0.0F, -0.6F, 0.0F);
|
||||
}
|
||||
int meta = item.getItemDamage();
|
||||
TileEntityRendererDispatcher.instance.renderTileEntityAt(meta == 0 ? relay1 : meta == 1 ? relay2 : meta == 2 ? transceiver1 : transceiver2, 0.0D, 0.0D, 0.0D, 0.0F);
|
||||
GL11.glPopMatrix();
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
}
|
||||
}
|
||||
-3
@@ -35,7 +35,4 @@ public class RenderEnergyInfuser implements IItemRenderer
|
||||
GL11.glTranslatef(-0.5F, 0.0F, -0.5F);
|
||||
TileEntityRendererDispatcher.instance.renderTileEntityAt(tile, 0.0D, 0.0D, 0.0D, 0.0F);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
+26
-12
@@ -1,5 +1,6 @@
|
||||
package com.brandon3055.draconicevolution.client.render.particle;
|
||||
|
||||
import com.brandon3055.draconicevolution.client.handler.ClientEventHandler;
|
||||
import com.brandon3055.draconicevolution.client.handler.ResourceHelper;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.Utills;
|
||||
@@ -164,17 +165,6 @@ public class ParticleEnergyBeam extends EntityFX {
|
||||
double var44 = -0.15D * (double)size;
|
||||
double var17 = 0.15D * (double)size;
|
||||
|
||||
// if (offset == -1)
|
||||
// {
|
||||
// offset = rp / 90F * 0.3f;
|
||||
// LogHelper.info(offset);
|
||||
// }
|
||||
//
|
||||
//
|
||||
//
|
||||
//// GL11.glTranslated(0, 0.4 - Math.abs(offset) / 1.8, -offset);
|
||||
// GL11.glTranslated(0, 0.16 + Math.abs(offset), 0);
|
||||
|
||||
|
||||
for(int t = 0; t < 2; ++t) {
|
||||
double var29 = (double)(this.length * var9);
|
||||
@@ -194,6 +184,31 @@ public class ParticleEnergyBeam extends EntityFX {
|
||||
GL11.glRotatef(t * 90.0F, 0.0F, -1.0F, 0.0F);
|
||||
}
|
||||
|
||||
if (ClientEventHandler.playerHoldingWrench)
|
||||
{
|
||||
var44 = -0.15D * (double)1;
|
||||
var17 = 0.15D * (double)1;
|
||||
|
||||
//GL11.glColor4f(1f, 1f, 1f, 1f);
|
||||
for(int t = 0; t < 2; ++t) {
|
||||
double var29 = (double)(this.length * var9);
|
||||
double var31 = 0D;
|
||||
double var33 = 1D;
|
||||
double var35 = (double)(-1.0F + var12 + (float)t / 3.0F);
|
||||
double var37 = (double)(this.length * var9) + var35;
|
||||
GL11.glRotatef(t * 90.0F, 0.0F, 1.0F, 0.0F);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setBrightness(200);
|
||||
tessellator.setColorRGBA_F(0f, 1f, 0f, 1f);
|
||||
tessellator.addVertexWithUV(var44, var29, 0.0D, var33, var37);
|
||||
tessellator.addVertexWithUV(var44, 0.0D, 0.0D, var33, var35);
|
||||
tessellator.addVertexWithUV(var17, 0.0D, 0.0D, var31, var35);
|
||||
tessellator.addVertexWithUV(var17, var29, 0.0D, var31, var37);
|
||||
tessellator.draw();
|
||||
GL11.glRotatef(t * 90.0F, 0.0F, -1.0F, 0.0F);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
GL11.glDepthMask(true);
|
||||
GL11.glBlendFunc(770, 771);
|
||||
@@ -201,7 +216,6 @@ public class ParticleEnergyBeam extends EntityFX {
|
||||
GL11.glPopAttrib();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
//renderParticleRing(tessellator, partialTick, rotX, rotXZ, rotZ, rotYZ, rotXY);
|
||||
|
||||
ResourceHelper.bindDefaultParticles();
|
||||
tessellator.startDrawingQuads();
|
||||
|
||||
+58
-9
@@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.client.render.tile;
|
||||
import com.brandon3055.draconicevolution.client.handler.ClientEventHandler;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -27,19 +28,22 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer {
|
||||
private static ResourceLocation beamTexture = new ResourceLocation(References.MODID.toLowerCase(), "textures/models/EnergyBeam.png");
|
||||
|
||||
|
||||
private IModelCustom model;
|
||||
private IModelCustom modelCrystal;
|
||||
private IModelCustom modelCrystalTransceiver;
|
||||
|
||||
public RenderTileCrystal(){
|
||||
model = AdvancedModelLoader.loadModel(new ResourceLocation(References.MODID.toLowerCase(), "models/Crystal.obj"));
|
||||
modelCrystal = AdvancedModelLoader.loadModel(new ResourceLocation(References.MODID.toLowerCase(), "models/Crystal.obj"));
|
||||
modelCrystalTransceiver = AdvancedModelLoader.loadModel(new ResourceLocation(References.MODID.toLowerCase(), "models/CrystalTransceiver.obj"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) {
|
||||
if (tileEntity instanceof TileEnergyRelay) renderTileEntityAt((TileEnergyRelay)tileEntity, x, y, z, partialTick);
|
||||
if (tileEntity instanceof TileEnergyRelay) renderEnergyRelay((TileEnergyRelay) tileEntity, x, y, z, partialTick);
|
||||
else if (tileEntity instanceof TileEnergyTransceiver) renderTransceiver((TileEnergyTransceiver) tileEntity, x, y, z, partialTick);
|
||||
}
|
||||
|
||||
|
||||
public void renderTileEntityAt(TileEnergyRelay tileEntity, double x, double y, double z, float partialTick) {
|
||||
public void renderEnergyRelay(TileEnergyRelay tileEntity, double x, double y, double z, float partialTick) {
|
||||
//--- Pre Render ---//
|
||||
tileEntity.inView = 10;
|
||||
GL11.glPushMatrix();
|
||||
@@ -54,19 +58,19 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer {
|
||||
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
|
||||
|
||||
//--- Render Bottom Layer ---//
|
||||
if (tileEntity.getType() == 0) bindTexture(crystalBlue);
|
||||
if (tileEntity.getPowerTier() == 0) bindTexture(crystalBlue);
|
||||
else bindTexture(crystalRed);
|
||||
|
||||
model.renderAll();
|
||||
modelCrystal.renderAll();
|
||||
|
||||
|
||||
//--- Render Alpha Overlay ---//
|
||||
if (tileEntity.getType() == 0) bindTexture(crystalBlueAlpha);
|
||||
if (tileEntity.getPowerTier() == 0) bindTexture(crystalBlueAlpha);
|
||||
else bindTexture(crystalRedAlpha);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.5f + ClientEventHandler.energyCrystalAlphaValue * 0.5f);
|
||||
|
||||
model.renderAll();
|
||||
modelCrystal.renderAll();
|
||||
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
@@ -75,7 +79,52 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer {
|
||||
bindTexture(texrure);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, outerLight, outerLight);
|
||||
|
||||
model.renderAll();
|
||||
modelCrystal.renderAll();
|
||||
|
||||
|
||||
//--- Post Render ---//
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
|
||||
public void renderTransceiver(TileEnergyTransceiver tileEntity, double x, double y, double z, float partialTick) {
|
||||
//--- Pre Render ---//
|
||||
tileEntity.inView = 10;
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
|
||||
GL11.glScalef(0.5f, 0.5f, 0.5f);
|
||||
//GL11.glDisable(GL11.GL_LIGHTING); //todo disable?
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
float innerLight = 100f;
|
||||
float outerLight = 140f + ClientEventHandler.energyCrystalAlphaValue * 40F;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, innerLight, innerLight);
|
||||
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
|
||||
|
||||
//--- Render Bottom Layer ---//
|
||||
if (tileEntity.getPowerTier() == 0) bindTexture(crystalBlue);
|
||||
else bindTexture(crystalRed);
|
||||
|
||||
modelCrystalTransceiver.renderAll();
|
||||
|
||||
|
||||
//--- Render Alpha Overlay ---//
|
||||
if (tileEntity.getPowerTier() == 0) bindTexture(crystalBlueAlpha);
|
||||
else bindTexture(crystalRedAlpha);
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.5f + ClientEventHandler.energyCrystalAlphaValue * 0.5f);
|
||||
|
||||
modelCrystalTransceiver.renderAll();
|
||||
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
|
||||
|
||||
//--- Render Overlay ---//
|
||||
bindTexture(texrure);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, outerLight, outerLight);
|
||||
|
||||
modelCrystalTransceiver.renderAll();
|
||||
|
||||
|
||||
//--- Post Render ---//
|
||||
|
||||
@@ -18,6 +18,7 @@ import com.brandon3055.draconicevolution.common.magic.PotionHandler;
|
||||
import com.brandon3055.draconicevolution.common.network.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnderResurrection;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
|
||||
@@ -134,6 +135,7 @@ public abstract class CommonProxy {
|
||||
GameRegistry.registerTileEntity(TileTeleporterStand.class, References.RESOURCESPREFIX + "TileTeleporterStand");
|
||||
GameRegistry.registerTileEntity(TileDraconiumChest.class, References.RESOURCESPREFIX + "TileDraconiumChest");
|
||||
GameRegistry.registerTileEntity(TileEnergyRelay.class, References.RESOURCESPREFIX + "TileEnergyRelay");
|
||||
GameRegistry.registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver");
|
||||
if (DraconicEvolution.debug) {
|
||||
GameRegistry.registerTileEntity(TileTestBlock.class, References.RESOURCESPREFIX + "TileTestBlock");
|
||||
GameRegistry.registerTileEntity(TileContainerTemplate.class, References.RESOURCESPREFIX + "TileContainerTemplate");
|
||||
@@ -170,7 +172,7 @@ public abstract class CommonProxy {
|
||||
return FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
}
|
||||
|
||||
public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render)
|
||||
public ParticleEnergyBeam energyBeam(World worldObj, double x, double y, double z, double tx, double ty, double tz, int powerFlow, boolean advanced, ParticleEnergyBeam oldBeam, boolean render, int beamType)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
+11
-10
@@ -6,10 +6,7 @@ import com.brandon3055.draconicevolution.common.blocks.BlockDE;
|
||||
import com.brandon3055.draconicevolution.common.blocks.itemblocks.EnergyCrystalItemBlock;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.lib.Strings;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.IRemoteEnergyHandler;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.LinkedEnergyDevice;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileRemoteEnergyBase;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.*;
|
||||
import com.brandon3055.draconicevolution.common.utills.IHudDisplayBlock;
|
||||
import com.brandon3055.draconicevolution.common.utills.InfoHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -34,8 +31,10 @@ import java.util.List;
|
||||
*/
|
||||
public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
{
|
||||
public static final byte RELAY_TIER_1 = 0;
|
||||
public static final byte RELAY_TIER_2 = 1;
|
||||
public static final byte RELAY_TIER_1 = 0;
|
||||
public static final byte RELAY_TIER_2 = 1;
|
||||
public static final byte TRANSCEIVER_TIER_1 = 2;
|
||||
public static final byte TRANSCEIVER_TIER_2 = 3;
|
||||
|
||||
public EnergyCrystal()
|
||||
{
|
||||
@@ -52,6 +51,8 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
public void getSubBlocks(Item item, CreativeTabs p_149666_2_, List list) {
|
||||
list.add(new ItemStack(item, 1, 0));
|
||||
list.add(new ItemStack(item, 1, 1));
|
||||
list.add(new ItemStack(item, 1, 2));
|
||||
list.add(new ItemStack(item, 1, 3));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -62,12 +63,12 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
|
||||
@Override
|
||||
public boolean hasTileEntity(int metadata) {
|
||||
return metadata == 0 || metadata == 1;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, int metadata) {
|
||||
return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : null;
|
||||
return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : metadata == 2 || metadata == 3 ? new TileEnergyTransceiver(metadata - 2) : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -115,9 +116,9 @@ 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 TileEnergyRelay)
|
||||
if (tile instanceof TileRemoteEnergyBase)
|
||||
{
|
||||
for (LinkedEnergyDevice l : ((TileEnergyRelay) tile).linkedDevices)
|
||||
for (LinkedEnergyDevice l : ((TileRemoteEnergyBase) tile).linkedDevices)
|
||||
{
|
||||
list.add(l.toString());
|
||||
}
|
||||
|
||||
+24
-190
@@ -2,251 +2,85 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyRing;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.DataUtills;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.Utills;
|
||||
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.ChatComponentText;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 10/02/2015.
|
||||
*/
|
||||
public class TileEnergyRelay extends TileRemoteEnergyBase {
|
||||
|
||||
/**The tier of the relay (0-1)*/
|
||||
private int type;
|
||||
private int lastTickEnergy;
|
||||
public byte inView = 0;
|
||||
private ParticleEnergyRing ring;
|
||||
public List<LinkedEnergyDevice> linkedDevices = new ArrayList<LinkedEnergyDevice>();
|
||||
|
||||
public TileEnergyRelay(){}
|
||||
|
||||
public TileEnergyRelay(int type){
|
||||
this.type = type;
|
||||
if (type == 0) this.setStorage(50000, 50000, 50000);
|
||||
else this.setStorage(500000, 500000, 500000);
|
||||
public TileEnergyRelay(int powerTier){
|
||||
this.powerTier = powerTier;
|
||||
this.updateStorage();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getCap() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockActivated(EntityPlayer player) {
|
||||
|
||||
if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.wrench)
|
||||
{
|
||||
ItemStack wrench = player.getHeldItem();
|
||||
NBTTagCompound linkDat = null;
|
||||
if (wrench.hasTagCompound() && wrench.getTagCompound().hasKey("LinkData")) linkDat = wrench.getTagCompound().getCompoundTag("LinkData");
|
||||
|
||||
if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound"))
|
||||
{
|
||||
handleBinding(player, linkDat.getInteger("XCoord"), linkDat.getInteger("YCoord"), linkDat.getInteger("ZCoord"), true);
|
||||
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 ChatComponentText("txt.posSaved"));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!player.isSneaking())receiveEnergy(ForgeDirection.UNKNOWN, 100000, false);
|
||||
else extractEnergy(ForgeDirection.UNKNOWN, 100000, false);
|
||||
}
|
||||
public int getRec() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleBinding(EntityPlayer player, int x, int y, int z, boolean callOther)
|
||||
{
|
||||
int range = (type + 1) * 10;
|
||||
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"));
|
||||
return false;
|
||||
}
|
||||
else if (Utills.getDistanceAtoB(xCoord, yCoord, zCoord, x, y, z) > range)
|
||||
{
|
||||
if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.outOfRange"));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (callOther && !tile.handleBinding(player, xCoord, yCoord, zCoord, false))
|
||||
{
|
||||
LogHelper.info("other Invalid");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (callOther && worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.linked"));
|
||||
|
||||
for (LinkedEnergyDevice ld : linkedDevices)
|
||||
{
|
||||
if (ld.xCoord == x && ld.yCoord == y && ld.zCoord == z) return true;
|
||||
}
|
||||
|
||||
linkedDevices.add(new LinkedEnergyDevice(x, y, z, null));
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
|
||||
return true;
|
||||
public int getExt() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
updateLinkedDevices();
|
||||
super.updateEntity();
|
||||
|
||||
if (worldObj.isRemote)
|
||||
{
|
||||
|
||||
if (inView > 0) --inView;
|
||||
|
||||
|
||||
ring = DraconicEvolution.proxy.energyRing(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 0, type == 1, ring, inView > 0);
|
||||
ring = DraconicEvolution.proxy.energyRing(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 0, powerTier == 1, ring, inView > 0);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
super.updateEntity();
|
||||
}
|
||||
|
||||
private void updateLinkedDevices()
|
||||
{
|
||||
//LogHelper.info(storage.getEnergyStored());
|
||||
for (LinkedEnergyDevice device : linkedDevices)
|
||||
{
|
||||
if (!device.isValid(worldObj)) {
|
||||
linkedDevices.remove(device);
|
||||
updateLinkedDevices();
|
||||
return;
|
||||
}
|
||||
|
||||
if (worldObj.isRemote)
|
||||
{
|
||||
device.beam = DraconicEvolution.proxy.energyBeam(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, device.xCoord + 0.5, device.yCoord + 0.5, device.zCoord + 0.5, (int)device.energyFlow, getType() == 1, device.beam, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
int transferCap = 10000 + type * 90000;
|
||||
IRemoteEnergyHandler remoteTile = device.getEnergyTile(worldObj);
|
||||
double difference = getCapacity() - remoteTile.getCapacity();
|
||||
|
||||
|
||||
int energyToEqual = (int)(((difference / 100D) * (double)remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN)) / 2.1D);
|
||||
|
||||
double maxFlow = Math.min(energyToEqual, Math.min(transferCap, remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN) - remoteTile.getEnergyStored(ForgeDirection.UNKNOWN)));
|
||||
|
||||
device.energyFlow = getFlow(getCapacity(), remoteTile.getCapacity());
|
||||
int flow = (int) ((device.energyFlow / 100D) * maxFlow);
|
||||
|
||||
|
||||
int transfered = storage.extractEnergy(remoteTile.receiveEnergy(ForgeDirection.UNKNOWN, storage.extractEnergy(flow, true), false), false);
|
||||
|
||||
//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);
|
||||
|
||||
//LogHelper.info(flow + " " + transfered + " " + getEnergyStored(ForgeDirection.UNKNOWN));
|
||||
//if (device.energyFlow > 0)LogHelper.info(device.energyFlow + " " + transfered);
|
||||
//if (device.energyFlow == 0) LogHelper.info(device.getEnergyTile(worldObj));
|
||||
detectAndSendChanges(linkedDevices.indexOf(device));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void detectAndSendChanges(int index)
|
||||
{
|
||||
if (linkedDevices.get(index).energyFlow != linkedDevices.get(index).lastTickEnergyFlow) {
|
||||
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));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void receiveObject(int index, Object object) {
|
||||
if (index == 0 && object instanceof DataUtills.TwoXInteger && linkedDevices.size() > ((DataUtills.TwoXInteger) object).i1)
|
||||
{
|
||||
linkedDevices.get(((DataUtills.TwoXInteger) object).i1).energyFlow = ((DataUtills.TwoXInteger) object).i2;
|
||||
}
|
||||
else if (index == 1) storage.setEnergyStored((Integer)object);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound compound) {
|
||||
compound.setByte("Type", (byte)type);
|
||||
int index = 0;
|
||||
compound.setInteger("LinkCount", linkedDevices.size());
|
||||
for (LinkedEnergyDevice ld : linkedDevices)
|
||||
{
|
||||
ld.writeToNBT(compound, "LinkedDevice_" + index);
|
||||
++index;
|
||||
}
|
||||
super.writeToNBT(compound);
|
||||
storage.writeToNBT(compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound compound) {
|
||||
type = compound.getByte("Type");
|
||||
if (type == 0) this.setStorage(50000, 50000, 50000);
|
||||
else this.setStorage(500000, 500000, 500000);
|
||||
int linkCount = compound.getInteger("LinkCount");
|
||||
linkedDevices = new ArrayList<LinkedEnergyDevice>();
|
||||
for (int i = 0; i < linkCount; i++)
|
||||
{
|
||||
linkedDevices.add(new LinkedEnergyDevice().readFromNBT(compound, "LinkedDevice_" + i));
|
||||
}
|
||||
super.readFromNBT(compound);
|
||||
storage.readFromNBT(compound);
|
||||
}
|
||||
|
||||
public int getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getCapacity() {
|
||||
return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D;
|
||||
}
|
||||
// @Override
|
||||
// public double getCapacity() {
|
||||
// return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D;
|
||||
// }
|
||||
|
||||
/**Calculates the energy flow based on the local buffer
|
||||
* and the remote buffer
|
||||
*return double between 0 to 100*/
|
||||
private double getFlow(double localCap, double remoteCap)
|
||||
public double getFlow(double localCap, double remoteCap)
|
||||
{
|
||||
return Math.max(0, Math.min(100, (localCap - remoteCap) * 10D));
|
||||
return Math.max(0, Math.min(100, (localCap - remoteCap) * 10D/*Flow Multiplier*/));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamX() {
|
||||
return 0.5D;
|
||||
return xCoord + 0.5D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamY() {
|
||||
return 0.5D;
|
||||
return yCoord + 0.5D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamZ() {
|
||||
return 0.5D;
|
||||
return zCoord + 0.5D;
|
||||
}
|
||||
}
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
package com.brandon3055.draconicevolution.common.tileentities.energynet;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 16/02/2015.
|
||||
*/
|
||||
public class TileEnergyTransceiver extends TileRemoteEnergyBase{
|
||||
|
||||
public TileEnergyTransceiver() {}
|
||||
|
||||
public TileEnergyTransceiver(int powerTier)
|
||||
{
|
||||
this.powerTier = powerTier;
|
||||
this.updateStorage();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public double getBeamX() {
|
||||
return xCoord + 0.5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamY() {
|
||||
return yCoord + 0.5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamZ() {
|
||||
return zCoord + 0.5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getCap() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRec() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getExt() {
|
||||
return 50000 + (powerTier * 450000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound compound) {
|
||||
super.writeToNBT(compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound compound) {
|
||||
super.readFromNBT(compound);
|
||||
}
|
||||
}
|
||||
+218
-9
@@ -1,33 +1,226 @@
|
||||
package com.brandon3055.draconicevolution.common.tileentities.energynet;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync;
|
||||
import com.brandon3055.draconicevolution.common.utills.EnergyStorage;
|
||||
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.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.ChatComponentText;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 10/02/2015.
|
||||
*/
|
||||
public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRemoteEnergyHandler {
|
||||
|
||||
/**The tier of the relay (0-1)*/
|
||||
protected int powerTier;
|
||||
protected EnergyStorage storage = new EnergyStorage(0);
|
||||
public List<LinkedEnergyDevice> linkedDevices = new ArrayList<LinkedEnergyDevice>();
|
||||
protected int lastTickEnergy;
|
||||
|
||||
public void setStorage(int cap, int extract, int receive)
|
||||
public byte inView = 0;
|
||||
|
||||
public void updateStorage()
|
||||
{
|
||||
storage.setCapacity(cap);
|
||||
storage.setMaxExtract(extract);
|
||||
storage.setMaxReceive(receive);
|
||||
storage.setCapacity(getCap());
|
||||
storage.setMaxExtract(getExt());
|
||||
storage.setMaxReceive(getRec());
|
||||
}
|
||||
|
||||
public void onBlockActivated(EntityPlayer player)
|
||||
{
|
||||
public abstract int getCap();
|
||||
|
||||
public abstract int getRec();
|
||||
|
||||
public abstract int getExt();
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
updateLinkedDevices();
|
||||
|
||||
if (worldObj.isRemote && inView > 0) --inView;
|
||||
}
|
||||
|
||||
//**********Distribution Logic**********
|
||||
|
||||
private void updateLinkedDevices()
|
||||
{
|
||||
//LogHelper.info(storage.getEnergyStored());
|
||||
for (LinkedEnergyDevice device : linkedDevices)
|
||||
{
|
||||
if (!device.isValid(worldObj)) {
|
||||
linkedDevices.remove(device);
|
||||
updateLinkedDevices();
|
||||
return;
|
||||
}
|
||||
|
||||
IRemoteEnergyHandler remoteTile = device.getEnergyTile(worldObj);
|
||||
|
||||
if (worldObj.isRemote)
|
||||
{
|
||||
int rType = 0;
|
||||
if (this instanceof TileEnergyRelay)
|
||||
{
|
||||
if (remoteTile instanceof TileEnergyTransceiver) rType = 2;
|
||||
else rType = 3;
|
||||
}
|
||||
else if (this instanceof TileEnergyTransceiver)
|
||||
{
|
||||
if (remoteTile instanceof TileEnergyRelay) rType = 1;
|
||||
else rType = 0;
|
||||
}
|
||||
|
||||
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
|
||||
{
|
||||
int transferCap = storage.getMaxExtract();
|
||||
|
||||
double difference = getCapacity() - remoteTile.getCapacity();
|
||||
|
||||
|
||||
int energyToEqual = (int)(((difference / 100D) * (double)remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN)) / 2.1D);
|
||||
|
||||
double maxFlow = Math.min(energyToEqual, Math.min(transferCap, remoteTile.getMaxEnergyStored(ForgeDirection.UNKNOWN) - remoteTile.getEnergyStored(ForgeDirection.UNKNOWN)));
|
||||
|
||||
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);
|
||||
|
||||
//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);
|
||||
|
||||
//LogHelper.info(flow + " " + transfered + " " + getEnergyStored(ForgeDirection.UNKNOWN));
|
||||
//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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected void detectAndSendChanges(int index)
|
||||
{
|
||||
if (linkedDevices.get(index).energyFlow != linkedDevices.get(index).lastTickEnergyFlow) {
|
||||
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));
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void receiveObject(int index, Object object) {
|
||||
if (index == 0 && object instanceof DataUtills.TwoXInteger && linkedDevices.size() > ((DataUtills.TwoXInteger) object).i1)
|
||||
{
|
||||
linkedDevices.get(((DataUtills.TwoXInteger) object).i1).energyFlow = ((DataUtills.TwoXInteger) object).i2;
|
||||
}
|
||||
else if (index == 1) storage.setEnergyStored((Integer)object);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public double getCapacity() {
|
||||
return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D;
|
||||
}
|
||||
|
||||
/**Calculates the energy flow based on the local buffer
|
||||
* and the remote buffer
|
||||
*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*/));
|
||||
}
|
||||
|
||||
public int getPowerTier() {
|
||||
return powerTier;
|
||||
}
|
||||
|
||||
public void onBlockActivated(EntityPlayer player) {
|
||||
|
||||
if (player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.wrench)
|
||||
{
|
||||
ItemStack wrench = player.getHeldItem();
|
||||
NBTTagCompound linkDat = null;
|
||||
if (wrench.hasTagCompound() && wrench.getTagCompound().hasKey("LinkData")) linkDat = wrench.getTagCompound().getCompoundTag("LinkData");
|
||||
|
||||
if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound"))
|
||||
{
|
||||
handleBinding(player, linkDat.getInteger("XCoord"), linkDat.getInteger("YCoord"), linkDat.getInteger("ZCoord"), true);
|
||||
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 ChatComponentText("txt.posSaved"));
|
||||
}
|
||||
}
|
||||
else {
|
||||
if (!player.isSneaking())receiveEnergy(ForgeDirection.UNKNOWN, 100000, false);
|
||||
else extractEnergy(ForgeDirection.UNKNOWN, 100000, false);
|
||||
LogHelper.info(getEnergyStored(ForgeDirection.UNKNOWN));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean handleBinding(EntityPlayer player, int x, int y, int z, boolean callOther)
|
||||
{
|
||||
int range = (powerTier + 1) * 10;
|
||||
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"));
|
||||
return false;
|
||||
}
|
||||
else if (Utills.getDistanceAtoB(xCoord, yCoord, zCoord, x, y, z) > range)
|
||||
{
|
||||
if (worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.outOfRange"));
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
if (callOther && !tile.handleBinding(player, xCoord, yCoord, zCoord, false))
|
||||
{
|
||||
LogHelper.info("other Invalid");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (callOther && worldObj.isRemote) player.addChatComponentMessage(new ChatComponentText("txt.linked"));
|
||||
|
||||
for (LinkedEnergyDevice ld : linkedDevices)
|
||||
{
|
||||
if (ld.xCoord == x && ld.yCoord == y && ld.zCoord == z) return true;
|
||||
}
|
||||
|
||||
linkedDevices.add(new LinkedEnergyDevice(x, y, z, null));
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
//**************************************
|
||||
|
||||
@Override
|
||||
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
|
||||
return storage.receiveEnergy(maxReceive, simulate);
|
||||
@@ -55,14 +248,30 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound compound) {
|
||||
compound.setByte("Type", (byte) powerTier);
|
||||
int index = 0;
|
||||
compound.setInteger("LinkCount", linkedDevices.size());
|
||||
for (LinkedEnergyDevice ld : linkedDevices)
|
||||
{
|
||||
ld.writeToNBT(compound, "LinkedDevice_" + index);
|
||||
++index;
|
||||
}
|
||||
super.writeToNBT(compound);
|
||||
|
||||
storage.writeToNBT(compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound compound) {
|
||||
powerTier = compound.getByte("Type");
|
||||
this.updateStorage();
|
||||
int linkCount = compound.getInteger("LinkCount");
|
||||
linkedDevices = new ArrayList<LinkedEnergyDevice>();
|
||||
for (int i = 0; i < linkCount; i++)
|
||||
{
|
||||
linkedDevices.add(new LinkedEnergyDevice().readFromNBT(compound, "LinkedDevice_" + i));
|
||||
}
|
||||
super.readFromNBT(compound);
|
||||
|
||||
storage.readFromNBT(compound);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user