Get maker reagent from PG db, rework processor (no statics)

This commit is contained in:
P0nk
2023-03-02 08:18:03 +01:00
parent 5cecb7adb6
commit c0c0a2d2d9
11 changed files with 155 additions and 80 deletions

View File

@@ -30,6 +30,7 @@ import client.inventory.Item;
import client.inventory.ItemFactory;
import client.inventory.manipulator.CashIdGenerator;
import client.newyear.NewYearCardRecord;
import client.processor.action.MakerProcessor;
import client.processor.npc.FredrickProcessor;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
@@ -41,6 +42,8 @@ import constants.net.OpcodeConstants;
import constants.net.ServerConstants;
import database.PgDatabaseConfig;
import database.PgDatabaseConnection;
import database.maker.MakerDao;
import database.maker.MakerInfoProvider;
import database.migration.FlywayRunner;
import database.note.NoteDao;
import net.ChannelDependencies;
@@ -969,8 +972,10 @@ public class Server {
private ChannelDependencies registerChannelDependencies(PgDatabaseConnection connection) {
NoteService noteService = new NoteService(new NoteDao(connection));
MakerProcessor makerProcessor = new MakerProcessor(new MakerInfoProvider(new MakerDao(connection)));
FredrickProcessor fredrickProcessor = new FredrickProcessor(noteService);
ChannelDependencies channelDependencies = new ChannelDependencies(noteService, fredrickProcessor);
ChannelDependencies channelDependencies = new ChannelDependencies(noteService, fredrickProcessor,
makerProcessor);
PacketProcessor.registerGameHandlerDependencies(channelDependencies);

View File

@@ -30,9 +30,14 @@ import net.packet.InPacket;
* @author Jay Estrella, Ronan
*/
public final class MakerSkillHandler extends AbstractPacketHandler {
private final MakerProcessor makerProcessor;
public MakerSkillHandler(MakerProcessor makerProcessor) {
this.makerProcessor = makerProcessor;
}
@Override
public final void handlePacket(InPacket p, Client c) {
MakerProcessor.makerAction(p, c);
public void handlePacket(InPacket p, Client c) {
makerProcessor.makerAction(p, c);
}
}