From 865db149ade4e5254c3e222e3acfd2ce419472f4 Mon Sep 17 00:00:00 2001 From: Treeku Date: Wed, 14 May 2014 15:51:25 +0100 Subject: [PATCH] Fixed loads of warnings --- .../AuctionQueryHeadersResponseMessage.java | 5 ----- .../CreateAuctionMessage.java | 1 - .../CreateImmediateAuctionMessage.java | 1 - .../GetAuctionDetailsResponse.java | 1 - src/protocol/swg/chat/ChatOnLeaveRoom.java | 1 - src/protocol/swg/chat/ChatSendToRoom.java | 1 - .../objectControllerObjects/CombatSpam.java | 1 + .../MissionListRequest.java | 3 --- src/resources/common/Forager.java | 7 ++----- src/resources/loot/LootGroup.java | 2 -- .../objects/creature/CreatureObject.java | 1 - src/resources/objects/group/GroupObject.java | 1 + .../harvester/HarvesterMessageBuilder.java | 16 ++++++++-------- .../InstallationMessageBuilder.java | 5 ++--- .../objects/resource/GalacticResource.java | 2 +- src/services/ConnectionService.java | 2 -- src/services/LootService.java | 9 ++------- src/services/PlayerService.java | 4 ++-- src/services/SurveyService.java | 7 +++---- src/services/ai/AIActor.java | 7 +++---- src/services/ai/LairActor.java | 4 ++-- src/services/ai/states/AttackState.java | 4 ++-- src/services/ai/states/DeathState.java | 3 --- src/services/ai/states/StalkState.java | 1 - src/services/bazaar/AuctionItem.java | 4 ---- src/services/bazaar/BazaarService.java | 8 -------- src/services/chat/ChatService.java | 3 --- src/services/combat/CombatService.java | 3 +-- src/services/command/CommandService.java | 3 ++- src/services/pet/MountService.java | 4 ++-- src/services/playercities/PlayerCity.java | 2 +- src/services/resources/HarvesterService.java | 9 ++------- src/services/resources/ResourceService.java | 18 +++++------------- src/services/spawn/DynamicSpawnArea.java | 2 -- src/services/spawn/SpawnService.java | 6 +++--- src/services/trade/TradeService.java | 2 +- 36 files changed, 46 insertions(+), 107 deletions(-) diff --git a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java index e67de9b2..3ea90dd0 100644 --- a/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/AuctionQueryHeadersResponseMessage.java @@ -22,15 +22,10 @@ package protocol.swg.auctionManagerClientListener; import java.nio.ByteOrder; -import java.util.HashSet; import java.util.LinkedHashSet; -import java.util.Set; -import java.util.TreeSet; -import java.util.Vector; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.CRC; import protocol.swg.SWGMessage; import services.bazaar.AuctionItem; diff --git a/src/protocol/swg/auctionManagerClientListener/CreateAuctionMessage.java b/src/protocol/swg/auctionManagerClientListener/CreateAuctionMessage.java index d05a6756..33a57339 100644 --- a/src/protocol/swg/auctionManagerClientListener/CreateAuctionMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/CreateAuctionMessage.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; import protocol.swg.SWGMessage; public class CreateAuctionMessage extends SWGMessage { diff --git a/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java b/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java index 6db48c5b..0546f41e 100644 --- a/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java +++ b/src/protocol/swg/auctionManagerClientListener/CreateImmediateAuctionMessage.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.Utilities; import protocol.swg.SWGMessage; public class CreateImmediateAuctionMessage extends SWGMessage { diff --git a/src/protocol/swg/auctionManagerClientListener/GetAuctionDetailsResponse.java b/src/protocol/swg/auctionManagerClientListener/GetAuctionDetailsResponse.java index 458c59d6..e4aaac6c 100644 --- a/src/protocol/swg/auctionManagerClientListener/GetAuctionDetailsResponse.java +++ b/src/protocol/swg/auctionManagerClientListener/GetAuctionDetailsResponse.java @@ -25,7 +25,6 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.objects.SWGObject; import protocol.swg.SWGMessage; import resources.objects.tangible.TangibleObject; import services.bazaar.AuctionItem; diff --git a/src/protocol/swg/chat/ChatOnLeaveRoom.java b/src/protocol/swg/chat/ChatOnLeaveRoom.java index a45b1def..b9c2c0ba 100644 --- a/src/protocol/swg/chat/ChatOnLeaveRoom.java +++ b/src/protocol/swg/chat/ChatOnLeaveRoom.java @@ -25,7 +25,6 @@ import java.nio.ByteOrder; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.StringUtilities; import protocol.swg.SWGMessage; public class ChatOnLeaveRoom extends SWGMessage { diff --git a/src/protocol/swg/chat/ChatSendToRoom.java b/src/protocol/swg/chat/ChatSendToRoom.java index 302390de..68e0ced2 100644 --- a/src/protocol/swg/chat/ChatSendToRoom.java +++ b/src/protocol/swg/chat/ChatSendToRoom.java @@ -26,7 +26,6 @@ import java.nio.ByteBuffer; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.StringUtilities; import protocol.swg.SWGMessage; public class ChatSendToRoom extends SWGMessage { diff --git a/src/protocol/swg/objectControllerObjects/CombatSpam.java b/src/protocol/swg/objectControllerObjects/CombatSpam.java index 26d64b9a..b6be2857 100644 --- a/src/protocol/swg/objectControllerObjects/CombatSpam.java +++ b/src/protocol/swg/objectControllerObjects/CombatSpam.java @@ -28,6 +28,7 @@ import org.apache.mina.core.buffer.IoBuffer; import protocol.swg.ObjControllerMessage; import resources.datatables.HitType; +@SuppressWarnings("unused") public class CombatSpam extends ObjControllerObject{ private long attackerId; diff --git a/src/protocol/swg/objectControllerObjects/MissionListRequest.java b/src/protocol/swg/objectControllerObjects/MissionListRequest.java index 974b69cd..6d1fa2f5 100644 --- a/src/protocol/swg/objectControllerObjects/MissionListRequest.java +++ b/src/protocol/swg/objectControllerObjects/MissionListRequest.java @@ -23,9 +23,6 @@ package protocol.swg.objectControllerObjects; import org.apache.mina.core.buffer.IoBuffer; -import engine.resources.common.StringUtilities; -import resources.common.Console; - public class MissionListRequest extends ObjControllerObject { private long objectId; diff --git a/src/resources/common/Forager.java b/src/resources/common/Forager.java index 66b11041..000d8886 100644 --- a/src/resources/common/Forager.java +++ b/src/resources/common/Forager.java @@ -289,7 +289,6 @@ public class Forager { break; } wormie.setCustomName(name); - wormie.setCustomName2(name); wormie.setLevel(forager.getLevel()); wormie.setOptions(Options.AGGRESSIVE, true); wormie.setOptions(Options.ATTACKABLE, true); @@ -342,7 +341,6 @@ public class Forager { goon.addObserver(forager); goon.setCustomName(name); - goon.setCustomName2(name); goon.setLevel(forager.getLevel()); goon.setOptions(Options.AGGRESSIVE, true); goon.setOptions(Options.ATTACKABLE, true); @@ -418,7 +416,6 @@ public class Forager { guard.addObserver(owner); // ToDo: add any players in aggro range!!! guard.setCustomName(name); - guard.setCustomName2(name); guard.setLevel(owner.getLevel()); guard.setOptions(Options.AGGRESSIVE, true); guard.setOptions(Options.ATTACKABLE, true); @@ -434,8 +431,8 @@ public class Forager { public CreatureObject spawnBoss(Point3D exactTreasureLocation, CreatureObject owner, TangibleObject map, short spawnLevel){ - Point3D treasureLocation = resources.common.SpawnPoint.getRandomPosition(exactTreasureLocation, 1, 10, owner.getPlanetId()); - return new CreatureObject(); + //Point3D treasureLocation = resources.common.SpawnPoint.getRandomPosition(exactTreasureLocation, 1, 10, owner.getPlanetId()); + return new CreatureObject(); // FIXME on paper this looks bad } @SuppressWarnings("unchecked") diff --git a/src/resources/loot/LootGroup.java b/src/resources/loot/LootGroup.java index 9df63790..94ad4ef7 100644 --- a/src/resources/loot/LootGroup.java +++ b/src/resources/loot/LootGroup.java @@ -23,8 +23,6 @@ package resources.loot; import java.io.Serializable; -import com.sleepycat.persist.model.Persistent; - /** * @author Charon */ diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java index 6f55ab4f..39a62f42 100644 --- a/src/resources/objects/creature/CreatureObject.java +++ b/src/resources/objects/creature/CreatureObject.java @@ -104,7 +104,6 @@ public class CreatureObject extends TangibleObject implements Serializable { private transient int missionCriticalObjectsUpdateCounter = 0; // CREO6 - private byte combatFlag = 0; private short level = -1; private int grantedHealth = 0; private String currentAnimation; diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java index 92986e39..85535598 100644 --- a/src/resources/objects/group/GroupObject.java +++ b/src/resources/objects/group/GroupObject.java @@ -32,6 +32,7 @@ import engine.resources.scene.Quaternion; public class GroupObject extends UniverseObject { + private static final long serialVersionUID = 1L; private Vector memberList = new Vector(); private int memberListUpdateCounter; private SWGObject groupLeader; diff --git a/src/resources/objects/harvester/HarvesterMessageBuilder.java b/src/resources/objects/harvester/HarvesterMessageBuilder.java index bf3422cb..81372b07 100644 --- a/src/resources/objects/harvester/HarvesterMessageBuilder.java +++ b/src/resources/objects/harvester/HarvesterMessageBuilder.java @@ -168,9 +168,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder { Vector outputHopperContent = harvester.getOutputHopperContent(); int hopperContentSize = outputHopperContent.size(); - int iHopperList = 1; + //int iHopperList = 1; if (hopperContentSize==0) { - iHopperList = 0; + //iHopperList = 0; } //int sizeP = 30 + 15*hopperContentSize; int sizeP = 30-2-4-4; @@ -195,12 +195,12 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder { // buffer.putInt(iHopperList); // buffer.putInt(harvester.getResourceUpdateCount()); int sumOfHopper = 0; - int i = 0; + //int i = 0; sumOfHopper = 0; Vector outputHopper = harvester.getOutputHopperContent(); for (ResourceContainerObject cont : outputHopper){ sumOfHopper += cont.getStackCount(); - i++; + //i++; } buffer.putShort((short)0x0A); @@ -432,9 +432,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder { public IoBuffer buildHINO7ActivateDelta2(HarvesterObject harvester) { - int iHopperList = 0; + //int iHopperList = 0; if (harvester.getOutputHopperContent().size() >= 1) { - iHopperList = 1; + //iHopperList = 1; } IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN); @@ -463,9 +463,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder { public IoBuffer buildHINO7ActivateDelta2old(HarvesterObject harvester) { - int iHopperList = 0; + //int iHopperList = 0; if (harvester.getOutputHopperContent().size() >= 1) { - iHopperList = 1; + //iHopperList = 1; } IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN); diff --git a/src/resources/objects/installation/InstallationMessageBuilder.java b/src/resources/objects/installation/InstallationMessageBuilder.java index 8b67f8d3..d2b1f80c 100644 --- a/src/resources/objects/installation/InstallationMessageBuilder.java +++ b/src/resources/objects/installation/InstallationMessageBuilder.java @@ -27,7 +27,6 @@ import java.util.Map; import org.apache.mina.core.buffer.IoBuffer; import engine.resources.objects.Builder; -import resources.objects.harvester.HarvesterObject; import resources.objects.tangible.TangibleMessageBuilder; public class InstallationMessageBuilder extends TangibleMessageBuilder{ @@ -174,8 +173,8 @@ public class InstallationMessageBuilder extends TangibleMessageBuilder{ public IoBuffer constructINSO7Var1(InstallationObject installationObject,long selectedResource) { IoBuffer buffer = bufferPool.allocate(10, false).order(ByteOrder.LITTLE_ENDIAN); - int hopperContentsSize = ((HarvesterObject)installationObject).getOutputHopperContent().size()+1; - byte updateCounter = ((HarvesterObject)installationObject).getUpdateCount(); + //int hopperContentsSize = ((HarvesterObject)installationObject).getOutputHopperContent().size()+1; + //byte updateCounter = ((HarvesterObject)installationObject).getUpdateCount(); buffer.setAutoExpand(true); buffer.putShort((short)2); // buffer.putShort((short)updateCounter); diff --git a/src/resources/objects/resource/GalacticResource.java b/src/resources/objects/resource/GalacticResource.java index e8141781..eff19d01 100644 --- a/src/resources/objects/resource/GalacticResource.java +++ b/src/resources/objects/resource/GalacticResource.java @@ -231,7 +231,7 @@ public class GalacticResource extends SWGObject implements Serializable { public void generateResourceStats(){ // Generate the stats randomly, considering the caps for (int k=0;k0) randomStatValue = (short) (resourceRoot.getResourceMinCaps()[k] + new Random().nextInt(resourceRoot.getResourceMaxCaps()[k]-resourceRoot.getResourceMinCaps()[k])); diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java index 92841d3a..9baa6d0b 100644 --- a/src/services/ConnectionService.java +++ b/src/services/ConnectionService.java @@ -195,8 +195,6 @@ public class ConnectionService implements INetworkDispatch { CreatureObject object = (CreatureObject) client.getParent(); - object.setPvPBitmask(0); - object.setInviteCounter(0); object.setInviteSenderId(0); object.setInviteSenderName(""); diff --git a/src/services/LootService.java b/src/services/LootService.java index 687011e8..3b680b74 100644 --- a/src/services/LootService.java +++ b/src/services/LootService.java @@ -21,12 +21,9 @@ ******************************************************************************/ package services; -import java.io.File; import java.io.IOException; -import java.nio.file.DirectoryStream; import java.nio.file.DirectoryStream.Filter; import java.nio.file.attribute.BasicFileAttributes; -import java.nio.file.FileSystems; import java.nio.file.FileVisitResult; import java.nio.file.FileVisitor; import java.nio.file.Files; @@ -41,8 +38,6 @@ import java.util.Map; import java.util.Random; import java.util.Vector; -import org.apache.commons.lang3.ArrayUtils; - import protocol.swg.PlayClientEffectObjectTransformMessage; import resources.loot.LootGroup; import resources.loot.LootRollSession; @@ -793,7 +788,7 @@ public class LootService implements INetworkDispatch { int finalMinDmg = 0; int finalMaxDmg = 0; - String tunableObjectName = ""; + @SuppressWarnings("unused") String tunableObjectName = ""; if (objectType.contains("powercrystal")){ tunableObjectName = "Power Crystal"; @@ -1041,7 +1036,7 @@ public class LootService implements INetworkDispatch { float qz= 1.06535322E9F; Point3D effectorPosition = new Point3D(0,y,0); Quaternion effectorOrientation = new Quaternion(0,0,0,qz); - PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("",lootedObject.getObjectID(),"",effectorPosition,effectorOrientation); + //PlayClientEffectObjectTransformMessage lmsg = new PlayClientEffectObjectTransformMessage("",lootedObject.getObjectID(),"",effectorPosition,effectorOrientation); //((CreatureObject) requester).getClient().getSession().write(lmsg.serialize()); } diff --git a/src/services/PlayerService.java b/src/services/PlayerService.java index 37f6757e..d86f5f3e 100644 --- a/src/services/PlayerService.java +++ b/src/services/PlayerService.java @@ -160,7 +160,7 @@ public class PlayerService implements INetworkDispatch { scheduleList.add(scheduler.scheduleAtFixedRate(() -> { if(creature.getAction() < creature.getMaxAction() && creature.getPosture() != 14) { - if(creature.getCombatFlag() == 0) + if(!creature.isInCombat()) creature.setAction(creature.getAction() + (15 + creature.getLevel() * 5)); else creature.setAction(creature.getAction() + ((15 + creature.getLevel() * 5) / 2)); @@ -168,7 +168,7 @@ public class PlayerService implements INetworkDispatch { }, 0, 1000, TimeUnit.MILLISECONDS)); scheduleList.add(scheduler.scheduleAtFixedRate(() -> { - if(creature.getHealth() < creature.getMaxHealth() && creature.getCombatFlag() == 0 && creature.getPosture() != 13 && creature.getPosture() != 14) + if(creature.getHealth() < creature.getMaxHealth() && !creature.isInCombat() && creature.getPosture() != 13 && creature.getPosture() != 14) creature.setHealth(creature.getHealth() + (36 + creature.getLevel() * 4)); }, 0, 1000, TimeUnit.MILLISECONDS)); schedulers.put(creature.getObjectID(), scheduleList); diff --git a/src/services/SurveyService.java b/src/services/SurveyService.java index a2e3cdb5..fddea8b1 100644 --- a/src/services/SurveyService.java +++ b/src/services/SurveyService.java @@ -338,7 +338,7 @@ public class SurveyService implements INetworkDispatch { if (crafter.getPosture()==13) return; // QA - if (crafter.getCombatFlag()!=0){ // QA + if (crafter.isInCombat()){ // QA crafter.sendSystemMessage("@survey:sample_cancel_attack", (byte) 0); return; } @@ -422,7 +422,7 @@ public class SurveyService implements INetworkDispatch { surveyTool.setCurrentlyCoolingDown(false); CreatureObject crafter = (CreatureObject) NGECore.getInstance().objectService.getObject(surveyTool.getUserID()); - PlayerObject player = (PlayerObject) crafter.getSlottedObject("ghost"); + if (crafter.getPosture()!=1){ crafter.sendSystemMessage("@survey:sample_cancel", (byte) 0); surveyTool.setExceptionalState(false); @@ -433,7 +433,7 @@ public class SurveyService implements INetworkDispatch { if (crafter.getPosture()==13) return; - if (crafter.getCombatFlag()!=0){ + if (crafter.isInCombat()){ crafter.sendSystemMessage("@survey:sample_cancel_attack", (byte) 0); return; } @@ -665,7 +665,6 @@ public class SurveyService implements INetworkDispatch { Vector returnList = new Vector(); returnList.add("List.lstList:SelectedRow"); - final SurveyTool outerSurveyTool = (SurveyTool)target; window.addHandler(0, "", Trigger.TRIGGER_OK, returnList, new SUICallback() { @Override diff --git a/src/services/ai/AIActor.java b/src/services/ai/AIActor.java index 7cfceb6c..81db67c8 100644 --- a/src/services/ai/AIActor.java +++ b/src/services/ai/AIActor.java @@ -44,7 +44,6 @@ import services.ai.states.AttackState; import services.ai.states.DeathState; import services.ai.states.IdleState; import services.ai.states.RetreatState; -import services.ai.states.StalkState; import services.combat.CombatEvents.DamageTaken; import services.spawn.MobileTemplate; import java.util.Random; @@ -74,15 +73,15 @@ public class AIActor { creature.getEventBus().subscribe(this); this.currentState = new IdleState(); regenTask = scheduler.scheduleAtFixedRate(() -> { - if(creature.getHealth() < creature.getMaxHealth() && creature.getCombatFlag() == 0 && creature.getPosture() != 13 && creature.getPosture() != 14) + if(creature.getHealth() < creature.getMaxHealth() && !creature.isInCombat() && creature.getPosture() != 13 && creature.getPosture() != 14) creature.setHealth(creature.getHealth() + (36 + creature.getLevel() * 4)); }, 0, 1000, TimeUnit.MILLISECONDS); if(creature.getOption(Options.AGGRESSIVE)) { aggroCheckTask = scheduler.scheduleAtFixedRate(() -> { - if(creature == null || creature.getObservers().isEmpty() || creature.getCombatFlag() != 0 || isStalking) + if(creature == null || creature.getObservers().isEmpty() || creature.isInCombat() || isStalking) return; creature.getObservers().stream().map(Client::getParent).filter(obj -> obj.inRange(creature.getWorldPosition(), 10)).forEach((obj) -> { - if(new Random().nextFloat() <= 0.33 || creature.getCombatFlag() != 0 || isStalking) { + if(new Random().nextFloat() <= 0.33 || creature.isInCombat() || isStalking) { /*if(mobileTemplate.isStalker()) { setFollowObject((CreatureObject) obj); setCurrentState(new StalkState()); diff --git a/src/services/ai/LairActor.java b/src/services/ai/LairActor.java index 778de963..80472ef9 100644 --- a/src/services/ai/LairActor.java +++ b/src/services/ai/LairActor.java @@ -87,7 +87,7 @@ public class LairActor { return; int currentCondition = lairObject.getConditionDamage(); - int maxCondition = lairObject.getMaxDamage(); + int maxCondition = lairObject.getMaximumCondition(); switch(spawnWave) { // TODO: play damage effect @@ -146,7 +146,7 @@ public class LairActor { int healAmount = 0; for(AIActor ai : creatures) { - healAmount += lairObject.getMaxDamage() / 100; + healAmount += lairObject.getMaximumCondition() / 100; } lairObject.setConditionDamage(lairObject.getConditionDamage() - healAmount); diff --git a/src/services/ai/states/AttackState.java b/src/services/ai/states/AttackState.java index dbc0a54d..3b16a857 100644 --- a/src/services/ai/states/AttackState.java +++ b/src/services/ai/states/AttackState.java @@ -37,7 +37,7 @@ public class AttackState extends AIState { CreatureObject creature = actor.getCreature(); if(creature.getPosture() == 14) return StateResult.DEAD; - if(creature.getCombatFlag() == 0 || creature.getDefendersList().size() == 0 || actor.getFollowObject() == null) + if(!creature.isInCombat() || creature.getDefendersList().size() == 0 || actor.getFollowObject() == null) return StateResult.FINISHED; actor.scheduleMovement(); actor.scheduleRecovery(); @@ -115,7 +115,7 @@ public class AttackState extends AIState { NGECore core = NGECore.getInstance(); if(creature.getPosture() == 14) return StateResult.DEAD; - if(creature.getCombatFlag() == 0 || creature.getDefendersList().size() == 0 || actor.getFollowObject() == null) + if(!creature.isInCombat() || creature.getDefendersList().size() == 0 || actor.getFollowObject() == null) { creature.setLookAtTarget(0); creature.setIntendedTarget(0); diff --git a/src/services/ai/states/DeathState.java b/src/services/ai/states/DeathState.java index 94148dbc..926d60f8 100644 --- a/src/services/ai/states/DeathState.java +++ b/src/services/ai/states/DeathState.java @@ -21,10 +21,7 @@ ******************************************************************************/ package services.ai.states; -import java.util.Vector; - import main.NGECore; -import resources.common.RadialOptions; import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; import services.ai.AIActor; diff --git a/src/services/ai/states/StalkState.java b/src/services/ai/states/StalkState.java index 26b3a90a..b7d2384a 100644 --- a/src/services/ai/states/StalkState.java +++ b/src/services/ai/states/StalkState.java @@ -22,7 +22,6 @@ package services.ai.states; import services.ai.AIActor; -import services.ai.states.AIState.StateResult; public class StalkState extends AIState { diff --git a/src/services/bazaar/AuctionItem.java b/src/services/bazaar/AuctionItem.java index ffa3f6d4..4e0d2fca 100644 --- a/src/services/bazaar/AuctionItem.java +++ b/src/services/bazaar/AuctionItem.java @@ -23,13 +23,9 @@ package services.bazaar; import java.io.Serializable; -import com.sleepycat.je.Environment; -import com.sleepycat.je.Transaction; import com.sleepycat.persist.model.Entity; -import com.sleepycat.persist.model.NotPersistent; import com.sleepycat.persist.model.PrimaryKey; -import engine.resources.objects.IPersistent; import engine.resources.objects.SWGObject; @Entity(version=1) diff --git a/src/services/bazaar/BazaarService.java b/src/services/bazaar/BazaarService.java index 2efde273..dfd59f9f 100644 --- a/src/services/bazaar/BazaarService.java +++ b/src/services/bazaar/BazaarService.java @@ -22,19 +22,11 @@ package services.bazaar; import java.nio.ByteOrder; -import java.util.ArrayList; import java.util.Iterator; -import java.util.List; import java.util.Map; import java.util.Set; -import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentSkipListSet; -import java.util.function.BiFunction; -import java.util.function.Function; - -import com.sleepycat.je.Transaction; -import com.sleepycat.persist.EntityCursor; import main.NGECore; import engine.clients.Client; diff --git a/src/services/chat/ChatService.java b/src/services/chat/ChatService.java index e75acf0a..47ed57df 100644 --- a/src/services/chat/ChatService.java +++ b/src/services/chat/ChatService.java @@ -34,9 +34,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.mina.core.buffer.IoBuffer; import org.apache.mina.core.session.IoSession; -import com.sleepycat.je.Transaction; -import com.sleepycat.persist.EntityCursor; - import engine.clientdata.ClientFileManager; import engine.clientdata.visitors.DatatableVisitor; import engine.clients.Client; diff --git a/src/services/combat/CombatService.java b/src/services/combat/CombatService.java index db087e12..0db0d0e2 100644 --- a/src/services/combat/CombatService.java +++ b/src/services/combat/CombatService.java @@ -50,7 +50,6 @@ import resources.datatables.Options; import resources.datatables.Elemental; import resources.datatables.Posture; import resources.datatables.WeaponType; -import resources.objectives.BountyMissionObjective; import resources.objects.creature.CreatureObject; import resources.objects.mission.MissionObject; import resources.objects.player.PlayerObject; @@ -206,7 +205,7 @@ public class CombatService implements INetworkDispatch { } else if(target instanceof TangibleObject) { - if(target.getConditionDamage() == target.getMaxDamage()) + if(target.getConditionDamage() == target.getMaximumCondition()) { for(TangibleObject defender : target.getDefendersList()) defender.removeDefender(target); core.objectService.destroyObject(target); diff --git a/src/services/command/CommandService.java b/src/services/command/CommandService.java index 0e0e47db..9435a0ea 100644 --- a/src/services/command/CommandService.java +++ b/src/services/command/CommandService.java @@ -57,7 +57,7 @@ public class CommandService implements INetworkDispatch { private Vector commandLookup = new Vector(); private ConcurrentHashMap aliases = new ConcurrentHashMap(); - private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); + @SuppressWarnings("unused") private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1); private NGECore core; public CommandService(NGECore core) { @@ -557,6 +557,7 @@ public class CommandService implements INetworkDispatch { } @Override + @SuppressWarnings("unused") public void insertOpcodes(Map swgOpcodes, Map objControllerOpcodes) { objControllerOpcodes.put(ObjControllerOpcodes.COMMAND_QUEUE_ENQUEUE, new INetworkRemoteEvent() { diff --git a/src/services/pet/MountService.java b/src/services/pet/MountService.java index 1ffc8949..c1d836d5 100644 --- a/src/services/pet/MountService.java +++ b/src/services/pet/MountService.java @@ -138,7 +138,7 @@ public class MountService implements INetworkDispatch { return; } - if (actor.getCombatFlag() == 1) { + if (actor.isInCombat()) { actor.sendSystemMessage(OutOfBand.ProsePackage("@pet/pet_menu:cannot_call_in_combat"), DisplayType.Broadcast); return; } @@ -284,7 +284,7 @@ public class MountService implements INetworkDispatch { return; } - if (mount.getConditionDamage() >= mount.getMaxDamage()) { + if (mount.getConditionDamage() >= mount.getMaximumCondition()) { disable(mount); } } diff --git a/src/services/playercities/PlayerCity.java b/src/services/playercities/PlayerCity.java index 2a271b9e..64af777d 100644 --- a/src/services/playercities/PlayerCity.java +++ b/src/services/playercities/PlayerCity.java @@ -630,7 +630,7 @@ public class PlayerCity implements Serializable { // city_version_update_body_4 Vector citizenList = getCitizens(); for (long citizen : citizenList){ - CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); +// CreatureObject citizenObject = (CreatureObject) NGECore.getInstance().objectService.getObject(citizen); Mail actorMail = new Mail(); actorMail.setMailId(NGECore.getInstance().chatService.generateMailId()); actorMail.setRecieverId(citizen); diff --git a/src/services/resources/HarvesterService.java b/src/services/resources/HarvesterService.java index b49e048e..5055431f 100644 --- a/src/services/resources/HarvesterService.java +++ b/src/services/resources/HarvesterService.java @@ -55,7 +55,6 @@ import engine.resources.scene.Quaternion; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; import resources.common.ObjControllerOpcodes; -import resources.objects.building.BuildingObject; import resources.objects.creature.CreatureObject; import resources.objects.harvester.HarvesterMessageBuilder; import resources.objects.harvester.HarvesterObject; @@ -363,8 +362,7 @@ public class HarvesterService implements INetworkDispatch { }); window.addHandler(1, "", Trigger.TRIGGER_CANCEL, returnList, new SUICallback() { @Override - public void process(SWGObject owner, int eventType, Vector returnList) { - CreatureObject crafter = (CreatureObject)owner; + public void process(SWGObject owner, int eventType, Vector returnList) { core.suiService.closeSUIWindow(owner, 0); } }); @@ -853,11 +851,9 @@ public class HarvesterService implements INetworkDispatch { ResourceContainerObject containerObject = (ResourceContainerObject) core.objectService.createObject(resourceContainerIFF, owner.getPlanet()); containerObject.initializeStats(sampleResource); containerObject.setProprietor(owner); - containerObject.setStackCount(stackcount,owner); - int resCRC = CRC.StringtoCRC(resourceContainerIFF); + containerObject.setStackCount(stackcount,owner); containerObject.setIffFileName(resourceContainerIFF); - long objectId = containerObject.getObjectID(); SWGObject crafterInventory = owner.getSlottedObject("inventory"); // SceneCreateObjectByCrc createObjectMsg = new SceneCreateObjectByCrc(objectId, owner.getOrientation().x, owner.getOrientation().y, owner.getOrientation().z, owner.getOrientation().w, owner.getPosition().x, owner.getPosition().y, owner.getPosition().z, resCRC, (byte) 0); @@ -1018,7 +1014,6 @@ public class HarvesterService implements INetworkDispatch { CreatureObject actor = (CreatureObject) NGECore.getInstance().objectService.getObject((Long) object.getAttachment("ownerId")); String structureTemplate = (String) object.getAttachment("StructureTemplate"); HarvesterObject harvester = (HarvesterObject) NGECore.getInstance().objectService.createObject(structureTemplate, actor.getPlanet()); - long objectId = harvester.getObjectID(); Vector adminList = harvester.getAdminList(); //String[] fullName = ((CreatureObject)actor).getCustomName().split(" "); adminList.add(actor.getCustomName()); diff --git a/src/services/resources/ResourceService.java b/src/services/resources/ResourceService.java index 09d9c9c5..78612dd9 100644 --- a/src/services/resources/ResourceService.java +++ b/src/services/resources/ResourceService.java @@ -22,7 +22,6 @@ package services.resources; import java.util.Hashtable; -import java.util.Iterator; import java.util.Map; import java.util.Random; import java.util.Vector; @@ -30,10 +29,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.sleepycat.persist.EntityCursor; - import main.NGECore; -import engine.resources.common.CRC; import engine.resources.database.ODBCursor; import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; @@ -41,8 +37,6 @@ import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; import engine.resources.service.INetworkDispatch; import engine.resources.service.INetworkRemoteEvent; -import resources.common.OutOfBand; -import resources.common.ProsePackage; import resources.datatables.MilkState; import resources.objects.creature.CreatureObject; import resources.objects.harvester.HarvesterObject; @@ -11444,11 +11438,9 @@ public class ResourceService implements INetworkDispatch { containerObject.setProprietor(crafter); containerObject.setStackCount(stackCount,false); //int stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource); - containerObject.initializeStats(sampleResource); - int resCRC = CRC.StringtoCRC(resourceContainerIFF); - containerObject.setIffFileName(resourceContainerIFF); - long objectId = containerObject.getObjectID(); - SWGObject crafterInventory = crafter.getSlottedObject("inventory"); + containerObject.initializeStats(sampleResource); + containerObject.setIffFileName(resourceContainerIFF); + SWGObject crafterInventory = crafter.getSlottedObject("inventory"); crafterInventory.add(containerObject); return containerObject; } @@ -11476,7 +11468,7 @@ public class ResourceService implements INetworkDispatch { public boolean canMilk(CreatureObject actor, CreatureObject target) { - if(target.getPosture() == 14 || !actor.inRange(target.getWorldPosition(), 5) || actor.getCombatFlag() == 1 || target.getCombatFlag() == 1) + if(target.getPosture() == 14 || !actor.inRange(target.getWorldPosition(), 5) || actor.isInCombat() || target.isInCombat()) return false; AIActor ai = (AIActor) target.getAttachment("AI"); @@ -11593,7 +11585,7 @@ public class ResourceService implements INetworkDispatch { return; } - if(actor.getCombatFlag() == 1) { + if(actor.isInCombat()) { actor.sendSystemMessage("@skl_use:milk_combat", (byte) 0); ai.setMilkState(MilkState.NOTYETMILKED); return; diff --git a/src/services/spawn/DynamicSpawnArea.java b/src/services/spawn/DynamicSpawnArea.java index 388195c6..f45e7196 100644 --- a/src/services/spawn/DynamicSpawnArea.java +++ b/src/services/spawn/DynamicSpawnArea.java @@ -22,7 +22,6 @@ package services.spawn; import java.util.Collections; -import java.util.Iterator; import java.util.Random; import java.util.Vector; @@ -35,7 +34,6 @@ import resources.common.collidables.AbstractCollidable.ExitEvent; import resources.objects.creature.CreatureObject; import services.TerrainService; import services.SimulationService.MoveEvent; -import services.ai.LairActor; import engine.resources.objects.SWGObject; import engine.resources.scene.Planet; import engine.resources.scene.Point3D; diff --git a/src/services/spawn/SpawnService.java b/src/services/spawn/SpawnService.java index 2d30d0c3..96645cbb 100644 --- a/src/services/spawn/SpawnService.java +++ b/src/services/spawn/SpawnService.java @@ -104,7 +104,7 @@ public class SpawnService { creature.setLootGroups(mobileTemplate.getLootGroups()); creature.setOptionsBitmask(mobileTemplate.getOptionBitmask()); - creature.setPvPBitmask(mobileTemplate.getPvpBitmask()); + creature.setPvpBitmask(mobileTemplate.getPvpBitmask()); creature.setStfFilename("mob/creature_names"); // TODO: set other STFs for NPCs other than creatures creature.setStfName(mobileTemplate.getCreatureName()); creature.setHeight(mobileTemplate.getScale()); @@ -252,8 +252,8 @@ public class SpawnService { return null; lairObject.setOptionsBitmask(Options.ATTACKABLE); - lairObject.setPvPBitmask(PvpStatus.Attackable); - lairObject.setMaxDamage(1000 * level); + lairObject.setPvpBitmask(PvpStatus.Attackable); + lairObject.setMaximumCondition(1000 * level); LairActor lairActor = new LairActor(lairObject, lairTemplate.getMobileName(), 10, level); lairObject.setAttachment("AI", lairActor); diff --git a/src/services/trade/TradeService.java b/src/services/trade/TradeService.java index 08201aab..2b18e7b9 100644 --- a/src/services/trade/TradeService.java +++ b/src/services/trade/TradeService.java @@ -99,7 +99,7 @@ public class TradeService implements INetworkDispatch{ // creates a new trade session for the user who sent the request. It's given the objectID // that the player wants to trade with. - if (senderObject.getCombatFlag() == 0 && recieverObject.getCombatFlag() == 0) { + if (!senderObject.isInCombat() && !recieverObject.isInCombat()) { senderClient.getSession().setAttribute("tradeSession", recieverID); recieverObject.sendSystemMessage(senderObject.getCustomName() + " wants to trade with you.", (byte) 0);