QTechIndustries/Trinity
4
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: QTechIndustries:43915e43f041220e6300e40b52573ad7afeb9e80
Branches Tags
QTechIndustries:master
..
compare: QTechIndustries:4938dbac5c139d6df3f0a5d11cadfd72bf8c94ec
Branches Tags
QTechIndustries:master

No commits in common. "43915e43f041220e6300e40b52573ad7afeb9e80" and "4938dbac5c139d6df3f0a5d11cadfd72bf8c94ec" have entirely different histories.
43915e43f0 ... 4938dbac5c

2 changed files with 8 additions and 8 deletions
Show stats Expand all files Collapse all files

8
src/main/java/trinity/init/ICBMEvents.java
View file

@ -4,7 +4,7 @@ package trinity.init;
import java.util.List; import java.util.List;
import icbm.classic.api.EnumTier; import icbm.classic.api.EnumTier;
import icbm.classic.api.refs.ICBMExplosives; import icbm.classic.api.ExplosiveRefs;
import icbm.classic.content.blast.BlastEMP; import icbm.classic.content.blast.BlastEMP;
import icbm.classic.content.blast.threaded.BlastAntimatter; import icbm.classic.content.blast.threaded.BlastAntimatter;
import icbm.classic.content.blast.threaded.BlastNuclear; import icbm.classic.content.blast.threaded.BlastNuclear;
@ -41,7 +41,7 @@ public class ICBMEvents {
Item item = stack.getItem(); Item item = stack.getItem();
if(item instanceof ItemBlockExplosive || item instanceof ItemMissile) if(item instanceof ItemBlockExplosive || item instanceof ItemMissile)
{ {
if(stack.getItemDamage() == ICBMExplosives.NUCLEAR.getRegistryID()) if(stack.getItemDamage() == ExplosiveRefs.NUCLEAR.getRegistryID())
{ {
addNukeTooltip(event.getToolTip(), stack); addNukeTooltip(event.getToolTip(), stack);
} }
@ -76,7 +76,7 @@ public class ICBMEvents {
// world.setBlockToAir(pos); // world.setBlockToAir(pos);
new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.getExplosivePlacedBy()).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z()) new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.getExplosivePlacedBy()).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z())
.setBlastSize(((BlastNuclear) exp).getBlastRadius()*2) .setBlastSize(((BlastNuclear) exp).getBlastRadius()*2)
.setExplosiveData(ICBMExplosives.EMP) .setExplosiveData(ExplosiveRefs.EMP)
.buildBlast().runBlast(); .buildBlast().runBlast();
ExplosionNukeGeneric.irradiate(world, (int)position.x, (int)position.y, (int)position.z, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius)*2); ExplosionNukeGeneric.irradiate(world, (int)position.x, (int)position.y, (int)position.z, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius)*2);
world.spawnEntity(EntityNuclearExplosion.statFac(world, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius), position.x, position.y, position.z)); world.spawnEntity(EntityNuclearExplosion.statFac(world, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius), position.x, position.y, position.z));
@ -98,7 +98,7 @@ public class ICBMEvents {
world.spawnEntity(EntityNuclearExplosion.statFacAntimatter(world, Math.min(TrinityConfig.antimatter_radius,TrinityConfig.max_radius), position.x, position.y, position.z)); world.spawnEntity(EntityNuclearExplosion.statFacAntimatter(world, Math.min(TrinityConfig.antimatter_radius,TrinityConfig.max_radius), position.x, position.y, position.z));
new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.getExplosivePlacedBy()).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z()) new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.getExplosivePlacedBy()).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z())
.setBlastSize(((BlastNuclear) exp).getBlastRadius()*2) .setBlastSize(((BlastNuclear) exp).getBlastRadius()*2)
.setExplosiveData(ICBMExplosives.EMP) .setExplosiveData(ExplosiveRefs.EMP)
.buildBlast().runBlast(); .buildBlast().runBlast();
//System.out.println("If you are seeing this line, this means your blast detector is at least partially working."); //System.out.println("If you are seeing this line, this means your blast detector is at least partially working.");
} }

