JPP: Made spider wire fly anno optional by defaulting to java field name
This commit is contained in:
parent
813980f35c
commit
00f2d1c316
3 changed files with 15 additions and 45 deletions
|
|
@ -144,6 +144,9 @@ public enum BãßBȍőnSpider implements ᒢEnum {
|
|||
flyEye = annoHuntFly.eye();
|
||||
flyName = annoHuntFly.name();
|
||||
flyDescription = annoHuntFly.description();
|
||||
if (flyEye.isEmpty()) {
|
||||
flyEye = field.getName();
|
||||
}
|
||||
if (flyName.isEmpty()) {
|
||||
flyName = null;
|
||||
}
|
||||
|
|
@ -151,6 +154,11 @@ public enum BãßBȍőnSpider implements ᒢEnum {
|
|||
flyDescription = null;
|
||||
}
|
||||
}
|
||||
if (isHunt == false && BãßBȍőnSpiderPaint.HuntFly.class.isAssignableFrom(eggPaint)) {
|
||||
// if paint if fly hunt, than allow fly anno as optional as we default on field name for eye
|
||||
isHunt = true;
|
||||
flyEye = field.getName();
|
||||
}
|
||||
final boolean isOptionalFinal = isOptional;
|
||||
final Class<?> eggTypeFinal = eggType;
|
||||
final Class<?> dragonBloodFinal = dragonBlood;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,8 @@ import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAu
|
|||
@Target({ElementType.FIELD})
|
||||
public @interface BãßBȍőnSpiderWireFly注 {
|
||||
|
||||
String eye();
|
||||
/// per default uses the java field name for eye sight identifier
|
||||
String eye() default ᒢℭỗᶇṧⱦᶏꬼȶʂ.STRᣟᐧᣟEMPTY;
|
||||
|
||||
String name() default ᒢℭỗᶇṧⱦᶏꬼȶʂ.STRᣟᐧᣟEMPTY;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,27 +30,21 @@ package ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪ
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.function.BiFunction;
|
||||
import java.util.function.Function;
|
||||
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒃᐤᣔᐪ.BãßBȍőnBőatꞱᴿᴳᴮ;
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.BãßBȍőnCoffinԲ;
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.BãßBȍőnSpiderWireFly注;
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᒄᓫᣔᐪᑋ.ᔆᣖᑊᒄᓫᣗ.BãßBȍőnSpiderWire注;
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᔿᓑᔿᔿᔋᐝᣚ.BãßᛗᚢᛗᛗᛉBoneBabe𓄯;
|
||||
import ᒢᐩᐩ.ᒃᣔᔆᔆᒃᐤᐤᣕ.ᔿᓑᔿᔿᔋᐝᣚ.BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnumShot𓄯;
|
||||
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒃᣔᒃᓫᒻ.ᑊᐣᓑᖮᐪᔆ.DuytsDocAuthor注;
|
||||
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒢᔿᕽ.Vū́ǘrBȍőnSupportꞱᴿᴳᴮ;
|
||||
import ᒢᐩᐩ.ᔆʸᔆᐪᓫᔿ.ᒢᔿᕽ.ᘁᓑᓑᣗ.Vū́ǘrBurnCounterᴶᴹˣ;
|
||||
import ᒢᐩᐩ.ᣕᓑᔿᒃᓫᣗ.ᙆᓫᣗᒄᑊᣕᣔᒻ.PrimordialZerdinal;
|
||||
import ᒢᐩᐩ.ᣕᓑᔿᒃᓫᣗ.ᙆᓫᣗᒄᑊᣕᣔᒻ.PrimordialZerdinalSpaceBoundary;
|
||||
import ᒢᐩᐩ.ᣕᓑᔿᒃᓫᣗ.ᙆᓫᣗᒄᑊᣕᣔᒻ.PrimordialZerdinalSpaceMaterializer;
|
||||
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᒢℭỗᶇṧⱦᶏꬼȶʂ;
|
||||
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator注;
|
||||
import ᒢᐩᐩ.ᒡᒢᑊᒻᒻᓫᔿ.ᣳᣝᐤᣜᣳ.ᐪᓫᣗᔿᑊᣕᣔᐪᐤᣗ.ᐦ.Terminator𓄯;
|
||||
import ᒢᐩᐩ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆ.ArrayLadderᴿᵂ;
|
||||
import ᒢᐩᐩ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆ.Ladderᴿᵈ;
|
||||
import ᒢᐩᐩ.ᒼᐤᒻᒻᓫᒼᐪᑊᐤᣕᔆ.Ladderᵂʳ;
|
||||
|
||||
/// Gateway to all terminator ababus base calculators.
|
||||
/// @author للَّٰهِilLצسُو
|
||||
|
|
@ -61,139 +55,106 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
|
|||
亞;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverFailed")
|
||||
//@BãßBȍőnSpiderWireFly注(eye = "deliverFailed") eye id and anno are optional for fly paint, defaults to field name
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverFailed;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT001ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT001ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT002ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT002ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT003ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT003ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT004ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT004ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT005ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT005ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT006ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT006ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT007ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT007ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT008ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT008ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT009ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT009ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT010ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT010ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT011ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT011ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT012ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT012ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT013ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT013ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT014ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT014ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT015ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT015ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT016ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT016ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT017ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT017ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT018ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT018ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT019ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT019ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT020ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT020ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT021ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT021ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT025ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT025ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT027ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT027ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT028ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT028ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT029ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT029ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT060ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT060ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT064ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT064ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT087ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT087ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT128ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT128ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT192ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT192ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT256ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT256ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT300ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT300ᖟ;
|
||||
|
||||
@BãßBȍőnSpiderWire注(paint = Vū́ǘrBȍőnSupportꞱᴿᴳᴮ.ẞassPaint.ꞱBurnWireFly.class)
|
||||
@BãßBȍőnSpiderWireFly注(eye = "deliverT512ᖟ")
|
||||
private Vū́ǘrBurnCounterᴶᴹˣ deliverT512ᖟ;
|
||||
|
||||
private static final int[] BAKED_IN_PIES = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,25,27,28,29,60,64,87,128,192,256,300,512};
|
||||
|
|
@ -305,7 +266,7 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
|
|||
private interface PrimordialZerdinalBase1 extends PrimordialZerdinalMutexBase1, PrimordialZerdinalMutex<PrimordialZerdinalMutexBase1> {
|
||||
@Override
|
||||
default int zerdinalSpaceBoundary() {
|
||||
return PART_0001;
|
||||
return PART_0001; // TODO: this comes (twice) automaticly from the aggregated named tri merg-ed object slug group A/B(of 18 bit) by knowing the offset of the base of the slug group via the interface the value part (above)
|
||||
}
|
||||
}
|
||||
private interface PrimordialZerdinalBase2 extends PrimordialZerdinalMutexBase2, PrimordialZerdinalMutex<PrimordialZerdinalMutexBase2> {
|
||||
|
|
@ -314,8 +275,8 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
|
|||
return PART_0002;
|
||||
}
|
||||
}
|
||||
@Terminator注(slices = 1)
|
||||
static private class BoneZerdinalBase1 extends BoneTerminatorBaseX<BoneZerdinalBase1> implements PrimordialZerdinalBase1 {
|
||||
@Terminator注(slices = 1) // TODO: delete anno, comes from first tri merg-ed slug, the second tri-merged-ed slug is the PART_0001++ slice identifier interface key.
|
||||
static public class BoneZerdinalBase1 extends BoneTerminatorBaseX<BoneZerdinalBase1> implements PrimordialZerdinalBase1 {
|
||||
static public final BoneZerdinalBase1 IDENDITY = new BoneZerdinalBase1(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO);
|
||||
private BoneZerdinalBase1(int slice) {
|
||||
super(slice, i -> new BoneZerdinalBase1(i)); // TODO: make anno optional and add slice count in an drum constructor
|
||||
|
|
@ -331,7 +292,7 @@ public enum TTꞱꞱᖟGateway implements BãßᛗᚢᛗᛗᛉVū́ǘrChaliceEnu
|
|||
}
|
||||
}
|
||||
@Terminator注(slices = 2)
|
||||
static private class BoneZerdinalBase2 extends BoneTerminatorBaseX<BoneZerdinalBase2> implements PrimordialZerdinalBase2 {
|
||||
static public class BoneZerdinalBase2 extends BoneTerminatorBaseX<BoneZerdinalBase2> implements PrimordialZerdinalBase2 {
|
||||
static public final BoneZerdinalBase2 IDENDITY = new BoneZerdinalBase2(ᒢℭỗᶇṧⱦᶏꬼȶʂ.INTᣟᐧᣟZERO);
|
||||
private BoneZerdinalBase2(int slice) {
|
||||
super(slice, i -> new BoneZerdinalBase2(i));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue