Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-01 21:11:33 +01:00
Code Issues Projects Releases Wiki Activity

Added Advancement#toMapping

Browse Source
This commit is contained in:
Felix Cravic 2020-08-06 02:37:58 +02:00
parent 51e6f2ff19
commit 51af720bd4
2 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/net/minestom/server/advancements/Advancement.java
View File

@ -238,14 +238,11 @@ public class Advancement {
}
/**
* Get the packet used to add this advancement to the already existing tab
* Convert this advancement to an {@link AdvancementsPacket.AdvancementMapping}
*
* @return the packet to add this advancement
* @return the mapping of this advancement
*/
protected AdvancementsPacket getUpdatePacket() {
AdvancementsPacket advancementsPacket = new AdvancementsPacket();
advancementsPacket.resetAdvancements = false;
protected AdvancementsPacket.AdvancementMapping toMapping() {
AdvancementsPacket.AdvancementMapping mapping = new AdvancementsPacket.AdvancementMapping();
{
AdvancementsPacket.Advancement adv = new AdvancementsPacket.Advancement();
@ -263,6 +260,20 @@ public class Advancement {
adv.requirements = new AdvancementsPacket.Requirement[]{};
}
return mapping;
}
/**
* Get the packet used to add this advancement to the already existing tab
*
* @return the packet to add this advancement
*/
protected AdvancementsPacket getUpdatePacket() {
AdvancementsPacket advancementsPacket = new AdvancementsPacket();
advancementsPacket.resetAdvancements = false;
final AdvancementsPacket.AdvancementMapping mapping = toMapping();
advancementsPacket.identifiersToRemove = new String[]{};
advancementsPacket.advancementMappings = new AdvancementsPacket.AdvancementMapping[]{mapping};
advancementsPacket.progressMappings = new AdvancementsPacket.ProgressMapping[]{};

18
src/main/java/net/minestom/server/advancements/AdvancementTab.java
View File

@ -104,23 +104,7 @@ public class AdvancementTab implements Viewable {
List<AdvancementsPacket.AdvancementMapping> mappings = new ArrayList<>();
for (Advancement advancement : advancementMap.keySet()) {
AdvancementsPacket.AdvancementMapping mapping = new AdvancementsPacket.AdvancementMapping();
{
AdvancementsPacket.Advancement adv = new AdvancementsPacket.Advancement();
mapping.key = advancement.getIdentifier();
mapping.value = adv;
final Advancement parent = advancement.getParent();
if (parent != null) {
final String parentIdentifier = parent.getIdentifier();
adv.parentIdentifier = parentIdentifier;
}
adv.displayData = advancement.toDisplayData();
adv.criterions = new String[]{};
adv.requirements = new AdvancementsPacket.Requirement[]{};
}
mappings.add(mapping);
mappings.add(advancement.toMapping());
}
advancementsPacket.identifiersToRemove = new String[]{};