diff options
Diffstat (limited to 'src/main/java/openmodularturrets')
10 files changed, 89 insertions, 61 deletions
diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java index 02d9c59cfe..d79ab16f12 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseEM.java @@ -19,12 +19,11 @@ public class TurretBaseEM extends BlockAbstractTurretBase { public static TurretBaseEM INSTANCE; public TurretBaseEM(){ - super(); setCreativeTab(TecTech.mainTab); - this.setResistance(16); - this.setBlockName("turretBaseEM"); - this.setStepSound(Block.soundTypeMetal); - this.setBlockTextureName(Reference.MODID+":turretBaseEM"); + setResistance(16); + setBlockName("turretBaseEM"); + setStepSound(Block.soundTypeMetal); + setBlockTextureName(Reference.MODID+":turretBaseEM"); } @Override @@ -32,9 +31,10 @@ public class TurretBaseEM extends BlockAbstractTurretBase { return new TileTurretBaseEM(MaxCharge,MaxIO); } + @Override public void registerBlockIcons(IIconRegister p_149651_1_) { super.registerBlockIcons(p_149651_1_); - this.blockIcon = p_149651_1_.registerIcon(Reference.MODID+":turretBaseEM"); + blockIcon = p_149651_1_.registerIcon(Reference.MODID+":turretBaseEM"); } public static void run() { diff --git a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java index c7b3b547c0..61f877e81b 100644 --- a/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretbases/TurretBaseItemEM.java @@ -14,10 +14,11 @@ import java.util.List; * Created by Bass on 28/07/2017. */ public class TurretBaseItemEM extends ItemBlock { - public TurretBaseItemEM(Block b) { - super(b); + public TurretBaseItemEM(Block block) { + super(block); } + @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(CommonValues.TEC_MARK_EM); list.add(""); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java index 90318ef390..e7746a8291 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadEM.java @@ -20,12 +20,12 @@ public class TurretHeadEM extends Block implements ITileEntityProvider { public TurretHeadEM(){ super(Material.glass); - this.setCreativeTab(TecTech.mainTab); - this.setBlockUnbreakable(); - this.setResistance(6000000.0F); - this.setStepSound(Block.soundTypeMetal); - this.setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F); - this.setBlockName("turretHeadEM"); + setCreativeTab(TecTech.mainTab); + setBlockUnbreakable(); + setResistance(6000000.0F); + setStepSound(Block.soundTypeMetal); + setBlockBounds(0.2F, 0.0F, 0.2F, 0.8F, 1F, 0.8F); + setBlockName("turretHeadEM"); //this.setBlockTextureName(Reference.MODID+":turretHeadEM"); } diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java index 742e7b94fe..db3c089e47 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemEM.java @@ -19,23 +19,24 @@ import static com.github.technus.tectech.CommonValues.TEC_MARK_EM; public class TurretHeadItemEM extends ItemBlock { private static final DecimalFormat df = new DecimalFormat("0.0"); - public TurretHeadItemEM(Block b) { - super(b); + public TurretHeadItemEM(Block block) { + super(block); } + @Override public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List list, boolean p_77624_4_) { list.add(TEC_MARK_EM); list.add(""); list.add(EnumChatFormatting.GOLD + "--" + StatCollector.translateToLocal("tooltip.info") + "--"); - list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + "5"); + list.add(StatCollector.translateToLocal("tooltip.tier") + ": " + EnumChatFormatting.WHITE + '5'); list.add(StatCollector.translateToLocal("tooltip.range") + ": " + EnumChatFormatting.WHITE + ConfigHandler.getLaserTurretSettings().getRange()); list.add(StatCollector.translateToLocal("tooltip.accuracy") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("turret.accuracy.high")); list.add(StatCollector.translateToLocal("tooltip.ammo") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("turret.ammo.4")); list.add(StatCollector.translateToLocal("tooltip.tierRequired") + ": " + EnumChatFormatting.WHITE + StatCollector.translateToLocal("base.tier.5")); list.add(""); list.add(EnumChatFormatting.DARK_PURPLE + "--" + StatCollector.translateToLocal("tooltip.damage.label") + "--"); - list.add(StatCollector.translateToLocal("tooltip.damage.stat") + ": " + EnumChatFormatting.WHITE + (float)ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F + " " + StatCollector.translateToLocal("tooltip.health")); - list.add(StatCollector.translateToLocal("tooltip.aoe") + ": " + EnumChatFormatting.WHITE + "0"); + list.add(StatCollector.translateToLocal("tooltip.damage.stat") + ": " + EnumChatFormatting.WHITE + (float)ConfigHandler.getLaserTurretSettings().getDamage() / 2.0F + ' ' + StatCollector.translateToLocal("tooltip.health")); + list.add(StatCollector.translateToLocal("tooltip.aoe") + ": " + EnumChatFormatting.WHITE + '0'); list.add(StatCollector.translateToLocal("tooltip.firerate") + ": " + EnumChatFormatting.WHITE + df.format((double)(20.0F / (float)ConfigHandler.getLaserTurretSettings().getFireRate()))); list.add(StatCollector.translateToLocal("tooltip.energy.stat") + ": " + EnumChatFormatting.WHITE + ConfigHandler.getLaserTurretSettings().getPowerUsage() + " RF"); list.add(""); diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java index 6a46c627f2..4760e2b16e 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadItemRenderEM.java @@ -17,21 +17,24 @@ public class TurretHeadItemRenderEM implements IItemRenderer { public TurretHeadItemRenderEM(TurretHeadRenderEM turretRenderer, TileTurretHeadEM turretTileEntity) { this.turretRenderer = turretRenderer; this.turretTileEntity = turretTileEntity; - this.model = new ModelLaserTurret(); + model = new ModelLaserTurret(); } + @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.glTranslated(-0.5D, -0.5D, -0.5D); - this.turretRenderer.renderTileEntityAt(this.turretTileEntity, 0.0D, 0.0D, 0.0D, 0.0F); + turretRenderer.renderTileEntityAt(turretTileEntity, 0.0D, 0.0D, 0.0D, 0.0F); GL11.glPopMatrix(); } } diff --git a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java index f0aa331645..23379b9585 100644 --- a/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java +++ b/src/main/java/openmodularturrets/blocks/turretheads/TurretHeadRenderEM.java @@ -5,7 +5,4 @@ import openmodularturrets.client.render.renderers.blockitem.LaserTurretRenderer; /** * Created by Bass on 28/07/2017. */ -public class TurretHeadRenderEM extends LaserTurretRenderer { - public TurretHeadRenderEM() { - } -} +public class TurretHeadRenderEM extends LaserTurretRenderer {} diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java index e857d748e7..53e6186a25 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileEM.java @@ -51,11 +51,18 @@ public class projectileEM extends TurretProjectile { cElementalInstanceStack consumeFromThis=avalableEM.get(TecTech.Rnd.nextInt(avalableEM.size())); massFactor =consumeFromThis.definition.getMass()/ dHadronDefinition.hadron_n_.getMass(); - if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) exotic = true; - if(consumeFromThis.definition.getType()<0) antiMatter = true; + if(consumeFromThis.definition.getType()>1 || consumeFromThis.definition.getType()<-1) { + exotic = true; + } + if(consumeFromThis.definition.getType()<0) { + antiMatter = true; + } - if (consumeFromThis.definition.getCharge() == 0) this.gravity = massFactor/100f; - else this.gravity = Math.min(0.0025F/Math.abs(consumeFromThis.definition.getCharge()),massFactor/100f); + if (consumeFromThis.definition.getCharge() == 0) { + gravity = massFactor / 100f; + } else { + gravity = Math.min(0.0025F / Math.abs(consumeFromThis.definition.getCharge()), massFactor / 100f); + } avalableEM.removeAmount(false,consumeFromThis.definition.getStackForm(1)); } @@ -65,13 +72,14 @@ public class projectileEM extends TurretProjectile { //todo add more subspace pollution } + @Override protected void onImpact(MovingObjectPosition movingobjectposition) { - if(this.ticksExisted > 1) { + if(ticksExisted > 1) { if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - Block hitBlock = this.worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); + Block hitBlock = worldObj.getBlock(movingobjectposition.blockX, movingobjectposition.blockY, movingobjectposition.blockZ); if(hitBlock != null){ if (hitBlock.getMaterial().isSolid() && TecTech.ModConfig.ENABLE_TURRET_EXPLOSIONS && antiMatter) { - this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.Rnd.nextFloat() + 0.5F); + worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.Rnd.nextFloat() + 0.5F); GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(209), 1.0F, -1.0F, movingobjectposition.blockX, movingobjectposition.blockY, @@ -79,28 +87,32 @@ public class projectileEM extends TurretProjectile { worldObj.createExplosion(null, movingobjectposition.blockX + 0.5D, movingobjectposition.blockY + 0.5D, - movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.ModConfig.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped?(amp_level*.1f)+1:1) * (ticksExisted/250f), true); + movingobjectposition.blockZ + 0.5D, (exotic?10:1) * TecTech.ModConfig.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1) * (ticksExisted/250f), true); } else { return; } } } - if(movingobjectposition.entityHit != null && !this.worldObj.isRemote) { - this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.Rnd.nextFloat() + 0.5F); - if(movingobjectposition.entityHit != null && !this.worldObj.isRemote) { - float damage = (exotic?10:1) * TecTech.ModConfig.TURRET_DAMAGE_FACTOR * massFactor * (isAmped?(amp_level*.1f)+1:1); + if(movingobjectposition.entityHit != null && !worldObj.isRemote) { + worldObj.playSoundEffect(posX, posY, posZ, "openmodularturrets:laserHit", ConfigHandler.getTurretSoundVolume(), TecTech.Rnd.nextFloat() + 0.5F); + if(movingobjectposition.entityHit != null && !worldObj.isRemote) { + float damage = (exotic?10:1) * TecTech.ModConfig.TURRET_DAMAGE_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1); if(movingobjectposition.entityHit instanceof EntityPlayer) { - if(this.canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) { + if(canDamagePlayer((EntityPlayer)movingobjectposition.entityHit)) { movingobjectposition.entityHit.setFire((exotic?10:1)*2); movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage); - if(antiMatter) movingobjectposition.entityHit.hurtResistantTime = 0; + if(antiMatter) { + movingobjectposition.entityHit.hurtResistantTime = 0; + } } } else { movingobjectposition.entityHit.setFire((exotic?10:1)*2); movingobjectposition.entityHit.attackEntityFrom(new NormalDamageSource("laser"), damage); - if(antiMatter) movingobjectposition.entityHit.hurtResistantTime = 0; + if(antiMatter) { + movingobjectposition.entityHit.hurtResistantTime = 0; + } } if (TecTech.ModConfig.ENABLE_TURRET_EXPLOSIONS && antiMatter) { @@ -111,17 +123,18 @@ public class projectileEM extends TurretProjectile { worldObj.createExplosion(null, movingobjectposition.entityHit.posX, movingobjectposition.entityHit.posY, - movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.ModConfig.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped?(amp_level*.1f)+1:1) * (ticksExisted/250f), true); + movingobjectposition.entityHit.posZ, (exotic?10:1) * TecTech.ModConfig.TURRET_EXPLOSION_FACTOR * massFactor * (isAmped? amp_level*.1f +1:1) * (ticksExisted/250f), true); } } } - this.setDead(); + setDead(); } } + @Override public void onEntityUpdate() { - if(this.ticksExisted >= 75) { - this.setDead(); + if(ticksExisted >= 75) { + setDead(); } } } diff --git a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java index 0fb915e035..9faeb02da6 100644 --- a/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java +++ b/src/main/java/openmodularturrets/entity/projectiles/projectileRenderEM.java @@ -18,11 +18,8 @@ import org.lwjgl.opengl.GL11; public class projectileRenderEM extends Render { private static final ResourceLocation textures = new ResourceLocation(Reference.MODID + ":textures/entity/projectileEM.png"); - public projectileRenderEM() { - } - private void render(projectileEM entity, double par2, double par4, double par6, float par9) { - this.bindEntityTexture(entity); + bindEntityTexture(entity); GL11.glPushMatrix(); GL11.glTranslatef((float)par2, (float)par4 + 0.3F, (float)par6); GL11.glRotatef(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F); @@ -37,8 +34,8 @@ public class projectileRenderEM extends Render { GL11.glEnable('\u803a'); float f11 = - par9; if(f11 > 0.0F) { - float i = -MathHelper.sin(f11 * 3.0F) * f11; - GL11.glRotatef(i, 0.0F, 0.0F, 1.0F); + float f = -MathHelper.sin(f11 * 3.0F) * f11; + GL11.glRotatef(f, 0.0F, 0.0F, 1.0F); } GL11.glDisable(2896); @@ -64,10 +61,12 @@ public class projectileRenderEM extends Render { GL11.glPopMatrix(); } + @Override protected ResourceLocation getEntityTexture(Entity par1Entity) { return textures; } + @Override public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) { render((projectileEM)par1Entity, par2, par4, par6, par9); } diff --git a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java index 343a1e5ebd..286f12d853 100644 --- a/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java +++ b/src/main/java/openmodularturrets/tileentity/turret/TileTurretHeadEM.java @@ -19,48 +19,55 @@ import openmodularturrets.util.TurretHeadUtil; public class TileTurretHeadEM extends TurretHead{ private cElementalInstanceStackMap hatchContentPointer; - public TileTurretHeadEM() { - } - + @Override public int getTurretRange() { return ConfigHandler.getLaserTurretSettings().getRange()<<1; } + @Override public int getTurretPowerUsage() { return ConfigHandler.getLaserTurretSettings().getPowerUsage()<<4; } + @Override public int getTurretFireRate() { return (int)Math.ceil(ConfigHandler.getLaserTurretSettings().getFireRate()/2f); } + @Override public double getTurretAccuracy() { return (int)Math.ceil(ConfigHandler.getLaserTurretSettings().getAccuracy() / 10.0F); } @Override public void updateEntity() { - if(!worldObj.isRemote && base instanceof TileTurretBaseEM) - hatchContentPointer =((TileTurretBaseEM) base).getContainerHandler(); + if(!worldObj.isRemote && base instanceof TileTurretBaseEM) { + hatchContentPointer = ((TileTurretBaseEM) base).getContainerHandler(); + } super.updateEntity(); } + @Override public boolean requiresAmmo() { return hatchContentPointer == null || !hatchContentPointer.hasStacks(); } + @Override public boolean requiresSpecificAmmo() { return true;//to enable failure in shooting when there is no EM to use } + @Override public Item getAmmo() { return DebugElementalInstanceContainer_EM.INSTANCE;//Placeholder item that cannot be achieved, yet still usable for debug } + @Override public final TurretProjectile createProjectile(World world, Entity target, ItemStack ammo) { return new projectileEM(world, TurretHeadUtil.getTurretBase(worldObj, xCoord, yCoord, zCoord), hatchContentPointer); } + @Override public String getLaunchSoundEffect() { return "laser"; } diff --git a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java index acecfb4a37..7bb87c8826 100644 --- a/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java +++ b/src/main/java/openmodularturrets/tileentity/turretbase/TileTurretBaseEM.java @@ -16,6 +16,7 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity { super(MaxEnergyStorage, MaxIO); } + @Override @Optional.Method( modid = "OpenComputers" ) @@ -27,28 +28,34 @@ public class TileTurretBaseEM extends TurretBaseTierFiveTileEntity { World worldIn = getWorldObj(); TileEntity te; if ((te = worldIn.getTileEntity(xCoord + 1, yCoord, zCoord)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } if ((te = worldIn.getTileEntity(xCoord - 1, yCoord, zCoord)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } if ((te = worldIn.getTileEntity(xCoord, yCoord + 1, zCoord)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } if ((te = worldIn.getTileEntity(xCoord, yCoord - 1, zCoord)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } if ((te = worldIn.getTileEntity(xCoord, yCoord, zCoord + 1)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } if ((te = worldIn.getTileEntity(xCoord, yCoord, zCoord - 1)) instanceof IGregTechTileEntity && - ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) + ((IGregTechTileEntity) te).getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_InputElemental) { return getFromHatch((GT_MetaTileEntity_Hatch_InputElemental) ((IGregTechTileEntity) te).getMetaTileEntity()); + } return null; } |