Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-06-26 06:14:42 +02:00
Code Issues Projects Releases Wiki Activity

Include the entire MC 1.10.x range with ProtocolLib 4.1 and later.

Browse Source
This commit is contained in:
asofold 2016-11-02 19:10:46 +01:00
parent cad500edc7
commit b8746efcb7
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NCPCore/src/main/java/fr/neatmonster/nocheatplus/compat/versions/Activation.java
View File

@ -90,6 +90,8 @@ public class Activation implements IDescriptiveActivation {
private String neutralDescription = null;
private boolean advertise = false;
@Override
public boolean isAvailable() {
for (IActivation condition : conditions) {
@ -407,6 +409,20 @@ public class Activation implements IDescriptiveActivation {
return this;
}
/**
* Set if to advertise presence / possibility somehow.
* @param advertise
* @return This Activation instance.
*/
public Activation advertise(boolean advertise) {
this.advertise = advertise;
return this;
}
public boolean advertise() {
return this.advertise;
}
// TODO: set operation ( AND / OR ( / ...) ) + addCondition(IActivation).
// TODO: server version not contains (+ignore case).
// TODO: Might use testing methods for parts: meetsServerVersionRequirements(), more complicated...

8
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/registry/activation/IDescriptiveActivation.java
View File

@ -33,4 +33,12 @@ public interface IDescriptiveActivation extends IActivation {
*/
public String getNeutralDescription();
/**
* Test if this feature/combination is intended to be advertised, e.g. on
* printing an overview of supported configurations.
*
* @return
*/
public boolean advertise();
}

17
NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/compat/registry/DefaultComponentFactory.java
View File

@ -48,9 +48,10 @@ public class DefaultComponentFactory {
public DefaultComponentFactory() {
for (Activation condition : Arrays.asList(
new Activation()
.neutralDescription("ProtocolLib 4.1 or later for Minecraft 1.8.x or later")
.neutralDescription("ProtocolLib 4.1 or later for Minecraft 1.8.x to 1.10.x")
.pluginVersionGT("ProtocolLib", "4.1", true)
.minecraftVersionBetween("1.8", true, "1.10", true)
.minecraftVersionBetween("1.8", true, "1.11", false)
.advertise(true)
,
new Activation()
.neutralDescription("ProtocolLib 4.0.2 for Minecraft 1.10.x")
@ -63,9 +64,10 @@ public class DefaultComponentFactory {
.minecraftVersionBetween("1.9", true, "1.10", false)
,
new Activation()
.neutralDescription("ProtocolLib 3.7.0 or 3.7 for Minecraft 1.9.x")
.pluginVersionBetween("ProtocolLib", "3.7", true, "3.7.0", true) // Might want other types...
.minecraftVersionBetween("1.9", true, "1.10", false)
.neutralDescription("ProtocolLib 3.7.0 for Minecraft 1.7.x and earlier")
.pluginVersionBetween("ProtocolLib", "3.7", true, "3.7.0", true)
.minecraftVersionLT("1.10", false) // Allowed, but not necessarily recommended.
.advertise(true)
,
new Activation()
.neutralDescription("ProtocolLib 3.6.5 or 3.6.4 for Minecraft 1.8.x")
@ -77,6 +79,7 @@ public class DefaultComponentFactory {
.pluginVersionEQ("ProtocolLib", "3.6.6")
.serverVersionContainsIgnoreCase("paperspigot")
.minecraftVersionBetween("1.8", true, "1.9", false)
.advertise(true)
,
new Activation()
.neutralDescription("ProtocolLib 3.6.4 before Minecraft 1.9")
@ -151,7 +154,9 @@ public class DefaultComponentFactory {
List<String> parts = new LinkedList<String>();
parts.add("Packet level access via ProtocolLib not available, supported configurations: ");
for (IDescriptiveActivation cond : protocolLibActivation) {
parts.add(cond.getNeutralDescription());
if (cond.advertise()) {
parts.add(cond.getNeutralDescription());
}
}
StaticLog.logWarning(StringUtil.join(parts, " | "));
}