Rogiel/l2jserver2
1
0
Fork 0
mirror of https://github.com/Rogiel/l2jserver2 synced 2026-01-29 06:02:48 +00:00
Code Releases Activity

Semi-working attack service

Browse Source 
Signed-off-by: Rogiel <rogiel@rogiel.com>
This commit is contained in:
Rogiel Sulzbach
2011-05-30 20:02:19 -03:00
parent 52d4be0bf2
commit ae3007559f
61 changed files with 537 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dao/com/l2jserver/db/H2DAOModule.java
View File

@@ -24,11 +24,11 @@ import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.h2.H2CharacterDAO;
import com.l2jserver.db.dao.h2.H2CharacterFriendDAO;
import com.l2jserver.db.dao.h2.H2ClanDAO;
import com.l2jserver.db.dao.h2.H2ItemDAO;
import com.l2jserver.db.dao.h2.H2NPCDAO;
import com.l2jserver.db.dao.jdbc.h2.H2CharacterDAO;
import com.l2jserver.db.dao.jdbc.h2.H2CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.h2.H2ClanDAO;
import com.l2jserver.db.dao.jdbc.h2.H2ItemDAO;
import com.l2jserver.db.dao.jdbc.h2.H2NPCDAO;
/**
* Google Guice {@link Module} for H2 DAOs

10
src/dao/com/l2jserver/db/MySQL5DAOModule.java
View File

@@ -24,11 +24,11 @@ import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.mysql5.MySQL5CharacterDAO;
import com.l2jserver.db.dao.mysql5.MySQL5CharacterFriendDAO;
import com.l2jserver.db.dao.mysql5.MySQL5ClanDAO;
import com.l2jserver.db.dao.mysql5.MySQL5ItemDAO;
import com.l2jserver.db.dao.mysql5.MySQL5NPCDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ClanDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5ItemDAO;
import com.l2jserver.db.dao.jdbc.mysql5.MySQL5NPCDAO;
/**
* Google Guice {@link Module} for MySQL5 DAOs

2
src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterDAO.java
View File

@@ -55,7 +55,7 @@ import com.l2jserver.util.geometry.Point3D;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class JDBCCharacterDAO extends
public abstract class JDBCCharacterDAO extends
AbstractJDBCDAO<L2Character, CharacterID> implements CharacterDAO {
/**
* The {@link CharacterID} factory

2
src/dao/com/l2jserver/db/dao/jdbc/JDBCCharacterFriendDAO.java
View File

@@ -42,7 +42,7 @@ import com.l2jserver.service.database.JDBCDatabaseService.SelectSingleQuery;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class JDBCCharacterFriendDAO extends
public abstract class JDBCCharacterFriendDAO extends
AbstractJDBCDAO<CharacterFriend, FriendID> implements
CharacterFriendDAO {
/**

2
src/dao/com/l2jserver/db/dao/jdbc/JDBCClanDAO.java
View File

@@ -41,7 +41,7 @@ import com.l2jserver.service.database.JDBCDatabaseService.SelectSingleQuery;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID> implements
public abstract class JDBCClanDAO extends AbstractJDBCDAO<Clan, ClanID> implements
ClanDAO {
/**
* The {@link ClanID} factory

2
src/dao/com/l2jserver/db/dao/jdbc/JDBCItemDAO.java
View File

@@ -48,7 +48,7 @@ import com.l2jserver.util.geometry.Coordinate;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class JDBCItemDAO extends AbstractJDBCDAO<Item, ItemID> implements
public abstract class JDBCItemDAO extends AbstractJDBCDAO<Item, ItemID> implements
ItemDAO {
/**
* The {@link ItemID} factory

2
src/dao/com/l2jserver/db/dao/jdbc/JDBCNPCDAO.java
View File

@@ -46,7 +46,7 @@ import com.l2jserver.util.geometry.Point3D;
*
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class JDBCNPCDAO extends AbstractJDBCDAO<NPC, NPCID> implements
public abstract class JDBCNPCDAO extends AbstractJDBCDAO<NPC, NPCID> implements
NPCDAO {
private final Logger log = LoggerFactory.getLogger(this.getClass());

2
src/dao/com/l2jserver/db/dao/h2/H2CharacterDAO.java → src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.h2;
package com.l2jserver.db.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;

2
src/dao/com/l2jserver/db/dao/h2/H2CharacterFriendDAO.java → src/dao/com/l2jserver/db/dao/jdbc/h2/H2CharacterFriendDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.h2;
package com.l2jserver.db.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterFriendDAO;

2
src/dao/com/l2jserver/db/dao/h2/H2ClanDAO.java → src/dao/com/l2jserver/db/dao/jdbc/h2/H2ClanDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.h2;
package com.l2jserver.db.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;

2
src/dao/com/l2jserver/db/dao/h2/H2ItemDAO.java → src/dao/com/l2jserver/db/dao/jdbc/h2/H2ItemDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.h2;
package com.l2jserver.db.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;

2
src/dao/com/l2jserver/db/dao/h2/H2NPCDAO.java → src/dao/com/l2jserver/db/dao/jdbc/h2/H2NPCDAO.java
View File

@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.h2;
package com.l2jserver.db.dao.jdbc.h2;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;

4
src/dao/com/l2jserver/db/dao/mysql5/MySQL5CharacterDAO.java → src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterDAO.java
View File

@@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.mysql5;
package com.l2jserver.db.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
@@ -31,6 +32,7 @@ import com.l2jserver.service.database.DatabaseService;
*/
public class MySQL5CharacterDAO extends JDBCCharacterDAO implements
CharacterDAO {
@Inject
public MySQL5CharacterDAO(DatabaseService database,
CharacterIDProvider idFactory,
CharacterTemplateIDProvider templateIdFactory,

4
src/dao/com/l2jserver/db/dao/mysql5/MySQL5CharacterFriendDAO.java → src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java
View File

@@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.mysql5;
package com.l2jserver.db.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterFriendDAO;
import com.l2jserver.db.dao.jdbc.JDBCCharacterFriendDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
@@ -29,6 +30,7 @@ import com.l2jserver.service.database.DatabaseService;
*/
public class MySQL5CharacterFriendDAO extends JDBCCharacterFriendDAO implements
CharacterFriendDAO {
@Inject
public MySQL5CharacterFriendDAO(DatabaseService database,
FriendIDProvider idProvider, CharacterIDProvider charIdProvider) {
super(database, idProvider, charIdProvider);

4
src/dao/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java → src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ClanDAO.java
View File

@@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.mysql5;
package com.l2jserver.db.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.ClanDAO;
import com.l2jserver.db.dao.jdbc.JDBCClanDAO;
@@ -29,6 +30,7 @@ import com.l2jserver.service.database.DatabaseService;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class MySQL5ClanDAO extends JDBCClanDAO implements ClanDAO {
@Inject
public MySQL5ClanDAO(DatabaseService database,
ClanIDProvider clanIdFactory, CharacterIDProvider idFactory) {
super(database, clanIdFactory, idFactory);

4
src/dao/com/l2jserver/db/dao/mysql5/MySQL5ItemDAO.java → src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5ItemDAO.java
View File

@@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.mysql5;
package com.l2jserver.db.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.ItemDAO;
import com.l2jserver.db.dao.jdbc.JDBCItemDAO;
import com.l2jserver.model.id.object.provider.CharacterIDProvider;
@@ -29,6 +30,7 @@ import com.l2jserver.service.database.DatabaseService;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class MySQL5ItemDAO extends JDBCItemDAO implements ItemDAO {
@Inject
public MySQL5ItemDAO(DatabaseService database, ItemIDProvider idFactory,
ItemTemplateIDProvider templateIdFactory,
CharacterIDProvider charIdFactory) {

4
src/dao/com/l2jserver/db/dao/mysql5/MySQL5NPCDAO.java → src/dao/com/l2jserver/db/dao/jdbc/mysql5/MySQL5NPCDAO.java
View File

@@ -14,8 +14,9 @@
* You should have received a copy of the GNU General Public License
* along with l2jserver. If not, see <http://www.gnu.org/licenses/>.
*/
package com.l2jserver.db.dao.mysql5;
package com.l2jserver.db.dao.jdbc.mysql5;
import com.google.inject.Inject;
import com.l2jserver.db.dao.CharacterDAO;
import com.l2jserver.db.dao.NPCDAO;
import com.l2jserver.db.dao.jdbc.JDBCNPCDAO;
@@ -29,6 +30,7 @@ import com.l2jserver.service.database.DatabaseService;
* @author <a href="http://www.rogiel.com">Rogiel</a>
*/
public class MySQL5NPCDAO extends JDBCNPCDAO implements NPCDAO {
@Inject
public MySQL5NPCDAO(DatabaseService database, NPCIDProvider idProvider,
NPCTemplateIDProvider templateIdProvider) {
super(database, idProvider, templateIdProvider);