Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/java/client/processor/action/MakerProcessor.java
View File

@@ -29,6 +29,8 @@ import config.YamlConfig;
import constants.game.GameConstants;
import constants.id.ItemId;
import constants.inventory.ItemConstants;
import database.maker.MakerInfoProvider;
import database.maker.MakerReagent;
import net.packet.InPacket;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,19 +40,22 @@ import server.MakerItemFactory.MakerItemCreateEntry;
import tools.PacketCreator;
import tools.Pair;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
* @author Ronan
*/
public class MakerProcessor {
private static final Logger log = LoggerFactory.getLogger(MakerProcessor.class);
private static final ItemInformationProvider ii = ItemInformationProvider.getInstance();
public static void makerAction(InPacket p, Client c) {
private final ItemInformationProvider ii = ItemInformationProvider.getInstance();
private final MakerInfoProvider infoProvider;
public MakerProcessor(MakerInfoProvider infoProvider) {
this.infoProvider = infoProvider;
}
public void makerAction(InPacket p, Client c) {
if (c.tryacquireClient()) {
try {
int type = p.readInt();
@@ -242,7 +247,7 @@ public class MakerProcessor {
}
// checks and prevents hackers from PE'ing Maker operations with invalid operations
private static boolean removeOddMakerReagents(int toCreate, Map<Integer, Short> reagentids) {
private boolean removeOddMakerReagents(int toCreate, Map<Integer, Short> reagentids) {
Map<Integer, Integer> reagentType = new LinkedHashMap<>();
List<Integer> toRemove = new LinkedList<>();
@@ -283,7 +288,7 @@ public class MakerProcessor {
return true;
}
private static int getMakerReagentSlots(int itemId) {
private int getMakerReagentSlots(int itemId) {
try {
int eqpLevel = ii.getEquipLevelReq(itemId);
@@ -299,7 +304,7 @@ public class MakerProcessor {
}
}
private static Pair<Integer, List<Pair<Integer, Integer>>> generateDisassemblyInfo(int itemId) {
private Pair<Integer, List<Pair<Integer, Integer>>> generateDisassemblyInfo(int itemId) {
int recvFee = ii.getMakerDisassembledFee(itemId);
if (recvFee > -1) {
List<Pair<Integer, Integer>> gains = ii.getMakerDisassembledItems(itemId);
@@ -311,11 +316,11 @@ public class MakerProcessor {
return null;
}
public static int getMakerSkillLevel(Character chr) {
private int getMakerSkillLevel(Character chr) {
return chr.getSkillLevel((chr.getJob().getId() / 1000) * 10000000 + 1007);
}
private static short getCreateStatus(Client c, MakerItemCreateEntry recipe) {
private short getCreateStatus(Client c, MakerItemCreateEntry recipe) {
if (recipe.isInvalid()) {
return -1;
}
@@ -358,7 +363,7 @@ public class MakerProcessor {
return 0;
}
private static boolean hasItems(Client c, MakerItemCreateEntry recipe) {
private boolean hasItems(Client c, MakerItemCreateEntry recipe) {
for (Pair<Integer, Integer> p : recipe.getReqItems()) {
int itemId = p.getLeft();
if (c.getPlayer().getInventory(ItemConstants.getInventoryType(itemId)).countById(itemId) < p.getRight()) {
@@ -368,7 +373,7 @@ public class MakerProcessor {
return true;
}
private static boolean addBoostedMakerItem(Client c, int itemid, int stimulantid, Map<Integer, Short> reagentids) {
private boolean addBoostedMakerItem(Client c, int itemid, int stimulantid, Map<Integer, Short> reagentids) {
if (stimulantid != -1 && !ItemInformationProvider.rollSuccessChance(90.0)) {
return false;
}
@@ -396,37 +401,32 @@ public class MakerProcessor {
List<Short> randStat = new LinkedList<>();
for (Map.Entry<Integer, Short> r : reagentids.entrySet()) {
Pair<String, Integer> reagentBuff = ii.getMakerReagentStatUpgrade(r.getKey());
if (reagentBuff != null) {
String s = reagentBuff.getLeft();
if (s.substring(0, 4).contains("rand")) {
if (s.substring(4).equals("Stat")) {
randStat.add((short) (reagentBuff.getRight() * r.getValue()));
} else {
randOption.add((short) (reagentBuff.getRight() * r.getValue()));
}
Optional<MakerReagent> reagentBuff = infoProvider.getMakerReagent(r.getKey());
if (reagentBuff.isEmpty()) {
continue;
}
String buffStat = reagentBuff.get().stat();
int buffValue = reagentBuff.get().value();
if (buffStat.substring(0, 4).contains("rand")) {
if (buffStat.substring(4).equals("Stat")) {
randStat.add((short) (buffValue * r.getValue()));
} else {
String stat = s.substring(3);
randOption.add((short) (buffValue * r.getValue()));
}
} else {
String stat = buffStat.substring(3);
if (!stat.equals("ReqLevel")) { // improve req level... really?
switch (stat) {
case "MaxHP":
stat = "MHP";
break;
if (!stat.equals("ReqLevel")) { // improve req level... really?
switch (stat) {
case "MaxHP" -> stat = "MHP";
case "MaxMP" -> stat = "MMP";
}
case "MaxMP":
stat = "MMP";
break;
}
Integer d = stats.get(stat);
if (d == null) {
stats.put(stat, reagentBuff.getRight() * r.getValue());
} else {
stats.put(stat, d + (reagentBuff.getRight() * r.getValue()));
}
Integer d = stats.get(stat);
if (d == null) {
stats.put(stat, buffValue * r.getValue());
} else {
stats.put(stat, d + (buffValue * r.getValue()));
}
}
}

11
src/main/java/database/PgDatabaseConnection.java
View File

@@ -1,5 +1,6 @@
package database;
import database.maker.MakerReagentRowMapper;
import database.note.NoteRowMapper;
import org.jdbi.v3.core.Handle;
import org.jdbi.v3.core.Jdbi;
@@ -14,8 +15,14 @@ public class PgDatabaseConnection {
public PgDatabaseConnection(DataSource dataSource) {
this.dataSource = dataSource;
this.jdbi = Jdbi.create(dataSource)
.registerRowMapper(new NoteRowMapper()); // TODO: configure jdbi elsewhere
this.jdbi = Jdbi.create(dataSource);
registerRowMappers();
// TODO: configure jdbi elsewhere
}
private void registerRowMappers() {
jdbi.registerRowMapper(new NoteRowMapper())
.registerRowMapper(new MakerReagentRowMapper());
}
public Connection getConnection() throws SQLException {

30
src/main/java/database/maker/MakerDao.java Normal file
View File

@@ -0,0 +1,30 @@
package database.maker;
import database.DaoException;
import database.PgDatabaseConnection;
import org.jdbi.v3.core.Handle;
import org.jdbi.v3.core.JdbiException;
import java.util.Optional;
public class MakerDao {
private final PgDatabaseConnection connection;
public MakerDao(PgDatabaseConnection connection) {
this.connection = connection;
}
public Optional<MakerReagent> getReagent(int itemId) {
try (Handle handle = connection.getHandle()) {
return handle.createQuery("""
SELECT *
FROM maker_reagent
WHERE item_id = ?;""")
.bind(0, itemId)
.mapTo(MakerReagent.class)
.findOne();
} catch (JdbiException e) {
throw new DaoException("Failed to get maker reagent with item id: %d".formatted(itemId), e);
}
}
}

28
src/main/java/database/maker/MakerInfoProvider.java Normal file
View File

@@ -0,0 +1,28 @@
package database.maker;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
public class MakerInfoProvider {
private final MakerDao makerDao;
private final Map<Integer, MakerReagent> reagents = new ConcurrentHashMap<>();
public MakerInfoProvider(MakerDao makerDao) {
this.makerDao = makerDao;
}
public Optional<MakerReagent> getMakerReagent(int itemId) {
final MakerReagent cachedReagent = reagents.get(itemId);
if (cachedReagent != null) {
return Optional.of(cachedReagent);
}
final Optional<MakerReagent> reagentFromDb = makerDao.getReagent(itemId);
if (reagentFromDb.isEmpty()) {
return Optional.empty();
}
reagents.put(itemId, reagentFromDb.get());
return reagentFromDb;
}
}

9
src/main/java/database/maker/MakerReagent.java Normal file
View File

@@ -0,0 +1,9 @@
package database.maker;
import java.util.Objects;
public record MakerReagent(int itemId, String stat, int value) {
public MakerReagent {
Objects.requireNonNull(stat);
}
}

18
src/main/java/database/maker/MakerReagentRowMapper.java Normal file
View File

@@ -0,0 +1,18 @@
package database.maker;
import org.jdbi.v3.core.mapper.RowMapper;
import org.jdbi.v3.core.statement.StatementContext;
import java.sql.ResultSet;
import java.sql.SQLException;
public class MakerReagentRowMapper implements RowMapper<MakerReagent> {
@Override
public MakerReagent map(ResultSet rs, StatementContext ctx) throws SQLException {
int itemId = rs.getInt("item_id");
String stat = rs.getString("stat");
int value = rs.getInt("value");
return new MakerReagent(itemId, stat, value);
}
}

6
src/main/java/net/ChannelDependencies.java
View File

@@ -1,14 +1,18 @@
package net;
import client.processor.action.MakerProcessor;
import client.processor.npc.FredrickProcessor;
import service.NoteService;
import java.util.Objects;
public record ChannelDependencies(NoteService noteService, FredrickProcessor fredrickProcessor) {
public record ChannelDependencies(
NoteService noteService, FredrickProcessor fredrickProcessor, MakerProcessor makerProcessor
) {
public ChannelDependencies {
Objects.requireNonNull(noteService);
Objects.requireNonNull(fredrickProcessor);
Objects.requireNonNull(makerProcessor);
}
}

4
src/main/java/net/PacketProcessor.java
View File

@@ -233,7 +233,7 @@ public final class PacketProcessor {
registerHandler(RecvOpcode.REPORT, new ReportHandler());
registerHandler(RecvOpcode.MONSTER_BOOK_COVER, new MonsterBookCoverHandler());
registerHandler(RecvOpcode.AUTO_DISTRIBUTE_AP, new AutoAssignHandler());
registerHandler(RecvOpcode.MAKER_SKILL, new MakerSkillHandler());
registerHandler(RecvOpcode.MAKER_SKILL, new MakerSkillHandler(channelDeps.makerProcessor()));
registerHandler(RecvOpcode.OPEN_FAMILY_PEDIGREE, new OpenFamilyPedigreeHandler());
registerHandler(RecvOpcode.OPEN_FAMILY, new OpenFamilyHandler());
registerHandler(RecvOpcode.ADD_FAMILY, new FamilyAddHandler());
@@ -286,4 +286,4 @@ public final class PacketProcessor {
registerHandler(RecvOpcode.USE_ITEMUI, new RaiseIncExpHandler());
registerHandler(RecvOpcode.CHANGE_QUICKSLOT, new QuickslotKeyMappedModifiedHandler());
}
}
}

7
src/main/java/net/server/Server.java
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);

9
src/main/java/net/server/channel/handlers/MakerSkillHandler.java
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);
}
}

31
src/main/java/server/ItemInformationProvider.java
View File

@@ -1985,37 +1985,6 @@ public class ItemInformationProvider {
}
}
public Pair<String, Integer> getMakerReagentStatUpgrade(int itemId) {
try {
Pair<String, Integer> statUpgd = statUpgradeMakerCache.get(itemId);
if (statUpgd != null) {
return statUpgd;
} else if (statUpgradeMakerCache.containsKey(itemId)) {
return null;
}
try (Connection con = DatabaseConnection.getConnection();
PreparedStatement ps = con.prepareStatement("SELECT stat, value FROM makerreagentdata WHERE itemid = ?")) {
ps.setInt(1, itemId);
try (ResultSet rs = ps.executeQuery()) {
if (rs.next()) {
String statType = rs.getString("stat");
int statGain = rs.getInt("value");
statUpgd = new Pair<>(statType, statGain);
}
}
}
statUpgradeMakerCache.put(itemId, statUpgd);
return statUpgd;
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
public int getMakerCrystalFromLeftover(Integer leftoverId) {
try {
Integer itemid = mobCrystalMakerCache.get(leftoverId);