diff --git a/src/engine/db/handlers/dbEffectsBaseHandler.java b/src/engine/db/handlers/dbEffectsBaseHandler.java deleted file mode 100644 index c3ca575a..00000000 --- a/src/engine/db/handlers/dbEffectsBaseHandler.java +++ /dev/null @@ -1,303 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2026 -// https://www.magicbane.com - - -package engine.db.handlers; - -import engine.gameManager.DbManager; -import engine.gameManager.PowersManager; -import engine.mbEnums; -import engine.powers.EffectsBase; -import engine.powers.effectmodifiers.*; -import org.pmw.tinylog.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashSet; - -public class dbEffectsBaseHandler extends dbHandlerBase { - - public dbEffectsBaseHandler() { - - } - - public static ArrayList getAllEffectsBase() { - - ArrayList effectList = new ArrayList<>(); - - try (Connection connection = DbManager.getConnection(); - PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectbase ORDER BY `IDString` DESC")) { - - ResultSet rs = prepareStatement.executeQuery(); - - while (rs.next()) { - EffectsBase effectBase = new EffectsBase(rs); - effectList.add(effectBase); - } - } catch (SQLException e) { - Logger.error(e.toString()); - } - - return effectList; - } - - public static void cacheAllEffectModifiers() { - - String IDString; - AbstractEffectModifier abstractEffectModifier = null; - - try (Connection connection = DbManager.getConnection(); - PreparedStatement prepareStatement = connection.prepareStatement("SELECT * FROM static_power_effectmod")) { - - ResultSet rs = prepareStatement.executeQuery(); - - while (rs.next()) { - - IDString = rs.getString("IDString"); - EffectsBase effectBase = PowersManager.getEffectByIDString(IDString); - mbEnums.ModType modifier = mbEnums.ModType.GetModType(rs.getString("modType")); - - //combine item prefix and suffix effect modifiers - - abstractEffectModifier = getCombinedModifiers(abstractEffectModifier, rs, effectBase, modifier); - - if (abstractEffectModifier != null) { - - if (EffectsBase.modifiersMap.containsKey(effectBase.getIDString()) == false) - EffectsBase.modifiersMap.put(effectBase.getIDString(), new HashSet<>()); - - EffectsBase.modifiersMap.get(effectBase.getIDString()).add(abstractEffectModifier); - - } - - } - - } catch (Exception e) { - Logger.error(e); - } - - } - - private static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ResultSet rs, EffectsBase effectBase, mbEnums.ModType modifier) throws SQLException { - switch (modifier) { - case AdjustAboveDmgCap: - abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs); - break; - case Ambidexterity: - abstractEffectModifier = new AmbidexterityEffectModifier(rs); - break; - case AnimOverride: - break; - case ArmorPiercing: - abstractEffectModifier = new ArmorPiercingEffectModifier(rs); - break; - case AttackDelay: - abstractEffectModifier = new AttackDelayEffectModifier(rs); - break; - case Attr: - abstractEffectModifier = new AttributeEffectModifier(rs); - break; - case BlackMantle: - abstractEffectModifier = new BlackMantleEffectModifier(rs); - break; - case BladeTrails: - abstractEffectModifier = new BladeTrailsEffectModifier(rs); - break; - case Block: - abstractEffectModifier = new BlockEffectModifier(rs); - break; - case BlockedPowerType: - abstractEffectModifier = new BlockedPowerTypeEffectModifier(rs); - break; - case CannotAttack: - abstractEffectModifier = new CannotAttackEffectModifier(rs); - break; - case CannotCast: - abstractEffectModifier = new CannotCastEffectModifier(rs); - break; - case CannotMove: - abstractEffectModifier = new CannotMoveEffectModifier(rs); - break; - case CannotTrack: - abstractEffectModifier = new CannotTrackEffectModifier(rs); - break; - case Charmed: - abstractEffectModifier = new CharmedEffectModifier(rs); - break; - case ConstrainedAmbidexterity: - abstractEffectModifier = new ConstrainedAmbidexterityEffectModifier(rs); - break; - case DamageCap: - abstractEffectModifier = new DamageCapEffectModifier(rs); - break; - case DamageShield: - abstractEffectModifier = new DamageShieldEffectModifier(rs); - break; - case DCV: - abstractEffectModifier = new DCVEffectModifier(rs); - break; - case Dodge: - abstractEffectModifier = new DodgeEffectModifier(rs); - break; - case DR: - abstractEffectModifier = new DREffectModifier(rs); - break; - case Durability: - abstractEffectModifier = new DurabilityEffectModifier(rs); - break; - case ExclusiveDamageCap: - abstractEffectModifier = new ExclusiveDamageCapEffectModifier(rs); - break; - case Fade: - abstractEffectModifier = new FadeEffectModifier(rs); - break; - case Fly: - abstractEffectModifier = new FlyEffectModifier(rs); - break; - case Health: - abstractEffectModifier = new HealthEffectModifier(rs); - break; - case HealthFull: - abstractEffectModifier = new HealthFullEffectModifier(rs); - break; - case HealthRecoverRate: - abstractEffectModifier = new HealthRecoverRateEffectModifier(rs); - break; - case IgnoreDamageCap: - abstractEffectModifier = new IgnoreDamageCapEffectModifier(rs); - break; - case IgnorePassiveDefense: - abstractEffectModifier = new IgnorePassiveDefenseEffectModifier(rs); - break; - case ImmuneTo: - abstractEffectModifier = new ImmuneToEffectModifier(rs); - break; - case ImmuneToAttack: - abstractEffectModifier = new ImmuneToAttackEffectModifier(rs); - break; - case ImmuneToPowers: - abstractEffectModifier = new ImmuneToPowersEffectModifier(rs); - break; - case Invisible: - abstractEffectModifier = new InvisibleEffectModifier(rs); - break; - case ItemName: - abstractEffectModifier = new ItemNameEffectModifier(rs); - if (((ItemNameEffectModifier) abstractEffectModifier).name.isEmpty()) - break; - if (effectBase != null) - effectBase.setName((((ItemNameEffectModifier) abstractEffectModifier).name)); - break; - case Mana: - abstractEffectModifier = new ManaEffectModifier(rs); - break; - case ManaFull: - abstractEffectModifier = new ManaFullEffectModifier(rs); - break; - case ManaRecoverRate: - abstractEffectModifier = new ManaRecoverRateEffectModifier(rs); - break; - case MaxDamage: - abstractEffectModifier = new MaxDamageEffectModifier(rs); - break; - case MeleeDamageModifier: - abstractEffectModifier = new MeleeDamageEffectModifier(rs); - break; - case MinDamage: - abstractEffectModifier = new MinDamageEffectModifier(rs); - break; - case NoMod: - abstractEffectModifier = new NoModEffectModifier(rs); - break; - case OCV: - abstractEffectModifier = new OCVEffectModifier(rs); - break; - case Parry: - abstractEffectModifier = new ParryEffectModifier(rs); - break; - case PassiveDefense: - abstractEffectModifier = new PassiveDefenseEffectModifier(rs); - break; - case PowerCost: - abstractEffectModifier = new PowerCostEffectModifier(rs); - break; - case PowerCostHealth: - abstractEffectModifier = new PowerCostHealthEffectModifier(rs); - break; - case PowerDamageModifier: - abstractEffectModifier = new PowerDamageEffectModifier(rs); - break; - case ProtectionFrom: - abstractEffectModifier = new ProtectionFromEffectModifier(rs); - break; - case Resistance: - abstractEffectModifier = new ResistanceEffectModifier(rs); - break; - case ScaleHeight: - abstractEffectModifier = new ScaleHeightEffectModifier(rs); - break; - case ScaleWidth: - abstractEffectModifier = new ScaleWidthEffectModifier(rs); - break; - case ScanRange: - abstractEffectModifier = new ScanRangeEffectModifier(rs); - break; - case SeeInvisible: - abstractEffectModifier = new SeeInvisibleEffectModifier(rs); - break; - case Silenced: - abstractEffectModifier = new SilencedEffectModifier(rs); - break; - case Skill: - abstractEffectModifier = new SkillEffectModifier(rs); - break; - case Slay: - abstractEffectModifier = new SlayEffectModifier(rs); - break; - case Speed: - abstractEffectModifier = new SpeedEffectModifier(rs); - break; - case SpireBlock: - abstractEffectModifier = new SpireBlockEffectModifier(rs); - break; - case Stamina: - abstractEffectModifier = new StaminaEffectModifier(rs); - break; - case StaminaFull: - abstractEffectModifier = new StaminaFullEffectModifier(rs); - break; - case StaminaRecoverRate: - abstractEffectModifier = new StaminaRecoverRateEffectModifier(rs); - break; - case Stunned: - abstractEffectModifier = new StunnedEffectModifier(rs); - break; - case Value: - abstractEffectModifier = new ValueEffectModifier(rs); - if (effectBase != null) { - ValueEffectModifier valueEffect = (ValueEffectModifier) abstractEffectModifier; - effectBase.setValue(valueEffect.minMod); - } - break; - case WeaponProc: - abstractEffectModifier = new WeaponProcEffectModifier(rs); - break; - case WeaponRange: - abstractEffectModifier = new WeaponRangeEffectModifier(rs); - break; - case WeaponSpeed: - abstractEffectModifier = new WeaponSpeedEffectModifier(rs); - break; - - } - return abstractEffectModifier; - } -} diff --git a/src/engine/db/handlers/dbLootHandler.java b/src/engine/db/handlers/dbLootHandler.java index f69b92c0..33f9941f 100644 --- a/src/engine/db/handlers/dbLootHandler.java +++ b/src/engine/db/handlers/dbLootHandler.java @@ -11,7 +11,6 @@ package engine.db.handlers; import engine.gameManager.DbManager; import engine.loot.*; -import engine.objects.Item; import org.pmw.tinylog.Logger; import java.sql.Connection; @@ -221,20 +220,4 @@ public class dbLootHandler extends dbHandlerBase { return bootySets; } - public void LOAD_ENCHANT_VALUES() { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT `IDString`, `minMod` FROM `static_power_effectmod` WHERE `modType` = ?")) { - - preparedStatement.setString(1, "Value"); - ResultSet rs = preparedStatement.executeQuery(); - - while (rs.next()) - Item.addEnchantValue(rs.getString("IDString"), rs.getInt("minMod")); - - } catch (SQLException e) { - Logger.error(e); - } - } - } diff --git a/src/engine/db/handlers/dbPowerHandler.java b/src/engine/db/handlers/dbPowerHandler.java deleted file mode 100644 index e4d59356..00000000 --- a/src/engine/db/handlers/dbPowerHandler.java +++ /dev/null @@ -1,61 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2026 -// https://www.magicbane.com - - -package engine.db.handlers; - -import engine.gameManager.DbManager; -import engine.gameManager.PowersManager; -import engine.mbEnums; -import engine.objects.Mob; -import engine.powers.EffectsBase; -import org.pmw.tinylog.Logger; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.util.HashSet; - -public class dbPowerHandler extends dbHandlerBase { - - public dbPowerHandler() { - this.localClass = Mob.class; - this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName()); - } - - public static void addAllSourceTypes() { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_sourcetype")) { - - ResultSet rs = preparedStatement.executeQuery(); - String IDString, source; - EffectsBase effectsBase; - int token; - - while (rs.next()) { - IDString = rs.getString("IDString"); - - // The effect's own token: INVIS-D and SafeMode send the SafeModeB/A action tokens - effectsBase = PowersManager.getEffectByIDString(IDString); - token = (effectsBase != null) ? effectsBase.getToken() : DbManager.hasher.SBStringHash(IDString); - - source = rs.getString("source").replace("-", "").trim(); - mbEnums.EffectSourceType effectSourceType = mbEnums.EffectSourceType.GetEffectSourceType(source); - - if (EffectsBase.effectSourceTypeMap.containsKey(token) == false) - EffectsBase.effectSourceTypeMap.put(token, new HashSet<>()); - - EffectsBase.effectSourceTypeMap.get(token).add(effectSourceType); - } - } catch (Exception e) { - Logger.error(e); - } - } - -} diff --git a/src/engine/gameManager/DbManager.java b/src/engine/gameManager/DbManager.java index e7dc1203..223524b1 100644 --- a/src/engine/gameManager/DbManager.java +++ b/src/engine/gameManager/DbManager.java @@ -65,7 +65,6 @@ public enum DbManager { public static final dbShrineHandler ShrineQueries = new dbShrineHandler(); public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler(); - public static final dbPowerHandler PowerQueries = new dbPowerHandler(); public static final dbPetitionHandler PetitionQueries = new dbPetitionHandler(); private static final EnumMap> objectCache = new EnumMap<>(GameObjectType.class); public static Hasher hasher; diff --git a/src/engine/powers/EffectsBase.java b/src/engine/powers/EffectsBase.java index b03f4e3e..244e2bd9 100644 --- a/src/engine/powers/EffectsBase.java +++ b/src/engine/powers/EffectsBase.java @@ -9,7 +9,6 @@ package engine.powers; -import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; import engine.gameManager.PowersManager; import engine.job.JobContainer; @@ -37,10 +36,6 @@ import engine.server.MBServerStatics; import engine.util.Hasher; import org.pmw.tinylog.Logger; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; @@ -95,39 +90,6 @@ public class EffectsBase { } - /** - * ResultSet Constructor - */ - public EffectsBase(ResultSet rs) throws SQLException { - - this.UUID = rs.getInt("ID"); - this.IDString = rs.getString("IDString"); - this.name = rs.getString("name"); - this.token = rs.getInt("Token"); - - //override tokens for some effects like Safemode that use the Action Token instead of the effect Token, - switch (this.IDString) { - case "INVIS-D": - this.token = -1661751254; - break; - case "SafeMode": - this.token = -1661750486; - break; - - } - int flags = rs.getInt("flags"); - this.isItemEffect = ((flags & 1) != 0) ? true : false; - this.isSpireEffect = ((flags & 2) != 0) ? true : false; - this.ignoreMod = ((flags & 4) != 0) ? true : false; - this.dontSave = ((flags & 8) != 0) ? true : false; - - if (this.IDString.startsWith("PRE-")) - this.isPrefix = true; - else if (this.IDString.startsWith("SUF-")) - this.isSuffix = true; - // getFailConditions(); - } - public EffectsBase(EffectTemplate effectTemplate, int id) { this.UUID = id; @@ -475,113 +437,6 @@ public class EffectsBase { EffectsBase.effectSourceTypeMap.get(this.token).add(EffectSourceType.GetEffectSourceType(source)); } - public static void getFailConditions(HashMap effects) { - - try (Connection connection = DbManager.getConnection(); - PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_failcondition WHERE powerOrEffect = 'Effect';")) { - - ResultSet rs = preparedStatement.executeQuery(); - - PowerFailCondition failCondition = null; - - while (rs.next()) { - String fail = rs.getString("type"); - - - String IDString = rs.getString("IDString"); - failCondition = PowerFailCondition.valueOf(fail); - - if (failCondition == null) { - Logger.error("Couldn't Find FailCondition " + fail + " for " + IDString); - continue; - } - - if (EffectsBase.EffectFailConditions.get(IDString) == null) { - EffectsBase.EffectFailConditions.put(IDString, new HashSet<>()); - } - - EffectsBase.EffectFailConditions.get(IDString).add(failCondition); - EffectsBase eb = effects.get(IDString); - - switch (failCondition) { - - case TakeDamage: - - // dont go any further. - - if (eb == null) - break; - - eb.cancelOnTakeDamage = true; - - - eb.amount = rs.getFloat("amount"); - eb.amountRamp = rs.getFloat("ramp"); - eb.useRampAdd = rs.getBoolean("UseAddFormula"); - - String damageType1 = rs.getString("damageType1"); - String damageType2 = rs.getString("damageType2"); - String damageType3 = rs.getString("damageType3"); - - if (damageType1.isEmpty() && damageType2.isEmpty() && damageType3.isEmpty()) - break; - - if (!EffectsBase.EffectDamageTypes.containsKey(eb.getToken())) - EffectsBase.EffectDamageTypes.put(eb.getToken(), new HashSet<>()); - - mbEnums.DamageType dt = mbEnums.DamageType.getDamageType(damageType1); - if (dt != null) - EffectsBase.EffectDamageTypes.get(eb.token).add(dt); - - dt = mbEnums.DamageType.getDamageType(damageType2); - if (dt != null) - EffectsBase.EffectDamageTypes.get(eb.token).add(dt); - dt = mbEnums.DamageType.getDamageType(damageType3); - if (dt != null) - EffectsBase.EffectDamageTypes.get(eb.token).add(dt); - break; - case Attack: - eb.cancelOnAttack = true; - break; - case AttackSwing: - eb.cancelOnAttackSwing = true; - break; - case Cast: - eb.cancelOnCast = true; - break; - case CastSpell: - eb.cancelOnCastSpell = true; - break; - case EquipChange: - eb.cancelOnEquipChange = true; - break; - case Logout: - eb.cancelOnLogout = true; - break; - case Move: - eb.cancelOnMove = true; - break; - case NewCharm: - eb.cancelOnNewCharm = true; - break; - case Sit: - eb.cancelOnSit = true; - break; - case TerritoryClaim: - eb.cancelOnTerritoryClaim = true; - break; - case UnEquip: - eb.cancelOnUnEquip = true; - break; - } - } - - rs.close(); - } catch (Exception e) { - Logger.error(e); - } - } - public static String getItemEffectsByName(String string) { if (EffectsBase.itemEffectsByName.containsKey(string)) return EffectsBase.itemEffectsByName.get(string); diff --git a/src/engine/powers/effectmodifiers/AbstractEffectModifier.java b/src/engine/powers/effectmodifiers/AbstractEffectModifier.java index e01aca3e..0d349c83 100644 --- a/src/engine/powers/effectmodifiers/AbstractEffectModifier.java +++ b/src/engine/powers/effectmodifiers/AbstractEffectModifier.java @@ -21,9 +21,6 @@ import engine.parsers.objects.wpak.EffectTemplate; import engine.powers.EffectsBase; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; - public abstract class AbstractEffectModifier { @@ -31,7 +28,6 @@ public abstract class AbstractEffectModifier { public SourceType sourceType; public ModType modType; protected EffectsBase parent; - protected int UUID; protected String IDString; protected String effectType; protected float maxMod; @@ -42,24 +38,6 @@ public abstract class AbstractEffectModifier { protected String string1; protected String string2; - public AbstractEffectModifier(ResultSet rs) throws SQLException { - - this.UUID = rs.getInt("ID"); - this.IDString = rs.getString("IDString"); - this.effectType = rs.getString("modType"); - this.modType = ModType.GetModType(this.effectType); - this.type = rs.getString("type").replace("\"", ""); - this.sourceType = SourceType.GetSourceType(this.type.replace(" ", "").replace("-", "")); - this.minMod = rs.getFloat("minMod"); - this.maxMod = rs.getFloat("maxMod"); - this.percentMod = rs.getFloat("percentMod"); - this.ramp = rs.getFloat("ramp"); - this.useRampAdd = (rs.getInt("useRampAdd") == 1) ? true : false; - - this.string1 = rs.getString("string1"); - this.string2 = rs.getString("string2"); - } - // Field mapping matches the old static_power_effectmod columns (JSON-Refactor-Plan/scripts/p46b.py) public AbstractEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { @@ -93,10 +71,6 @@ public abstract class AbstractEffectModifier { } - public int getUUID() { - return this.UUID; - } - // public String getIDString() { // return this.IDString; // } diff --git a/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java b/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java index 1d9336dd..c26b176f 100644 --- a/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java +++ b/src/engine/powers/effectmodifiers/AdjustAboveDmgCapEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class AdjustAboveDmgCapEffectModifier extends AbstractEffectModifier { - public AdjustAboveDmgCapEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public AdjustAboveDmgCapEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java b/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java index ebd99996..bdd1457e 100644 --- a/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java +++ b/src/engine/powers/effectmodifiers/AmbidexterityEffectModifier.java @@ -15,16 +15,9 @@ import engine.mbEnums.SourceType; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class AmbidexterityEffectModifier extends AbstractEffectModifier { - public AmbidexterityEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public AmbidexterityEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java b/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java index 2fc0ddb3..5c4ee2c2 100644 --- a/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ArmorPiercingEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ArmorPiercingEffectModifier extends AbstractEffectModifier { - public ArmorPiercingEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ArmorPiercingEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java b/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java index 50f6dd2a..b1682ed5 100644 --- a/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java +++ b/src/engine/powers/effectmodifiers/AttackDelayEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class AttackDelayEffectModifier extends AbstractEffectModifier { - public AttackDelayEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public AttackDelayEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/AttributeEffectModifier.java b/src/engine/powers/effectmodifiers/AttributeEffectModifier.java index 14c4609c..f49dd11a 100644 --- a/src/engine/powers/effectmodifiers/AttributeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/AttributeEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class AttributeEffectModifier extends AbstractEffectModifier { - public AttributeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public AttributeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java index 70652fed..4b2e97ff 100644 --- a/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java +++ b/src/engine/powers/effectmodifiers/BlackMantleEffectModifier.java @@ -16,16 +16,9 @@ import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; - public class BlackMantleEffectModifier extends AbstractEffectModifier { - public BlackMantleEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public BlackMantleEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java b/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java index b0663aa8..b49fe93d 100644 --- a/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java +++ b/src/engine/powers/effectmodifiers/BladeTrailsEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class BladeTrailsEffectModifier extends AbstractEffectModifier { - public BladeTrailsEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public BladeTrailsEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/BlockEffectModifier.java b/src/engine/powers/effectmodifiers/BlockEffectModifier.java index a7d48620..c14744b0 100644 --- a/src/engine/powers/effectmodifiers/BlockEffectModifier.java +++ b/src/engine/powers/effectmodifiers/BlockEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class BlockEffectModifier extends AbstractEffectModifier { - public BlockEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public BlockEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java b/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java index 35faf39f..3b2c57ed 100644 --- a/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/BlockedPowerTypeEffectModifier.java @@ -14,17 +14,10 @@ import engine.mbEnums.ModType; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashSet; - public class BlockedPowerTypeEffectModifier extends AbstractEffectModifier { - public BlockedPowerTypeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public BlockedPowerTypeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java b/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java index a17dbf57..2ae2a93f 100644 --- a/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java +++ b/src/engine/powers/effectmodifiers/CannotAttackEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CannotAttackEffectModifier extends AbstractEffectModifier { - public CannotAttackEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public CannotAttackEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java b/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java index 0215dfd6..20f8710b 100644 --- a/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java +++ b/src/engine/powers/effectmodifiers/CannotCastEffectModifier.java @@ -14,16 +14,9 @@ import engine.mbEnums; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CannotCastEffectModifier extends AbstractEffectModifier { - public CannotCastEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public CannotCastEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java b/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java index e8fb7cbf..6c8ff543 100644 --- a/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java +++ b/src/engine/powers/effectmodifiers/CannotMoveEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CannotMoveEffectModifier extends AbstractEffectModifier { - public CannotMoveEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public CannotMoveEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java b/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java index 7afd6668..55166f7d 100644 --- a/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java +++ b/src/engine/powers/effectmodifiers/CannotTrackEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CannotTrackEffectModifier extends AbstractEffectModifier { - public CannotTrackEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public CannotTrackEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/CharmedEffectModifier.java b/src/engine/powers/effectmodifiers/CharmedEffectModifier.java index 013c2ff0..2db5efa7 100644 --- a/src/engine/powers/effectmodifiers/CharmedEffectModifier.java +++ b/src/engine/powers/effectmodifiers/CharmedEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class CharmedEffectModifier extends AbstractEffectModifier { - public CharmedEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public CharmedEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java b/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java index 8a8b1db5..b0f70c1a 100644 --- a/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ConstrainedAmbidexterityEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ConstrainedAmbidexterityEffectModifier extends AbstractEffectModifier { - public ConstrainedAmbidexterityEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ConstrainedAmbidexterityEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DCVEffectModifier.java b/src/engine/powers/effectmodifiers/DCVEffectModifier.java index 9eea00bb..592fa1be 100644 --- a/src/engine/powers/effectmodifiers/DCVEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DCVEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DCVEffectModifier extends AbstractEffectModifier { - public DCVEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DCVEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DREffectModifier.java b/src/engine/powers/effectmodifiers/DREffectModifier.java index b8365a89..e1cc2617 100644 --- a/src/engine/powers/effectmodifiers/DREffectModifier.java +++ b/src/engine/powers/effectmodifiers/DREffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DREffectModifier extends AbstractEffectModifier { - public DREffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DREffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java index 1790d487..11991a4a 100644 --- a/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DamageCapEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DamageCapEffectModifier extends AbstractEffectModifier { - public DamageCapEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DamageCapEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java b/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java index efdbf309..d923f55f 100644 --- a/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java @@ -15,16 +15,9 @@ import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; import engine.powers.DamageShield; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DamageShieldEffectModifier extends AbstractEffectModifier { - public DamageShieldEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DamageShieldEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DodgeEffectModifier.java b/src/engine/powers/effectmodifiers/DodgeEffectModifier.java index 9607b544..37a1d37d 100644 --- a/src/engine/powers/effectmodifiers/DodgeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DodgeEffectModifier.java @@ -13,16 +13,9 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DodgeEffectModifier extends AbstractEffectModifier { - public DodgeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DodgeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java index d8b45422..dda65c6a 100644 --- a/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java +++ b/src/engine/powers/effectmodifiers/DurabilityEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class DurabilityEffectModifier extends AbstractEffectModifier { - public DurabilityEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public DurabilityEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java index 8b1d05e1..637cb0ca 100644 --- a/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ExclusiveDamageCapEffectModifier.java @@ -13,16 +13,10 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashSet; public class ExclusiveDamageCapEffectModifier extends AbstractEffectModifier { - public ExclusiveDamageCapEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ExclusiveDamageCapEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/FadeEffectModifier.java b/src/engine/powers/effectmodifiers/FadeEffectModifier.java index e8d17a67..877cf967 100644 --- a/src/engine/powers/effectmodifiers/FadeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/FadeEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class FadeEffectModifier extends AbstractEffectModifier { - public FadeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public FadeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/FlyEffectModifier.java b/src/engine/powers/effectmodifiers/FlyEffectModifier.java index 73fcfdd0..9527b5f0 100644 --- a/src/engine/powers/effectmodifiers/FlyEffectModifier.java +++ b/src/engine/powers/effectmodifiers/FlyEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class FlyEffectModifier extends AbstractEffectModifier { - public FlyEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public FlyEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java index 157644f6..d75bbc74 100644 --- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java @@ -23,25 +23,12 @@ import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.ThreadLocalRandom; public class HealthEffectModifier extends AbstractEffectModifier { private mbEnums.DamageType damageType; - public HealthEffectModifier(ResultSet rs) throws SQLException { - super(rs); - String damageTypeDB = rs.getString("type"); - try { - this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB); - } catch (IllegalArgumentException e) { - Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID - + " value received = '" + damageTypeDB.toUpperCase() + '\'', e); - } - } - public HealthEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); this.damageType = mbEnums.DamageType.getDamageType(this.type); diff --git a/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java b/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java index 7c7c1434..d6c55990 100644 --- a/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthFullEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class HealthFullEffectModifier extends AbstractEffectModifier { - public HealthFullEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public HealthFullEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java index d014cab9..c8b731e8 100644 --- a/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthRecoverRateEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class HealthRecoverRateEffectModifier extends AbstractEffectModifier { - public HealthRecoverRateEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public HealthRecoverRateEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java b/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java index 0f8c9a98..95dd1f81 100644 --- a/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java +++ b/src/engine/powers/effectmodifiers/IgnoreDamageCapEffectModifier.java @@ -13,16 +13,10 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.HashSet; public class IgnoreDamageCapEffectModifier extends AbstractEffectModifier { - public IgnoreDamageCapEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public IgnoreDamageCapEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java b/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java index 8e70ec73..622949ae 100644 --- a/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java +++ b/src/engine/powers/effectmodifiers/IgnorePassiveDefenseEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class IgnorePassiveDefenseEffectModifier extends AbstractEffectModifier { - public IgnorePassiveDefenseEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public IgnorePassiveDefenseEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java index ce49ce14..98912e07 100644 --- a/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ImmuneToAttackEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ImmuneToAttackEffectModifier extends AbstractEffectModifier { - public ImmuneToAttackEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ImmuneToAttackEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java index 7239f5f3..427a6442 100644 --- a/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ImmuneToEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ImmuneToEffectModifier extends AbstractEffectModifier { - public ImmuneToEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ImmuneToEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java b/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java index ea3df870..a9b010bd 100644 --- a/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ImmuneToPowersEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ImmuneToPowersEffectModifier extends AbstractEffectModifier { - public ImmuneToPowersEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ImmuneToPowersEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java b/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java index 6c9da817..572cde0e 100644 --- a/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java +++ b/src/engine/powers/effectmodifiers/InvisibleEffectModifier.java @@ -19,15 +19,8 @@ import engine.powers.ActionsBase; import engine.powers.PowersBase; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; - public class InvisibleEffectModifier extends AbstractEffectModifier { - public InvisibleEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public InvisibleEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java b/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java index 97066010..1b268217 100644 --- a/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ItemNameEffectModifier.java @@ -17,112 +17,10 @@ import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; import engine.powers.EffectsBase; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ItemNameEffectModifier extends AbstractEffectModifier { public String name = ""; - public ItemNameEffectModifier(ResultSet rs) throws SQLException { - super(rs); - - //We're going to add effect names to a lookup map for ./makeitem - int ID = rs.getInt("ID"); - switch (ID) { //don't add these ID's to the name list. They're duplicates - case 4259: - return; - case 4210: - return; - case 4: - return; - case 97: - return; - case 610: - return; - case 4442: - return; - case 5106: - return; - case 4637: - return; - case 2271: - return; - case 587: - return; - case 600: - return; - case 3191: - return; - case 3589: - return; - case 3950: - return; - case 3499: - return; - case 4925: - return; - case 15: - return; - case 5101: - return; - case 2418: - return; - case 183: - return; - case 373: - return; - case 1893: - return; - case 3127: - return; - case 1232: - return; - case 4522: - return; - case 4817: - return; - case 2833: - return; - case 4469: - return; - case 2122: - return; - case 3057: - return; - case 3070: - return; - case 191: - return; - case 3117: - return; - case 3702: - return; - case 1619: - return; - case 2584: - return; - case 414: - return; - case 2078: - return; - case 4844: - return; - case 2275: - return; - } - - String namePre = rs.getString("string1"); - String nameSuf = rs.getString("string2"); - String n = (namePre.isEmpty()) ? nameSuf : namePre; - this.name = n; - n = n.toLowerCase(); - n = n.replace(" ", "_"); - String IDString = rs.getString("IDString"); - IDString = IDString.substring(0, IDString.length() - 1); - EffectsBase.addItemEffectsByName(n, IDString); - } - public ItemNameEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); diff --git a/src/engine/powers/effectmodifiers/ManaEffectModifier.java b/src/engine/powers/effectmodifiers/ManaEffectModifier.java index 182b860c..147c5113 100644 --- a/src/engine/powers/effectmodifiers/ManaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ManaEffectModifier.java @@ -24,8 +24,6 @@ import engine.powers.poweractions.DamageOverTimePowerAction; import engine.powers.poweractions.DirectDamagePowerAction; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.concurrent.ThreadLocalRandom; @@ -33,17 +31,6 @@ public class ManaEffectModifier extends AbstractEffectModifier { private mbEnums.DamageType damageType; - public ManaEffectModifier(ResultSet rs) throws SQLException { - super(rs); - String damageTypeDB = rs.getString("type"); - try { - this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB); - } catch (IllegalArgumentException e) { - Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID - + " value received = '" + damageTypeDB.toUpperCase() + '\'', e); - } - } - public ManaEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); this.damageType = mbEnums.DamageType.getDamageType(this.type); diff --git a/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java b/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java index 490083e2..a3ea865d 100644 --- a/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ManaFullEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ManaFullEffectModifier extends AbstractEffectModifier { - public ManaFullEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ManaFullEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java index 03df9914..1da901bb 100644 --- a/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ManaRecoverRateEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ManaRecoverRateEffectModifier extends AbstractEffectModifier { - public ManaRecoverRateEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ManaRecoverRateEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java index ebbf165e..94b3d0d0 100644 --- a/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java +++ b/src/engine/powers/effectmodifiers/MaxDamageEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class MaxDamageEffectModifier extends AbstractEffectModifier { - public MaxDamageEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public MaxDamageEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java index 3b4404aa..51aa2384 100644 --- a/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java +++ b/src/engine/powers/effectmodifiers/MeleeDamageEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class MeleeDamageEffectModifier extends AbstractEffectModifier { - public MeleeDamageEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public MeleeDamageEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java b/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java index 7e4d89ef..f6f8b6f4 100644 --- a/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java +++ b/src/engine/powers/effectmodifiers/MinDamageEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class MinDamageEffectModifier extends AbstractEffectModifier { - public MinDamageEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public MinDamageEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/NoModEffectModifier.java b/src/engine/powers/effectmodifiers/NoModEffectModifier.java index 43025bac..37bbe770 100644 --- a/src/engine/powers/effectmodifiers/NoModEffectModifier.java +++ b/src/engine/powers/effectmodifiers/NoModEffectModifier.java @@ -14,15 +14,8 @@ import engine.mbEnums.GameObjectType; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class NoModEffectModifier extends AbstractEffectModifier { - public NoModEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public NoModEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/OCVEffectModifier.java b/src/engine/powers/effectmodifiers/OCVEffectModifier.java index e0b23e21..fa742144 100644 --- a/src/engine/powers/effectmodifiers/OCVEffectModifier.java +++ b/src/engine/powers/effectmodifiers/OCVEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class OCVEffectModifier extends AbstractEffectModifier { - public OCVEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public OCVEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ParryEffectModifier.java b/src/engine/powers/effectmodifiers/ParryEffectModifier.java index f6a3c036..7992192e 100644 --- a/src/engine/powers/effectmodifiers/ParryEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ParryEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ParryEffectModifier extends AbstractEffectModifier { - public ParryEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ParryEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java b/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java index faf54413..5dc0d2df 100644 --- a/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java +++ b/src/engine/powers/effectmodifiers/PassiveDefenseEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class PassiveDefenseEffectModifier extends AbstractEffectModifier { - public PassiveDefenseEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public PassiveDefenseEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java b/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java index d68cb1e7..c1559f8a 100644 --- a/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java +++ b/src/engine/powers/effectmodifiers/PowerCostEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class PowerCostEffectModifier extends AbstractEffectModifier { - public PowerCostEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public PowerCostEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java b/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java index b3c0b43b..28b9b46f 100644 --- a/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/PowerCostHealthEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class PowerCostHealthEffectModifier extends AbstractEffectModifier { - public PowerCostHealthEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public PowerCostHealthEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java b/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java index 40614626..5db0cd1c 100644 --- a/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java +++ b/src/engine/powers/effectmodifiers/PowerDamageEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class PowerDamageEffectModifier extends AbstractEffectModifier { - public PowerDamageEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public PowerDamageEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java b/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java index 3fee7d5a..e6912848 100644 --- a/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ProtectionFromEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ProtectionFromEffectModifier extends AbstractEffectModifier { - public ProtectionFromEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ProtectionFromEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java b/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java index d8c773ef..a6b9ab9b 100644 --- a/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ResistanceEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ResistanceEffectModifier extends AbstractEffectModifier { - public ResistanceEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ResistanceEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java b/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java index ee705a0f..6d69915e 100644 --- a/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ScaleHeightEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ScaleHeightEffectModifier extends AbstractEffectModifier { - public ScaleHeightEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ScaleHeightEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java b/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java index 29b5b1ec..5402aded 100644 --- a/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ScaleWidthEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ScaleWidthEffectModifier extends AbstractEffectModifier { - public ScaleWidthEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ScaleWidthEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java b/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java index 1ce1c8ff..d51a08bd 100644 --- a/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ScanRangeEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ScanRangeEffectModifier extends AbstractEffectModifier { - public ScanRangeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ScanRangeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java b/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java index defdcb0b..0b990446 100644 --- a/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SeeInvisibleEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SeeInvisibleEffectModifier extends AbstractEffectModifier { - public SeeInvisibleEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SeeInvisibleEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SilencedEffectModifier.java b/src/engine/powers/effectmodifiers/SilencedEffectModifier.java index 35ce2950..91c5381f 100644 --- a/src/engine/powers/effectmodifiers/SilencedEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SilencedEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SilencedEffectModifier extends AbstractEffectModifier { - public SilencedEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SilencedEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SkillEffectModifier.java b/src/engine/powers/effectmodifiers/SkillEffectModifier.java index 1d9cab6c..fdc63a3c 100644 --- a/src/engine/powers/effectmodifiers/SkillEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SkillEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SkillEffectModifier extends AbstractEffectModifier { - public SkillEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SkillEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SlayEffectModifier.java b/src/engine/powers/effectmodifiers/SlayEffectModifier.java index dd9fa128..be26d1d4 100644 --- a/src/engine/powers/effectmodifiers/SlayEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SlayEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SlayEffectModifier extends AbstractEffectModifier { - public SlayEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SlayEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SpeedEffectModifier.java b/src/engine/powers/effectmodifiers/SpeedEffectModifier.java index 18739628..49b6fc5a 100644 --- a/src/engine/powers/effectmodifiers/SpeedEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SpeedEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SpeedEffectModifier extends AbstractEffectModifier { - public SpeedEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SpeedEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java b/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java index e59cc266..29b2551c 100644 --- a/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java +++ b/src/engine/powers/effectmodifiers/SpireBlockEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class SpireBlockEffectModifier extends AbstractEffectModifier { - public SpireBlockEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public SpireBlockEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java index 6390cb37..1ec5f735 100644 --- a/src/engine/powers/effectmodifiers/StaminaEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StaminaEffectModifier.java @@ -24,8 +24,6 @@ import engine.powers.poweractions.DamageOverTimePowerAction; import engine.powers.poweractions.DirectDamagePowerAction; import org.pmw.tinylog.Logger; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.ArrayList; import java.util.concurrent.ThreadLocalRandom; @@ -33,17 +31,6 @@ public class StaminaEffectModifier extends AbstractEffectModifier { private mbEnums.DamageType damageType; - public StaminaEffectModifier(ResultSet rs) throws SQLException { - super(rs); - String damageTypeDB = rs.getString("type"); - try { - this.damageType = mbEnums.DamageType.getDamageType(damageTypeDB); - } catch (IllegalArgumentException e) { - Logger.error("DamageType could not be loaded from database. " + "UUID = " + this.UUID - + " value received = '" + damageTypeDB.toUpperCase() + '\'', e); - } - } - public StaminaEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); this.damageType = mbEnums.DamageType.getDamageType(this.type); diff --git a/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java index c1924125..7390dd9d 100644 --- a/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StaminaFullEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class StaminaFullEffectModifier extends AbstractEffectModifier { - public StaminaFullEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public StaminaFullEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java b/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java index 38a7fd80..7777351f 100644 --- a/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StaminaRecoverRateEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class StaminaRecoverRateEffectModifier extends AbstractEffectModifier { - public StaminaRecoverRateEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public StaminaRecoverRateEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/StunnedEffectModifier.java b/src/engine/powers/effectmodifiers/StunnedEffectModifier.java index bc20eaf6..917d4244 100644 --- a/src/engine/powers/effectmodifiers/StunnedEffectModifier.java +++ b/src/engine/powers/effectmodifiers/StunnedEffectModifier.java @@ -14,15 +14,8 @@ import engine.mbEnums.GameObjectType; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class StunnedEffectModifier extends AbstractEffectModifier { - public StunnedEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public StunnedEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/ValueEffectModifier.java b/src/engine/powers/effectmodifiers/ValueEffectModifier.java index 999067d6..727bbd3b 100644 --- a/src/engine/powers/effectmodifiers/ValueEffectModifier.java +++ b/src/engine/powers/effectmodifiers/ValueEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class ValueEffectModifier extends AbstractEffectModifier { - public ValueEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public ValueEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java index 9b8d9c31..b4db7d77 100644 --- a/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java +++ b/src/engine/powers/effectmodifiers/WeaponProcEffectModifier.java @@ -18,15 +18,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class WeaponProcEffectModifier extends AbstractEffectModifier { - public WeaponProcEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public WeaponProcEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java index 4032d6d0..81e3a01d 100644 --- a/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java +++ b/src/engine/powers/effectmodifiers/WeaponRangeEffectModifier.java @@ -13,15 +13,8 @@ import engine.jobs.AbstractEffectJob; import engine.objects.*; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class WeaponRangeEffectModifier extends AbstractEffectModifier { - public WeaponRangeEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public WeaponRangeEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); } diff --git a/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java b/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java index 24196534..263e07d4 100644 --- a/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java +++ b/src/engine/powers/effectmodifiers/WeaponSpeedEffectModifier.java @@ -16,15 +16,8 @@ import engine.objects.Building; import engine.objects.Item; import engine.parsers.objects.wpak.EffectTemplate; -import java.sql.ResultSet; -import java.sql.SQLException; - public class WeaponSpeedEffectModifier extends AbstractEffectModifier { - public WeaponSpeedEffectModifier(ResultSet rs) throws SQLException { - super(rs); - } - public WeaponSpeedEffectModifier(String IDString, EffectTemplate.ModEntry modEntry) { super(IDString, modEntry); }