diff --git a/src/main/java/kamkeel/npcs/client/renderer/EnergyChargePreviewRenderer.java b/src/main/java/kamkeel/npcs/client/renderer/EnergyChargePreviewRenderer.java index 66bf4869b..d04c5ee1b 100644 --- a/src/main/java/kamkeel/npcs/client/renderer/EnergyChargePreviewRenderer.java +++ b/src/main/java/kamkeel/npcs/client/renderer/EnergyChargePreviewRenderer.java @@ -2,6 +2,7 @@ package kamkeel.npcs.client.renderer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import kamkeel.npcs.controllers.data.energycharge.EnergyChargePreviewManager; +import kamkeel.npcs.entity.EntityEnergyAbility; import kamkeel.npcs.entity.EntityEnergyProjectile; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; @@ -25,7 +26,7 @@ public class EnergyChargePreviewRenderer { float partialTicks = event.partialTicks; - for (EntityEnergyProjectile entity : EnergyChargePreviewManager.ClientInstance.getPreviews()) { + for (EntityEnergyAbility entity : EnergyChargePreviewManager.ClientInstance.getPreviews()) { if (entity == null || entity.isDead) continue; double x = entity.prevPosX + (entity.posX - entity.prevPosX) * partialTicks - RenderManager.renderPosX; diff --git a/src/main/java/kamkeel/npcs/controllers/data/energycharge/EnergyChargePreviewManager.java b/src/main/java/kamkeel/npcs/controllers/data/energycharge/EnergyChargePreviewManager.java index 558399de1..19a146229 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/energycharge/EnergyChargePreviewManager.java +++ b/src/main/java/kamkeel/npcs/controllers/data/energycharge/EnergyChargePreviewManager.java @@ -1,6 +1,6 @@ package kamkeel.npcs.controllers.data.energycharge; -import kamkeel.npcs.entity.EntityEnergyProjectile; +import kamkeel.npcs.entity.EntityEnergyAbility; import net.minecraft.world.World; import java.util.Collection; @@ -18,13 +18,13 @@ public class EnergyChargePreviewManager { public static EnergyChargePreviewManager ClientInstance; - private final ConcurrentHashMap previews = new ConcurrentHashMap(); + private final ConcurrentHashMap previews = new ConcurrentHashMap(); public static void initClient() { ClientInstance = new EnergyChargePreviewManager(); } - public void addPreview(String instanceId, EntityEnergyProjectile entity) { + public void addPreview(String instanceId, EntityEnergyAbility entity) { if (instanceId == null || entity == null) return; previews.put(instanceId, entity); } @@ -34,7 +34,7 @@ public class EnergyChargePreviewManager { previews.remove(instanceId); } - public Collection getPreviews() { + public Collection getPreviews() { return previews.values(); } @@ -55,9 +55,9 @@ public class EnergyChargePreviewManager { return; } - Iterator iterator = previews.values().iterator(); + Iterator iterator = previews.values().iterator(); while (iterator.hasNext()) { - EntityEnergyProjectile entity = iterator.next(); + EntityEnergyAbility entity = iterator.next(); if (entity == null || entity.isDead || entity.worldObj != world) { iterator.remove(); continue; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/energycharge/EnergyChargeSpawnPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/energycharge/EnergyChargeSpawnPacket.java index 16957aaaa..8d487bac6 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/energycharge/EnergyChargeSpawnPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/energycharge/EnergyChargeSpawnPacket.java @@ -4,7 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.data.energycharge.EnergyChargePreviewManager; -import kamkeel.npcs.entity.EntityEnergyProjectile; +import kamkeel.npcs.entity.EntityEnergyAbility; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; @@ -68,7 +68,7 @@ public final class EnergyChargeSpawnPacket extends AbstractPacket { World world = Minecraft.getMinecraft().theWorld; if (world == null) return; - EntityEnergyProjectile preview = createPreviewEntity(className, world); + EntityEnergyAbility preview = createPreviewEntity(className, world); if (preview == null) return; preview.setPreviewMode(true); @@ -84,22 +84,22 @@ public final class EnergyChargeSpawnPacket extends AbstractPacket { } @SideOnly(Side.CLIENT) - private static EntityEnergyProjectile createPreviewEntity(String className, World world) { + private static EntityEnergyAbility createPreviewEntity(String className, World world) { try { Class clazz = Class.forName(className); - if (!EntityEnergyProjectile.class.isAssignableFrom(clazz)) { + if (!EntityEnergyAbility.class.isAssignableFrom(clazz)) { return null; } Constructor constructor = clazz.getConstructor(World.class); Object instance = constructor.newInstance(world); - return (EntityEnergyProjectile) instance; + return (EntityEnergyAbility) instance; } catch (Exception ignored) { return null; } } - public static void sendToTracking(String instanceId, EntityEnergyProjectile previewEntity, Entity trackingEntity) { + public static void sendToTracking(String instanceId, EntityEnergyAbility previewEntity, Entity trackingEntity) { if (previewEntity == null || trackingEntity == null) return; String className = previewEntity.getClass().getName(); NBTTagCompound nbt = previewEntity.exportSpawnNBT();