Acidblock improvements #606
Conversation
New messages in chat and cti for when acids are going to fail with new checks for all faces of acid block. Multifaced acidblocks now choose the weakest reinforcement being acided to base its timer on.
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/CitadelUtility.java
Show resolved
Hide resolved
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/Acid.java
Outdated
Show resolved
Hide resolved
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/ReinforcementsGUI.java
Outdated
Show resolved
Hide resolved
| @@ -92,4 +108,21 @@ private List<IClickable> getClicks(List<ReinforcementType> types, boolean allowe | |||
|
|
|||
| return clickables; | |||
| } | |||
|
|
|||
| private List<IClickable> getAcidTypeClicks(List<AcidType> acidTypes) { | |||
| List<IClickable> clickables = new LinkedList<>(); | |||
There was a problem hiding this comment.
use an ArrayList by default, unless you know you benefit from linked lists specifically (unlikely)
There was a problem hiding this comment.
tbh I just tried to make it as similar to the already existing getClicks code as possible, the previous one used linked lists so ¯_(ツ)_/¯
There was a problem hiding this comment.
awoos passionate hatred for linkedlists can be seen in praxis civ-dev
There was a problem hiding this comment.
I agree with awoo, you can even pre-size it with new ArrayList<>(acidTypes.length())
There was a problem hiding this comment.
I have killed the linkedlist
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/command/Acid.java
Outdated
Show resolved
Hide resolved
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/model/AcidManager.java
Outdated
Show resolved
Hide resolved
|
all the changes listed above seem to be working fine now, but somebody testing it themselves would be appreciated |
| } | ||
| if ( | ||
| targetBlockRein != null | ||
| && !MaterialUtils.isAir(relativeBlock.getType()) |
plugins/citadel-paper/src/main/java/vg/civcraft/mc/citadel/CitadelUtility.java
Show resolved
Hide resolved
| @@ -92,4 +108,21 @@ private List<IClickable> getClicks(List<ReinforcementType> types, boolean allowe | |||
|
|
|||
| return clickables; | |||
| } | |||
|
|
|||
| private List<IClickable> getAcidTypeClicks(List<AcidType> acidTypes) { | |||
| List<IClickable> clickables = new LinkedList<>(); | |||
There was a problem hiding this comment.
I agree with awoo, you can even pre-size it with new ArrayList<>(acidTypes.length())
|
Was this ready? |
| if ( | ||
| relativeReinforcement == null | ||
| || !relativeReinforcement.getType().canBeReinforced(relativeBlock.getType()) | ||
| || acidMan.isPossibleAcidBlock(relativeBlock) |
There was a problem hiding this comment.
Shouldn't acid blocks be able to affect other acid blocks now? This condition should be consistent with /cti
|
closing as abandoned |
Addresses #492