Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[BREAKING] Move std. annotations into RegistrationOrder. Add more. 

* The annotations made for RegistrationOrder are defined in there.
* Add RegisterMethodWithOrder (method) for event handlers.
* Add RegisterEventsWithOrder (type) for default order with listeners.
This commit is contained in:
asofold 2018-01-16 21:08:45 +01:00
parent 243d8dd6c8
commit f7571dcf2f
3 changed files with 82 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/registry/order/RegisterWithOrder.java
View File

@ -1,23 +0,0 @@
package fr.neatmonster.nocheatplus.components.registry.order;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Empty string counts as null.
* @author asofold
*
*/
@Documented
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface RegisterWithOrder {
/** Crude workaround for an Integer that may be null. */
public String basePriority() default "";
public String tag() default "";
public String beforeTag() default "";
public String afterTag() default "";
}

81
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/registry/order/RegistrationOrder.java
View File

@ -1,5 +1,10 @@
package fr.neatmonster.nocheatplus.components.registry.order;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@ -17,6 +22,56 @@ import fr.neatmonster.nocheatplus.utilities.ds.map.CoordHash;
*/
public class RegistrationOrder {
/**
* General registration order for a type.
*
* @author asofold
*
*/
@Documented
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface RegisterWithOrder {
/** Crude workaround for an Integer that may be null. */
public String basePriority() default "";
public String tag() default "";
public String beforeTag() default "";
public String afterTag() default "";
}
/**
* Aimed at event listeners, to provide a default order.
*
* @author asofold
*
*/
@Documented
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RegisterEventsWithOrder {
/** Crude workaround for an Integer that may be null. */
public String basePriority() default "";
public String tag() default "";
public String beforeTag() default "";
public String afterTag() default "";
}
/**
* Aimed at event handlers.
* @author asofold
*
*/
@Documented
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RegisterMethodWithOrder {
/** Crude workaround for an Integer that may be null. */
public String basePriority() default "";
public String tag() default "";
public String beforeTag() default "";
public String afterTag() default "";
}
/**
* Compare on base of basePriority. Entries with null priority are sorted to
* the front.
@ -504,6 +559,32 @@ public class RegistrationOrder {
bluePrint.afterTag().isEmpty() ? null : bluePrint.afterTag());
}
/**
*
* @param bluePrint
* @throws NumberFormatException, if basePriority can't be parsed.
*/
public RegistrationOrder(RegisterEventsWithOrder bluePrint) {
// TODO: InvalidOrderException via static method for parsing.
this(bluePrint.basePriority().isEmpty() ? null : Integer.parseInt(bluePrint.basePriority()),
bluePrint.tag().isEmpty() ? null : bluePrint.tag(),
bluePrint.beforeTag().isEmpty() ? null : bluePrint.beforeTag(),
bluePrint.afterTag().isEmpty() ? null : bluePrint.afterTag());
}
/**
*
* @param bluePrint
* @throws NumberFormatException, if basePriority can't be parsed.
*/
public RegistrationOrder(RegisterMethodWithOrder bluePrint) {
// TODO: InvalidOrderException via static method for parsing.
this(bluePrint.basePriority().isEmpty() ? null : Integer.parseInt(bluePrint.basePriority()),
bluePrint.tag().isEmpty() ? null : bluePrint.tag(),
bluePrint.beforeTag().isEmpty() ? null : bluePrint.beforeTag(),
bluePrint.afterTag().isEmpty() ? null : bluePrint.afterTag());
}
public RegistrationOrder(RegistrationOrder bluePrint) {
this(bluePrint.getBasePriority(), bluePrint.getTag(), bluePrint.getBeforeTag(), bluePrint.getAfterTag());
}

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/components/registry/store/RegisteredItemStore.java
View File

@ -14,9 +14,9 @@ import java.util.Set;
import fr.neatmonster.nocheatplus.components.registry.exception.AlreadyRegisteredException;
import fr.neatmonster.nocheatplus.components.registry.order.IGetRegistrationOrder;
import fr.neatmonster.nocheatplus.components.registry.order.IRegisterWithOrder;
import fr.neatmonster.nocheatplus.components.registry.order.RegisterWithOrder;
import fr.neatmonster.nocheatplus.components.registry.order.RegistrationOrder;
import fr.neatmonster.nocheatplus.components.registry.order.RegistrationOrder.AbstractRegistrationOrderSort;
import fr.neatmonster.nocheatplus.components.registry.order.RegistrationOrder.RegisterWithOrder;
import fr.neatmonster.nocheatplus.components.registry.order.SetupOrder;
/**