Browse Source

Project reformat.

combat-2
MagicBot 8 months ago
parent
commit
943d274e5f
  1. 4
      src/engine/devcmd/cmds/AddGoldCmd.java
  2. 3
      src/engine/devcmd/cmds/RegionCmd.java
  3. 1
      src/engine/gameManager/BuildingManager.java
  4. 1
      src/engine/gameManager/GuildManager.java
  5. 4
      src/engine/mobileAI/Threads/MobAIThread.java
  6. 1
      src/engine/mobileAI/Threads/Respawner.java
  7. 1
      src/engine/net/client/handlers/GroupInviteHandler.java
  8. 4
      src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
  9. 5
      src/engine/net/client/handlers/InviteToSubHandler.java
  10. 10
      src/engine/net/client/handlers/LeaveGuildHandler.java
  11. 4
      src/engine/net/client/handlers/MoveToPointHandler.java
  12. 1
      src/engine/net/client/handlers/ObjectActionMsgHandler.java
  13. 1
      src/engine/net/client/handlers/RequestEnterWorldHandler.java
  14. 5
      src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java
  15. 5
      src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java
  16. 5
      src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java
  17. 2
      src/engine/net/client/msg/LootMsg.java
  18. 1
      src/engine/net/client/msg/ManageNPCMsg.java
  19. 1
      src/engine/net/client/msg/MoveToPointMsg.java
  20. 5
      src/engine/net/client/msg/UpdateGoldMsg.java
  21. 4
      src/engine/objects/ItemBase.java
  22. 1
      src/engine/objects/MobBase.java
  23. 8
      src/engine/objects/MobBaseStats.java
  24. 1
      src/engine/objects/Petition.java
  25. 1
      src/engine/objects/Portal.java
  26. 1
      src/engine/powers/DamageShield.java
  27. 1
      src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java
  28. 1
      src/engine/powers/effectmodifiers/HealthEffectModifier.java
  29. 1
      src/engine/powers/poweractions/ApplyEffectPowerAction.java

4
src/engine/devcmd/cmds/AddGoldCmd.java

@ -11,7 +11,9 @@ package engine.devcmd.cmds;
import engine.devcmd.AbstractDevCmd; import engine.devcmd.AbstractDevCmd;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.objects.*; import engine.objects.AbstractGameObject;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
/** /**
* @author Eighty * @author Eighty

3
src/engine/devcmd/cmds/RegionCmd.java

@ -9,13 +9,10 @@
package engine.devcmd.cmds; package engine.devcmd.cmds;
import engine.Enum;
import engine.devcmd.AbstractDevCmd; import engine.devcmd.AbstractDevCmd;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.objects.*; import engine.objects.*;
import java.lang.reflect.Field;
public class RegionCmd extends AbstractDevCmd { public class RegionCmd extends AbstractDevCmd {
public RegionCmd() { public RegionCmd() {

1
src/engine/gameManager/BuildingManager.java

@ -42,6 +42,7 @@ public enum BuildingManager {
public static HashMap<Integer, ConcurrentHashMap<Integer, BuildingFriends>> _buildingFriends = new HashMap<>(); public static HashMap<Integer, ConcurrentHashMap<Integer, BuildingFriends>> _buildingFriends = new HashMap<>();
public static HashMap<Integer, ConcurrentHashMap<Integer, Condemned>> _buildingCondemned = new HashMap<>(); public static HashMap<Integer, ConcurrentHashMap<Integer, Condemned>> _buildingCondemned = new HashMap<>();
public static HashMap<Integer, ArrayList<Vector3fImmutable>> _buildingPatrolPoints = new HashMap<>(); public static HashMap<Integer, ArrayList<Vector3fImmutable>> _buildingPatrolPoints = new HashMap<>();
public static int getAvailableSlot(Building building) { public static int getAvailableSlot(Building building) {
ArrayList<BuildingLocation> slotLocations = _slotLocations.get(building.meshUUID); ArrayList<BuildingLocation> slotLocations = _slotLocations.get(building.meshUUID);

1
src/engine/gameManager/GuildManager.java

@ -200,6 +200,7 @@ public enum GuildManager {
} }
} }
public static Boolean meetsLoreRequirements(Guild guild, PlayerCharacter player) { public static Boolean meetsLoreRequirements(Guild guild, PlayerCharacter player) {
Enum.GuildCharterType charter = guild.getGuildType(); Enum.GuildCharterType charter = guild.getGuildType();
if (charter.requiredClasses.contains(player.absPromotionClass)) if (charter.requiredClasses.contains(player.absPromotionClass))

4
src/engine/mobileAI/Threads/MobAIThread.java

@ -1,11 +1,10 @@
package engine.mobileAI.Threads; package engine.mobileAI.Threads;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.mobileAI.MobAI;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
import engine.mobileAI.MobAI;
import engine.objects.Mob; import engine.objects.Mob;
import engine.objects.Zone; import engine.objects.Zone;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
public class MobAIThread implements Runnable { public class MobAIThread implements Runnable {
@ -42,6 +41,7 @@ public class MobAIThread implements Runnable{
} }
} }
} }
public static void startAIThread() { public static void startAIThread() {
Thread aiThread; Thread aiThread;
aiThread = new Thread(new MobAIThread()); aiThread = new Thread(new MobAIThread());

1
src/engine/mobileAI/Threads/Respawner.java

@ -8,6 +8,7 @@
package engine.mobileAI.Threads; package engine.mobileAI.Threads;
import engine.objects.Mob; import engine.objects.Mob;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;

1
src/engine/net/client/handlers/GroupInviteHandler.java

@ -14,7 +14,6 @@ import engine.Enum.GameObjectType;
import engine.exception.MsgSendException; import engine.exception.MsgSendException;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
import engine.gameManager.GuildManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.net.Dispatch; import engine.net.Dispatch;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;

4
src/engine/net/client/handlers/GuildCreationFinalizeHandler.java

@ -26,7 +26,9 @@ import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ErrorPopupMsg; import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.guild.GuildCreationFinalizeMsg; import engine.net.client.msg.guild.GuildCreationFinalizeMsg;
import engine.net.client.msg.guild.GuildInfoMsg; import engine.net.client.msg.guild.GuildInfoMsg;
import engine.objects.*; import engine.objects.Guild;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.util.StringUtils; import engine.util.StringUtils;
public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler { public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {

5
src/engine/net/client/handlers/InviteToSubHandler.java

@ -12,7 +12,10 @@ package engine.net.client.handlers;
import engine.Enum; import engine.Enum;
import engine.Enum.GameObjectType; import engine.Enum.GameObjectType;
import engine.exception.MsgSendException; import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.ChatManager;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch; import engine.net.Dispatch;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;

10
src/engine/net/client/handlers/LeaveGuildHandler.java

@ -11,13 +11,19 @@ package engine.net.client.handlers;
import engine.Enum.GuildHistoryType; import engine.Enum.GuildHistoryType;
import engine.exception.MsgSendException; import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.ChatManager;
import engine.gameManager.ConfigManager;
import engine.gameManager.GroupManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch; import engine.net.Dispatch;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.guild.LeaveGuildMsg; import engine.net.client.msg.guild.LeaveGuildMsg;
import engine.objects.*; import engine.objects.Guild;
import engine.objects.GuildStatusController;
import engine.objects.Mine;
import engine.objects.PlayerCharacter;
public class LeaveGuildHandler extends AbstractClientMsgHandler { public class LeaveGuildHandler extends AbstractClientMsgHandler {

4
src/engine/net/client/handlers/MoveToPointHandler.java

@ -9,14 +9,12 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.Enum;
import engine.exception.MsgSendException; import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.MovementManager; import engine.gameManager.MovementManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.MoveToPointMsg; import engine.net.client.msg.MoveToPointMsg;
import engine.objects.*; import engine.objects.PlayerCharacter;
public class MoveToPointHandler extends AbstractClientMsgHandler { public class MoveToPointHandler extends AbstractClientMsgHandler {

1
src/engine/net/client/handlers/ObjectActionMsgHandler.java

@ -30,6 +30,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
public ObjectActionMsgHandler() { public ObjectActionMsgHandler() {
super(ObjectActionMsg.class); super(ObjectActionMsg.class);
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {

1
src/engine/net/client/handlers/RequestEnterWorldHandler.java

@ -14,7 +14,6 @@ import engine.net.Dispatch;
import engine.net.DispatchMessage; import engine.net.DispatchMessage;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.*; import engine.net.client.msg.*;
import engine.objects.AbstractWorldObject;
import engine.objects.Account; import engine.objects.Account;
import engine.objects.PlayerCharacter; import engine.objects.PlayerCharacter;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;

5
src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java

@ -12,7 +12,10 @@ import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.PlaceAssetMsg; import engine.net.client.msg.PlaceAssetMsg;
import engine.net.client.msg.TransferGoldToFromBuildingMsg; import engine.net.client.msg.TransferGoldToFromBuildingMsg;
import engine.net.client.msg.UpdateGoldMsg; import engine.net.client.msg.UpdateGoldMsg;
import engine.objects.*; import engine.objects.Building;
import engine.objects.CharacterItemManager;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
/* /*

5
src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java

@ -16,7 +16,10 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.ApplyEffectMsg; import engine.net.client.msg.ApplyEffectMsg;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.TransferItemFromEquipToInventoryMsg; import engine.net.client.msg.TransferItemFromEquipToInventoryMsg;
import engine.objects.*; import engine.objects.CharacterItemManager;
import engine.objects.Effect;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHandler { public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHandler {

5
src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java

@ -19,7 +19,10 @@ import engine.net.client.msg.ApplyEffectMsg;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.TransferItemFromEquipToInventoryMsg; import engine.net.client.msg.TransferItemFromEquipToInventoryMsg;
import engine.net.client.msg.TransferItemFromInventoryToEquipMsg; import engine.net.client.msg.TransferItemFromInventoryToEquipMsg;
import engine.objects.*; import engine.objects.CharacterItemManager;
import engine.objects.Effect;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
import engine.server.MBServerStatics; import engine.server.MBServerStatics;
public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHandler { public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHandler {

2
src/engine/net/client/msg/LootMsg.java

@ -10,13 +10,11 @@
package engine.net.client.msg; package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.net.AbstractConnection; import engine.net.AbstractConnection;
import engine.net.ByteBufferReader; import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter; import engine.net.ByteBufferWriter;
import engine.net.client.Protocol; import engine.net.client.Protocol;
import engine.objects.Item; import engine.objects.Item;
import engine.objects.Item;
public class LootMsg extends ClientNetMsg { public class LootMsg extends ClientNetMsg {

1
src/engine/net/client/msg/ManageNPCMsg.java

@ -771,6 +771,7 @@ public class ManageNPCMsg extends ClientNetMsg {
public void setUnknown06(int unknown06) { public void setUnknown06(int unknown06) {
this.unknown06 = unknown06; this.unknown06 = unknown06;
} }
public int getMessageType() { public int getMessageType() {
return messageType; return messageType;
} }

1
src/engine/net/client/msg/MoveToPointMsg.java

@ -10,7 +10,6 @@
package engine.net.client.msg; package engine.net.client.msg;
import engine.Enum.GameObjectType; import engine.Enum.GameObjectType;
import engine.gameManager.BuildingManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.net.AbstractConnection; import engine.net.AbstractConnection;

5
src/engine/net/client/msg/UpdateGoldMsg.java

@ -15,7 +15,10 @@ import engine.net.AbstractConnection;
import engine.net.ByteBufferReader; import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter; import engine.net.ByteBufferWriter;
import engine.net.client.Protocol; import engine.net.client.Protocol;
import engine.objects.*; import engine.objects.AbstractWorldObject;
import engine.objects.CharacterItemManager;
import engine.objects.Item;
import engine.objects.PlayerCharacter;
/** /**
* Update gold in inventory and/or bank * Update gold in inventory and/or bank

4
src/engine/objects/ItemBase.java

@ -10,13 +10,11 @@
package engine.objects; package engine.objects;
import engine.Enum; import engine.Enum;
import engine.Enum.ItemType;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import org.pmw.tinylog.Logger; import org.pmw.tinylog.Logger;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class ItemBase { public class ItemBase {
@ -96,6 +94,7 @@ public class ItemBase {
public final int getUUID() { public final int getUUID() {
return uuid; return uuid;
} }
public String getMastery() { public String getMastery() {
return mastery; return mastery;
} }
@ -127,6 +126,7 @@ public class ItemBase {
public short getMinDamage() { public short getMinDamage() {
return minDamage; return minDamage;
} }
public Enum.SourceType getDamageType() { public Enum.SourceType getDamageType() {
return damageType; return damageType;
} }

1
src/engine/objects/MobBase.java

@ -19,7 +19,6 @@ import engine.server.MBServerStatics;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
public class MobBase extends AbstractGameObject { public class MobBase extends AbstractGameObject {

8
src/engine/objects/MobBaseStats.java

@ -79,8 +79,12 @@ public class MobBaseStats {
return baseDex; return baseDex;
} }
public int getBaseSkill(){return mobbaseSkill;} public int getBaseSkill() {
return mobbaseSkill;
}
public int getBaseSkillAmount(){return mobbaseSkillAmount;} public int getBaseSkillAmount() {
return mobbaseSkillAmount;
}
} }

1
src/engine/objects/Petition.java

@ -7,6 +7,7 @@
// www.magicbane.com // www.magicbane.com
package engine.objects; package engine.objects;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.PetitionReceivedMsg; import engine.net.client.msg.PetitionReceivedMsg;

1
src/engine/objects/Portal.java

@ -3,7 +3,6 @@ package engine.objects;
import engine.Enum; import engine.Enum;
import engine.Enum.PortalType; import engine.Enum.PortalType;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.gameManager.BuildingManager;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.job.JobScheduler; import engine.job.JobScheduler;
import engine.jobs.CloseGateJob; import engine.jobs.CloseGateJob;

1
src/engine/powers/DamageShield.java

@ -8,6 +8,7 @@
package engine.powers; package engine.powers;
import engine.Enum; import engine.Enum;
public class DamageShield { public class DamageShield {

1
src/engine/powers/effectmodifiers/DamageShieldEffectModifier.java

@ -8,6 +8,7 @@
package engine.powers.effectmodifiers; package engine.powers.effectmodifiers;
import engine.Enum; import engine.Enum;
import engine.jobs.AbstractEffectJob; import engine.jobs.AbstractEffectJob;
import engine.objects.*; import engine.objects.*;

1
src/engine/powers/effectmodifiers/HealthEffectModifier.java

@ -8,6 +8,7 @@
package engine.powers.effectmodifiers; package engine.powers.effectmodifiers;
import engine.Enum.GameObjectType; import engine.Enum.GameObjectType;
import engine.Enum.ModType; import engine.Enum.ModType;
import engine.Enum.SourceType; import engine.Enum.SourceType;

1
src/engine/powers/poweractions/ApplyEffectPowerAction.java

@ -8,6 +8,7 @@
package engine.powers.poweractions; package engine.powers.poweractions;
import engine.Enum.GameObjectType; import engine.Enum.GameObjectType;
import engine.Enum.ModType; import engine.Enum.ModType;
import engine.Enum.SourceType; import engine.Enum.SourceType;

Loading…
Cancel
Save