Repo-Mirror/Custom-Fishing
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-26 10:29:16 +00:00
Code Issues Releases Activity

remove todo

Browse Source
This commit is contained in:
XiaoMoMi
2023-09-12 23:39:26 +08:00
parent 3ce6e0430e
commit 66a1570455
5 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java
View File

@@ -96,7 +96,6 @@ public class DebugCommand {
boolean inLava = (boolean) arg.getOrDefault("lava fishing", false);
fishingPreparation.insertArg("{lava}", String.valueOf(inLava));
fishingPreparation.mergeEffect(initialEffect);
//TODO apply totems
var map = CustomFishingPlugin.get().getFishingManager().getPossibleLootKeysWithWeight(initialEffect, fishingPreparation);
List<LootWithWeight> loots = new ArrayList<>();

4
plugin/src/main/java/net/momirealms/customfishing/mechanic/fishing/FishingManagerImpl.java
View File

@@ -296,10 +296,6 @@ public class FishingManagerImpl implements Listener, FishingManager {
FishingEffect initialEffect = plugin.getEffectManager().getInitialEffect();
fishingPreparation.mergeEffect(initialEffect);
// Apply enchants
//TODO Apply totem effects
// Call custom event
RodCastEvent rodCastEvent = new RodCastEvent(event, fishingPreparation, initialEffect);
Bukkit.getPluginManager().callEvent(rodCastEvent);

79
plugin/src/main/java/net/momirealms/customfishing/mechanic/requirement/RequirementManagerImpl.java
View File

@@ -116,6 +116,7 @@ public class RequirementManagerImpl implements RequirementManager {
this.registerYRequirement();
this.registerContainRequirement();
this.registerStartWithRequirement();
this.registerEndWithRequirement();
this.registerEqualsRequirement();
this.registerBiomeRequirement();
this.registerDateRequirement();
@@ -127,7 +128,7 @@ public class RequirementManagerImpl implements RequirementManager {
this.registerLavaFishingRequirement();
this.registerRodRequirement();
this.registerBaitRequirement();
this.registerCompareRequirement();
this.registerGreaterThanRequirement();
this.registerAndRequirement();
this.registerOrRequirement();
this.registerLevelRequirement();
@@ -137,6 +138,8 @@ public class RequirementManagerImpl implements RequirementManager {
this.registerCoolDownRequirement();
this.registerGroupRequirement();
this.registerLootRequirement();
this.registerLessThanRequirement();
this.registerNumberEqualRequirement();
}
public ConditionalElement getConditionalElements(ConfigurationSection section) {
@@ -603,7 +606,7 @@ public class RequirementManagerImpl implements RequirementManager {
});
}
private void registerCompareRequirement() {
private void registerGreaterThanRequirement() {
registerRequirement(">=", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
@@ -636,38 +639,9 @@ public class RequirementManagerImpl implements RequirementManager {
return null;
}
});
registerRequirement("<", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
String v2 = section.getString("value2", "");
return condition -> {
String p1 = v1.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v1) : v1;
String p2 = v2.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v2) : v2;
if (Double.parseDouble(p1) < Double.parseDouble(p2)) return true;
if (advanced) triggerActions(actions, condition);
return false;
};
} else {
LogUtils.warn("Wrong value format found at < requirement.");
return null;
}
});
registerRequirement("<=", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
String v2 = section.getString("value2", "");
return condition -> {
String p1 = v1.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v1) : v1;
String p2 = v2.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v2) : v2;
if (Double.parseDouble(p1) <= Double.parseDouble(p2)) return true;
if (advanced) triggerActions(actions, condition);
return false;
};
} else {
LogUtils.warn("Wrong value format found at <= requirement.");
return null;
}
});
}
private void registerNumberEqualRequirement() {
registerRequirement("==", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
@@ -702,6 +676,40 @@ public class RequirementManagerImpl implements RequirementManager {
});
}
private void registerLessThanRequirement() {
registerRequirement("<", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
String v2 = section.getString("value2", "");
return condition -> {
String p1 = v1.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v1) : v1;
String p2 = v2.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v2) : v2;
if (Double.parseDouble(p1) < Double.parseDouble(p2)) return true;
if (advanced) triggerActions(actions, condition);
return false;
};
} else {
LogUtils.warn("Wrong value format found at < requirement.");
return null;
}
});
registerRequirement("<=", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");
String v2 = section.getString("value2", "");
return condition -> {
String p1 = v1.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v1) : v1;
String p2 = v2.startsWith("%") ? ParseUtils.setPlaceholders(condition.getPlayer(), v2) : v2;
if (Double.parseDouble(p1) <= Double.parseDouble(p2)) return true;
if (advanced) triggerActions(actions, condition);
return false;
};
} else {
LogUtils.warn("Wrong value format found at <= requirement.");
return null;
}
});
}
private void registerStartWithRequirement() {
registerRequirement("startsWith", (args, actions, advanced) -> {
@@ -736,6 +744,9 @@ public class RequirementManagerImpl implements RequirementManager {
return null;
}
});
}
private void registerEndWithRequirement() {
registerRequirement("endsWith", (args, actions, advanced) -> {
if (args instanceof ConfigurationSection section) {
String v1 = section.getString("value1", "");

4
plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/AbstractSQLDatabase.java
View File

@@ -91,7 +91,9 @@ public abstract class AbstractSQLDatabase extends AbstractStorage {
if (rs.next()) {
int lock = rs.getInt(2);
if (!force && (lock != 0 && getCurrentSeconds() - CFConfig.dataSaveInterval <= lock)) {
statement.close(); rs.close(); connection.close();
statement.close();
rs.close();
connection.close();
future.complete(Optional.of(PlayerData.LOCKED));
return;
}

4
plugin/src/main/java/net/momirealms/customfishing/storage/method/database/sql/SQLiteImpl.java
View File

@@ -89,7 +89,9 @@ public class SQLiteImpl extends AbstractSQLDatabase {
if (rs.next()) {
int lock = rs.getInt(2);
if (!force && (lock != 0 && getCurrentSeconds() - CFConfig.dataSaveInterval <= lock)) {
statement.close(); rs.close(); connection.close();
statement.close();
rs.close();
connection.close();
future.complete(Optional.of(PlayerData.LOCKED));
return;
}