8
src/main/java/trinity/init/ModEvents.java
View file

@ -6,7 +6,7 @@ import java.util.List;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
//import icbm.classic.api.EnumTier; //import icbm.classic.api.EnumTier;
//import icbm.classic.api.refs.ICBMExplosives; //import icbm.classic.api.ExplosiveRefs;
//import icbm.classic.content.blast.BlastEMP; //import icbm.classic.content.blast.BlastEMP;
//import icbm.classic.content.blast.threaded.BlastAntimatter; //import icbm.classic.content.blast.threaded.BlastAntimatter;
//import icbm.classic.content.blast.threaded.BlastNuclear; //import icbm.classic.content.blast.threaded.BlastNuclear;
@ -189,7 +189,7 @@ public class ModEvents {
Item item = stack.getItem(); Item item = stack.getItem();
if(item instanceof ItemBlockExplosive || item instanceof ItemMissile) if(item instanceof ItemBlockExplosive || item instanceof ItemMissile)
{ {
if(stack.getItemDamage() == ICBMExplosives.NUCLEAR.getRegistryID()) if(stack.getItemDamage() == ExplosiveRefs.NUCLEAR.getRegistryID())
{ {
addNukeTooltip(event.getToolTip(), stack); addNukeTooltip(event.getToolTip(), stack);
} }
@ -223,7 +223,7 @@ public class ModEvents {
// exp.world.setBlockToAir(pos); // exp.world.setBlockToAir(pos);
new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.exploder).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z()) new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.exploder).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z())
.setBlastSize(((BlastNuclear) exp).getBlastRadius()*2) .setBlastSize(((BlastNuclear) exp).getBlastRadius()*2)
.setExplosiveData(ICBMExplosives.EMP) .setExplosiveData(ExplosiveRefs.EMP)
.buildBlast().runBlast(); .buildBlast().runBlast();
ExplosionNukeGeneric.irradiate(exp.world, (int)exp.x, (int)exp.y, (int)exp.z, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius)*2); ExplosionNukeGeneric.irradiate(exp.world, (int)exp.x, (int)exp.y, (int)exp.z, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius)*2);
exp.world.spawnEntity(EntityNuclearExplosion.statFac(exp.world, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius), exp.x + 0.0, exp.y + 0.0, exp.z + 0.0)); exp.world.spawnEntity(EntityNuclearExplosion.statFac(exp.world, Math.min(TrinityConfig.icbm_radius,TrinityConfig.max_radius), exp.x + 0.0, exp.y + 0.0, exp.z + 0.0));
@ -245,7 +245,7 @@ public class ModEvents {
exp.world.spawnEntity(EntityNuclearExplosion.statFacAntimatter(exp.world, Math.min(TrinityConfig.antimatter_radius,TrinityConfig.max_radius), exp.x + 0.0, exp.y + 0.0, exp.z + 0.0)); exp.world.spawnEntity(EntityNuclearExplosion.statFacAntimatter(exp.world, Math.min(TrinityConfig.antimatter_radius,TrinityConfig.max_radius), exp.x + 0.0, exp.y + 0.0, exp.z + 0.0));
new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.exploder).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z()) new BlastEMP().setBlastWorld(event.getWorld()).setBlastSource(exp.exploder).setBlastPosition(((BlastNuclear) exp).location.x(), ((BlastNuclear) exp).location.y(), ((BlastNuclear) exp).location.z())
.setBlastSize(((BlastNuclear) exp).getBlastRadius()*2) .setBlastSize(((BlastNuclear) exp).getBlastRadius()*2)
.setExplosiveData(ICBMExplosives.EMP) .setExplosiveData(ExplosiveRefs.EMP)
.buildBlast().runBlast(); .buildBlast().runBlast();
//System.out.println("If you are seeing this line, this means your blast detector is at least partially working."); //System.out.println("If you are seeing this line, this means your blast detector is at least partially working.");
//} //}