From f61b166f7712591cb704f6977be4d5af127c957f Mon Sep 17 00:00:00 2001 From: Quantum Date: Mon, 15 Nov 2021 01:01:29 -0500 Subject: [PATCH] Updated for ICBM dev/1.12-4.0.2 icbm.classic.api.ExplosiveRefs -> icbm.classic.api.refs.ICBMExplosives --- src/main/java/trinity/init/ICBMEvents.java | 8 ++++---- src/main/java/trinity/init/ModEvents.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/trinity/init/ICBMEvents.java b/src/main/java/trinity/init/ICBMEvents.java index 75d290d..41b135d 100644 --- a/src/main/java/trinity/init/ICBMEvents.java +++ b/src/main/java/trinity/init/ICBMEvents.java @@ -4,7 +4,7 @@ package trinity.init; import java.util.List; import icbm.classic.api.EnumTier; -import icbm.classic.api.ExplosiveRefs; +import icbm.classic.api.refs.ICBMExplosives; import icbm.classic.content.blast.BlastEMP; import icbm.classic.content.blast.threaded.BlastAntimatter; import icbm.classic.content.blast.threaded.BlastNuclear; @@ -41,7 +41,7 @@ public class ICBMEvents { Item item = stack.getItem(); if(item instanceof ItemBlockExplosive || item instanceof ItemMissile) { - if(stack.getItemDamage() == ExplosiveRefs.NUCLEAR.getRegistryID()) + if(stack.getItemDamage() == ICBMExplosives.NUCLEAR.getRegistryID()) { addNukeTooltip(event.getToolTip(), stack); } @@ -76,7 +76,7 @@ public class ICBMEvents { // world.setBlockToAir(pos); 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) - .setExplosiveData(ExplosiveRefs.EMP) + .setExplosiveData(ICBMExplosives.EMP) .buildBlast().runBlast(); 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)); @@ -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)); 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) - .setExplosiveData(ExplosiveRefs.EMP) + .setExplosiveData(ICBMExplosives.EMP) .buildBlast().runBlast(); //System.out.println("If you are seeing this line, this means your blast detector is at least partially working."); } diff --git a/src/main/java/trinity/init/ModEvents.java b/src/main/java/trinity/init/ModEvents.java index ae974b7..5be89a4 100644 --- a/src/main/java/trinity/init/ModEvents.java +++ b/src/main/java/trinity/init/ModEvents.java @@ -6,7 +6,7 @@ import java.util.List; import org.lwjgl.opengl.GL11; //import icbm.classic.api.EnumTier; -//import icbm.classic.api.ExplosiveRefs; +//import icbm.classic.api.refs.ICBMExplosives; //import icbm.classic.content.blast.BlastEMP; //import icbm.classic.content.blast.threaded.BlastAntimatter; //import icbm.classic.content.blast.threaded.BlastNuclear; @@ -189,7 +189,7 @@ public class ModEvents { Item item = stack.getItem(); if(item instanceof ItemBlockExplosive || item instanceof ItemMissile) { - if(stack.getItemDamage() == ExplosiveRefs.NUCLEAR.getRegistryID()) + if(stack.getItemDamage() == ICBMExplosives.NUCLEAR.getRegistryID()) { addNukeTooltip(event.getToolTip(), stack); } @@ -223,7 +223,7 @@ public class ModEvents { // 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()) .setBlastSize(((BlastNuclear) exp).getBlastRadius()*2) - .setExplosiveData(ExplosiveRefs.EMP) + .setExplosiveData(ICBMExplosives.EMP) .buildBlast().runBlast(); 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)); @@ -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)); 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) - .setExplosiveData(ExplosiveRefs.EMP) + .setExplosiveData(ICBMExplosives.EMP) .buildBlast().runBlast(); //System.out.println("If you are seeing this line, this means your blast detector is at least partially working."); //}