Skip to content

Commit e8f79a5

Browse files
committed
Commented out incomplete conversion logic
Replaced unfinished bank and account conversion workflows with `CompletableFuture.completedFuture(null)`. Added TODOs and FIXMEs to address unresolved implementation details.
1 parent fa532d4 commit e8f79a5

File tree

1 file changed

+21
-17
lines changed

1 file changed

+21
-17
lines changed

plugin/src/main/java/net/thenextlvl/service/command/ServiceConvertCommand.java

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,17 @@ private <C extends Controller> LiteralArgumentBuilder<CommandSourceStack> conver
6262
private static final class BankConverter extends PlayerConverter<BankController> {
6363
@Override
6464
public CompletableFuture<Void> convert(OfflinePlayer player, BankController source, BankController target) {
65-
return source.loadBanks().thenAccept(banks -> banks.forEach(bank ->
66-
bank.getWorld().map(world -> target.createBank(bank.getOwner(), bank.getName(), world))
67-
.orElseGet(() -> target.createBank(bank.getOwner(), bank.getName()))
68-
.thenAccept(targetBank -> {
69-
// todo: convert all currencies
70-
// todo: convert balance with currencies
71-
targetBank.setBalance(bank.getBalance());
72-
bank.getMembers().forEach(targetBank::addMember);
73-
})));
65+
return CompletableFuture.completedFuture(null);
66+
// todo: convert all currencies
67+
// todo: convert balance with currencies
68+
// fixme:
69+
// return source.loadBanks().thenAccept(banks -> banks.forEach(bank ->
70+
// bank.getWorld().map(world -> target.createBank(bank.getOwner(), bank.getName(), world))
71+
// .orElseGet(() -> target.createBank(bank.getOwner(), bank.getName()))
72+
// .thenAccept(targetBank -> {
73+
// targetBank.setBalance(bank.getBalance());
74+
// bank.getMembers().forEach(targetBank::addMember);
75+
// })));
7476
}
7577
}
7678

@@ -121,14 +123,16 @@ public CompletableFuture<Void> convert(EconomyController source, EconomyControll
121123
}
122124

123125
public CompletableFuture<Void> convert(Account account, EconomyController source, EconomyController target) {
124-
return account.getWorld().map(world -> target.tryGetAccount(account.getOwner(), world)
125-
.thenCompose(account1 -> account1.map(CompletableFuture::completedFuture)
126-
.orElseGet(() -> target.createAccount(account.getOwner(), world)))
127-
.thenAccept(account1 -> account1.setBalance(account.getBalance())))
128-
.orElseGet(() -> target.tryGetAccount(account.getOwner())
129-
.thenCompose(account1 -> account1.map(CompletableFuture::completedFuture)
130-
.orElseGet(() -> target.createAccount(account.getOwner())))
131-
.thenAccept(account1 -> account1.setBalance(account.getBalance())));
126+
return CompletableFuture.completedFuture(null);
127+
// fixme
128+
// return account.getWorld().map(world -> target.tryGetAccount(account.getOwner(), world)
129+
// .thenCompose(account1 -> account1.map(CompletableFuture::completedFuture)
130+
// .orElseGet(() -> target.createAccount(account.getOwner(), world)))
131+
// .thenAccept(account1 -> account1.setBalance(account.getBalance())))
132+
// .orElseGet(() -> target.tryGetAccount(account.getOwner())
133+
// .thenCompose(account1 -> account1.map(CompletableFuture::completedFuture)
134+
// .orElseGet(() -> target.createAccount(account.getOwner())))
135+
// .thenAccept(account1 -> account1.setBalance(account.getBalance())));
132136
}
133137
}
134138

0 commit comments

Comments
 (0)