issue/finish-factions-and-banking #2
Loading…
Reference in New Issue
Block a user
No description provided.
Delete Branch "issue/finish-factions-and-banking"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
This is all the work from factions and banking that has been done over the past couple months. Making a pull request now and will respectively put the rest of the work on their own branches because this is finally in its own comfortable area
This is technically only a hair portion of this branch by the way - I force merged dev with this branch changes to get @walrus going on their own branch for faction beacon stuff. it's my repo so it's whatever, but the changes relevant in this code review have been changes done over the past week or so
This is a long change
@ -33,1 +40,3 @@
private void ApplyEffects(ServerPlayerEntity player) {
private Integer GetBeaconAmplifier(FactionTierEnum tier) {
switch (tier) {
case TIER_I:
you should leave a commet saying TIER_I has no effects this could be confusing
@ -118,4 +139,2 @@
///
/// @param[in] The new default account global account identifier
///
/// @return Changes the players default account at a selected bank
replace this doxygen part?
@ -68,0 +73,4 @@
if (!playerSelectedBank.isEmpty()) {
IndividualBank bank = GetBankByName(playerSelectedBank);
Optional<Integer> amount = bank.GetAccountBalance(AccountNumberGenerator.GetAccountNumberFromId(playerConfigs.get(player.getUuidAsString()).defaultSelectedAccount));
if (amount.isPresent()) {
if this actually works id be impressed with it >_>
@ -145,2 +147,2 @@
Integer remaining = accountBalance - amount;
success = (remaining < 0 && !allowNegativeBalance);
int remaining = accountBalance - amount;
success = (remaining >= 0 || allowNegativeBalance);
is allowNegativeBalance a method?
@ -415,4 +410,0 @@
/// @param[in] newAlias is name to give this account
///
/// @brief Alias an account
/////////////////////////////////////////////////////////////////////////////
smeems wrong to get rid of this Doxygen and replace it with in code comments are we not using doxygen?
@ -4,3 +3,1 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
is this actually nessesary? or is this alot of extra imports IE:https://www.geeksforgeeks.org/java-util-package-java/
@ -37,3 +35,3 @@
// KBIC will ensure an amount of money based on its trustworthiness to a bank and the number of holders it has.
private Integer kbicInsuredAmount = 0;
private Integer kbicInsuredAmount = 75_000;
private Boolean kbicInsured = false;
maaaaaaan is it boolean or Boolean
both
@ -36,3 +27,1 @@
case GREEN:
return colorStr + "2";
}
return switch (code) {
:O return switch is awesome
@ -39,2 +32,4 @@
case GREEN -> colorStr + "2";
};
// If this code is reachable, then someone has not properly handled the above switch-case
no code here and also maybe use a default case: if your worried about it
@ -42,6 +55,57 @@ public class ChatMenu {
this.rightArrow = rightArrow;
}
private Text MakeFooter() {
Footnote?
? This is for making the footer in the message sent to the user
@ -409,4 +424,0 @@
///
/// @return True if player is operator, false if not
/////////////////////////////////////////////////////////////////////////////
public Boolean IsOperator(ServerPlayerEntity player) {
good choice to remove this is a wierd function
@ -22,2 +22,2 @@
BlockManager.RegisterBlock("example_statue", new Block(FabricBlockSettings.copyOf(Blocks.BELL)));
BlockManager.RegisterBlock("faction_base_block", new FactionBaseBlock(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).nonOpaque()));
BlockManager.RegisterBlock("example_statue", new Block(FabricBlockSettings.copyOf(Blocks.BELL).nonOpaque()));
BlockManager.RegisterBlock("faction_base_block", new FactionBaseBlock(FabricBlockSettings.copyOf(Blocks.COBBLESTONE).requiresTool().nonOpaque()));
did nonOpaque fix the faces not rendering issue of blocks ajacent
yes
This PR is closed and merged.