From b40fec2270488d931c019ac8648dac39adedfe5a Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 10 Jan 2026 10:03:10 +0000 Subject: [PATCH] Clean up imports to use short class names Replace fully qualified class names with proper imports in ability files: - Added cpw.mods.fml.relauncher.Side and SideOnly imports - Added IAbilityConfigCallback and SubGuiAbilityConfig imports - Added SubGuiAbility* imports for each ability type - Replaced @cpw.mods.fml.relauncher.SideOnly(...) with @SideOnly(Side.CLIENT) - Replaced fully qualified return types with short class names --- .../npcs/controllers/data/ability/Ability.java | 11 +++++++---- .../controllers/data/ability/type/AbilityBeam.java | 14 ++++++++++---- .../data/ability/type/AbilityCharge.java | 12 ++++++++---- .../data/ability/type/AbilityCutter.java | 12 ++++++++---- .../controllers/data/ability/type/AbilityDash.java | 14 ++++++++++---- .../data/ability/type/AbilityGuard.java | 14 ++++++++++---- .../data/ability/type/AbilityHazard.java | 14 ++++++++++---- .../controllers/data/ability/type/AbilityHeal.java | 12 ++++++++---- .../data/ability/type/AbilityHeavyHit.java | 14 ++++++++++---- .../controllers/data/ability/type/AbilityOrb.java | 14 ++++++++++---- .../data/ability/type/AbilityProjectile.java | 12 ++++++++---- .../data/ability/type/AbilityShockwave.java | 12 ++++++++---- .../controllers/data/ability/type/AbilitySlam.java | 12 ++++++++---- .../data/ability/type/AbilityTeleport.java | 14 ++++++++++---- .../controllers/data/ability/type/AbilityTrap.java | 12 ++++++++---- .../data/ability/type/AbilityVortex.java | 14 ++++++++++---- 16 files changed, 143 insertions(+), 64 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java index 28fbf57c4..84e4312fa 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/Ability.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.telegraph.Telegraph; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphInstance; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -12,6 +14,8 @@ import net.minecraft.world.World; import noppes.npcs.DataAbilities; import noppes.npcs.api.INbt; import noppes.npcs.api.ability.IAbility; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; import noppes.npcs.entity.EntityNPCInterface; import noppes.npcs.scripted.NpcAPI; import noppes.npcs.scripted.event.AbilityEvent; @@ -251,10 +255,9 @@ public abstract class Ability implements IAbility { * @param callback The callback to notify when the ability is saved * @return A SubGuiAbilityConfig instance (or subclass) for configuring this ability */ - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.SubGuiAbilityConfig(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityConfig(this, callback); } /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java index 57d57107d..f76ec7406 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeam.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityBeam; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.Entity; @@ -58,10 +64,10 @@ public class AbilityBeam extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityBeam(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityBeam(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java index 03971ac72..271abe2ee 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.Telegraph; @@ -12,6 +14,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCharge; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashSet; @@ -57,10 +62,9 @@ public class AbilityCharge extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCharge(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityCharge(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java index 065a34155..26b930d56 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCutter.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -10,6 +12,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCutter; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashSet; @@ -69,10 +74,9 @@ public class AbilityCutter extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityCutter(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityCutter(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java index bd54712e8..0e35e8f0e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDash.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDash; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -95,10 +101,10 @@ public class AbilityDash extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityDash(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityDash(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java index d089fae23..b48e353b1 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityGuard.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityGuard; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -48,10 +54,10 @@ public class AbilityGuard extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityGuard(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityGuard(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java index 83a3099d1..bcca99eac 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHazard; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphInstance; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -87,10 +93,10 @@ public class AbilityHazard extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHazard(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityHazard(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeal.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeal.java index 63443d078..4c6dd6c76 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeal.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeal.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -8,6 +10,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeal; import noppes.npcs.entity.EntityNPCInterface; import java.util.ArrayList; @@ -48,10 +53,9 @@ public class AbilityHeal extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeal(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityHeal(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java index 7275d8102..4d62d610d 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHeavyHit.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeavyHit; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -40,10 +46,10 @@ public class AbilityHeavyHit extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityHeavyHit(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityHeavyHit(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java index d5b28d20e..41148c953 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityOrb; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -64,10 +70,10 @@ public class AbilityOrb extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityOrb(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityOrb(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java index 8aa533723..0adcc48e2 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityProjectile.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -8,6 +10,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityProjectile; import noppes.npcs.entity.EntityNPCInterface; import java.util.List; @@ -47,10 +52,9 @@ public class AbilityProjectile extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityProjectile(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityProjectile(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java index 42fbe0de0..f5e7d9a97 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityShockwave.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; @@ -10,6 +12,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityShockwave; import noppes.npcs.entity.EntityNPCInterface; import java.util.List; @@ -48,10 +53,9 @@ public class AbilityShockwave extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityShockwave(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityShockwave(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java index ae3d3fb46..a35ea1f7a 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilitySlam.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.Telegraph; @@ -11,6 +13,9 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilitySlam; import noppes.npcs.entity.EntityNPCInterface; import java.util.List; @@ -59,10 +64,9 @@ public class AbilitySlam extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilitySlam(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilitySlam(this, callback); } /** diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java index 1da032b99..789685755 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTeleport.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTeleport; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.block.Block; @@ -72,10 +78,10 @@ public class AbilityTeleport extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTeleport(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityTeleport(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java index d6041e0c8..47c4e7dc0 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java @@ -1,5 +1,7 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import kamkeel.npcs.controllers.data.ability.Ability; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphInstance; @@ -11,6 +13,9 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTrap; import noppes.npcs.entity.EntityNPCInterface; import java.util.HashSet; @@ -79,10 +84,9 @@ public class AbilityTrap extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityTrap(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui(IAbilityConfigCallback callback) { + return new SubGuiAbilityTrap(this, callback); } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java index a4bdd914c..6c34a3945 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityVortex.java @@ -1,6 +1,12 @@ package kamkeel.npcs.controllers.data.ability.type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + import kamkeel.npcs.controllers.data.ability.Ability; +import noppes.npcs.client.gui.advanced.IAbilityConfigCallback; +import noppes.npcs.client.gui.advanced.SubGuiAbilityConfig; +import noppes.npcs.client.gui.advanced.ability.SubGuiAbilityVortex; import kamkeel.npcs.controllers.data.ability.TargetingMode; import kamkeel.npcs.controllers.data.ability.telegraph.TelegraphType; import net.minecraft.entity.EntityLivingBase; @@ -57,10 +63,10 @@ public class AbilityVortex extends Ability { public boolean hasTypeSettings() { return true; } @Override - @cpw.mods.fml.relauncher.SideOnly(cpw.mods.fml.relauncher.Side.CLIENT) - public noppes.npcs.client.gui.advanced.SubGuiAbilityConfig createConfigGui( - noppes.npcs.client.gui.advanced.IAbilityConfigCallback callback) { - return new noppes.npcs.client.gui.advanced.ability.SubGuiAbilityVortex(this, callback); + @SideOnly(Side.CLIENT) + public SubGuiAbilityConfig createConfigGui( + IAbilityConfigCallback callback) { + return new SubGuiAbilityVortex(this, callback); } @Override