diff --git a/build.gradle.kts b/build.gradle.kts index 6efb555..1c14ff8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,29 +19,29 @@ implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1") implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.1") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1") - implementation("com.google.protobuf:protobuf-java:3.25.1") - implementation("com.google.protobuf:protobuf-kotlin:3.25.1") + implementation("com.google.protobuf:protobuf-java:3.25.2") + implementation("com.google.protobuf:protobuf-kotlin:3.25.2") implementation("com.ibm.icu:icu4j:74.2") implementation("com.lmax:disruptor:3.4.4") implementation("com.sun.mail:jakarta.mail:2.0.1") implementation("commons-codec:commons-codec:1.16.0") implementation("commons-io:commons-io:2.15.1") - implementation("io.netty:netty-all:4.1.104.Final") + implementation("io.netty:netty-all:4.1.106.Final") implementation("jakarta.mail:jakarta.mail-api:2.1.2") - implementation("net.dv8tion:JDA:5.0.0-beta.18") + implementation("net.dv8tion:JDA:5.0.0-beta.20") implementation("org.apache.commons:commons-compress:1.25.0") implementation("org.apache.commons:commons-dbcp2:2.11.0") implementation("org.apache.commons:commons-lang3:3.14.0") - implementation("org.apache.httpcomponents.client5:httpclient5:5.3") + implementation("org.apache.httpcomponents.client5:httpclient5:5.3.1") implementation("org.apache.logging.log4j:log4j-core:2.22.1") implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.22.1") - implementation("org.jline:jline:3.25.0") - implementation("org.jline:jline-terminal-jansi:3.25.0") + implementation("org.jline:jline:3.25.1") + implementation("org.jline:jline-terminal-jansi:3.25.1") implementation("org.jsoup:jsoup:1.17.2") implementation("org.mariadb.jdbc:mariadb-java-client:3.3.2") implementation("org.python:jython-standalone:2.7.3") - implementation("org.seleniumhq.selenium:selenium-edge-driver:4.16.1") - implementation("org.seleniumhq.selenium:selenium-java:4.16.1") + implementation("org.seleniumhq.selenium:selenium-edge-driver:4.17.0") + implementation("org.seleniumhq.selenium:selenium-java:4.17.0") implementation("org.tukaani:xz:1.9") implementation(kotlin("stdlib-jdk8")) runtimeOnly("com.squareup.okio:okio-jvm:3.7.0") diff --git a/src/main/java/EventOuterClass.java b/src/main/java/EventOuterClass.java index c123c10..98bea31 100644 --- a/src/main/java/EventOuterClass.java +++ b/src/main/java/EventOuterClass.java @@ -4319,376 +4319,382 @@ int getStand(); /** - * int32 highestBand = 5; + * int32 band = 5; + * @return The band. + */ + int getBand(); + + /** + * int32 highestBand = 6; * @return The highestBand. */ int getHighestBand(); /** - * double point = 6; + * double point = 7; * @return The point. */ double getPoint(); /** - * double hitPoints = 7; + * double hitPoints = 8; * @return The hitPoints. */ double getHitPoints(); /** - * bool isFailed = 8; + * bool isFailed = 9; * @return The isFailed. */ boolean getIsFailed(); /** - * int32 lastJudged = 9; + * int32 lastJudged = 10; * @return The lastJudged. */ int getLastJudged(); /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ java.util.List getDrawingsList(); /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ EventOuterClass.Event.NetDrawing getDrawings(int index); /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ int getDrawingsCount(); /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ java.util.List getDrawingsOrBuilderList(); /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ EventOuterClass.Event.NetDrawingOrBuilder getDrawingsOrBuilder( int index); /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return Whether the drawingComponent field is set. */ boolean hasDrawingComponent(); /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return The drawingComponent. */ EventOuterClass.Event.DrawingComponent getDrawingComponent(); /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ EventOuterClass.Event.DrawingComponentOrBuilder getDrawingComponentOrBuilder(); /** - * string title = 12; + * string title = 13; * @return The title. */ java.lang.String getTitle(); /** - * string title = 12; + * string title = 13; * @return The bytes for title. */ com.google.protobuf.ByteString getTitleBytes(); /** - * string artist = 13; + * string artist = 14; * @return The artist. */ java.lang.String getArtist(); /** - * string artist = 13; + * string artist = 14; * @return The bytes for artist. */ com.google.protobuf.ByteString getArtistBytes(); /** - * string genre = 14; + * string genre = 15; * @return The genre. */ java.lang.String getGenre(); /** - * string genre = 14; + * string genre = 15; * @return The bytes for genre. */ com.google.protobuf.ByteString getGenreBytes(); /** - * int32 level = 15; + * int32 level = 16; * @return The level. */ int getLevel(); /** - * string levelText = 16; + * string levelText = 17; * @return The levelText. */ java.lang.String getLevelText(); /** - * string levelText = 16; + * string levelText = 17; * @return The bytes for levelText. */ com.google.protobuf.ByteString getLevelTextBytes(); /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The wantLevelID. */ java.lang.String getWantLevelID(); /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The bytes for wantLevelID. */ com.google.protobuf.ByteString getWantLevelIDBytes(); /** - * int32 autoMode = 18; + * int32 autoMode = 19; * @return The autoMode. */ int getAutoMode(); /** - * int32 noteSaltMode = 19; + * int32 noteSaltMode = 20; * @return The noteSaltMode. */ int getNoteSaltMode(); /** - * double audioMultiplier = 20; + * double audioMultiplier = 21; * @return The audioMultiplier. */ double getAudioMultiplier(); /** - * int32 faintNoteMode = 21; + * int32 faintNoteMode = 22; * @return The faintNoteMode. */ int getFaintNoteMode(); /** - * int32 judgmentMode = 22; + * int32 judgmentMode = 23; * @return The judgmentMode. */ int getJudgmentMode(); /** - * int32 hitPointsMode = 23; + * int32 hitPointsMode = 24; * @return The hitPointsMode. */ int getHitPointsMode(); /** - * int32 noteMobilityMode = 24; + * int32 noteMobilityMode = 25; * @return The noteMobilityMode. */ int getNoteMobilityMode(); /** - * int32 longNoteMode = 25; + * int32 longNoteMode = 26; * @return The longNoteMode. */ int getLongNoteMode(); /** - * int32 inputFavorMode = 26; + * int32 inputFavorMode = 27; * @return The inputFavorMode. */ int getInputFavorMode(); /** - * int32 noteModifyMode = 27; + * int32 noteModifyMode = 28; * @return The noteModifyMode. */ int getNoteModifyMode(); /** - * int32 bpmMode = 28; + * int32 bpmMode = 29; * @return The bpmMode. */ int getBpmMode(); /** - * int32 waveMode = 29; + * int32 waveMode = 30; * @return The waveMode. */ int getWaveMode(); /** - * int32 setNoteMode = 30; + * int32 setNoteMode = 31; * @return The setNoteMode. */ int getSetNoteMode(); /** - * int32 lowestJudgmentConditionMode = 31; + * int32 lowestJudgmentConditionMode = 32; * @return The lowestJudgmentConditionMode. */ int getLowestJudgmentConditionMode(); /** - * int32 totalNotes = 32; + * int32 totalNotes = 33; * @return The totalNotes. */ int getTotalNotes(); /** - * double judgmentStage = 33; + * double judgmentStage = 34; * @return The judgmentStage. */ double getJudgmentStage(); /** - * double hitPointsValue = 34; + * double hitPointsValue = 35; * @return The hitPointsValue. */ double getHitPointsValue(); /** - * int32 highestInputCount = 35; + * int32 highestInputCount = 36; * @return The highestInputCount. */ int getHighestInputCount(); /** - * double length = 36; + * double length = 37; * @return The length. */ double getLength(); /** - * double bpm = 37; + * double bpm = 38; * @return The bpm. */ double getBpm(); /** - * double multiplier = 38; + * double multiplier = 39; * @return The multiplier. */ double getMultiplier(); /** - * int32 inputMode = 39; + * int32 inputMode = 40; * @return The inputMode. */ int getInputMode(); /** - * double highestJudgment0 = 40; + * double highestJudgment0 = 41; * @return The highestJudgment0. */ double getHighestJudgment0(); /** - * double higherJudgment0 = 41; + * double higherJudgment0 = 42; * @return The higherJudgment0. */ double getHigherJudgment0(); /** - * double highJudgment0 = 42; + * double highJudgment0 = 43; * @return The highJudgment0. */ double getHighJudgment0(); /** - * double lowJudgment0 = 43; + * double lowJudgment0 = 44; * @return The lowJudgment0. */ double getLowJudgment0(); /** - * double lowerJudgment0 = 44; + * double lowerJudgment0 = 45; * @return The lowerJudgment0. */ double getLowerJudgment0(); /** - * double lowestJudgment0 = 45; + * double lowestJudgment0 = 46; * @return The lowestJudgment0. */ double getLowestJudgment0(); /** - * double highestJudgment1 = 46; + * double highestJudgment1 = 47; * @return The highestJudgment1. */ double getHighestJudgment1(); /** - * double higherJudgment1 = 47; + * double higherJudgment1 = 48; * @return The higherJudgment1. */ double getHigherJudgment1(); /** - * double highJudgment1 = 48; + * double highJudgment1 = 49; * @return The highJudgment1. */ double getHighJudgment1(); /** - * double lowJudgment1 = 49; + * double lowJudgment1 = 50; * @return The lowJudgment1. */ double getLowJudgment1(); /** - * double lowerJudgment1 = 50; + * double lowerJudgment1 = 51; * @return The lowerJudgment1. */ double getLowerJudgment1(); /** - * double lowestJudgment1 = 51; + * double lowestJudgment1 = 52; * @return The lowestJudgment1. */ double getLowestJudgment1(); /** - * int32 highestJudgment = 52; + * int32 highestJudgment = 53; * @return The highestJudgment. */ int getHighestJudgment(); /** - * int32 higherJudgment = 53; + * int32 higherJudgment = 54; * @return The higherJudgment. */ int getHigherJudgment(); /** - * int32 highJudgment = 54; + * int32 highJudgment = 55; * @return The highJudgment. */ int getHighJudgment(); /** - * int32 lowJudgment = 55; + * int32 lowJudgment = 56; * @return The lowJudgment. */ int getLowJudgment(); /** - * int32 lowerJudgment = 56; + * int32 lowerJudgment = 57; * @return The lowerJudgment. */ int getLowerJudgment(); /** - * int32 lowestJudgment = 57; + * int32 lowestJudgment = 58; * @return The lowestJudgment. */ int getLowestJudgment(); @@ -4845,10 +4851,21 @@ return stand_; } - public static final int HIGHESTBAND_FIELD_NUMBER = 5; + public static final int BAND_FIELD_NUMBER = 5; + private int band_ = 0; + /** + * int32 band = 5; + * @return The band. + */ + @java.lang.Override + public int getBand() { + return band_; + } + + public static final int HIGHESTBAND_FIELD_NUMBER = 6; private int highestBand_ = 0; /** - * int32 highestBand = 5; + * int32 highestBand = 6; * @return The highestBand. */ @java.lang.Override @@ -4856,10 +4873,10 @@ return highestBand_; } - public static final int POINT_FIELD_NUMBER = 6; + public static final int POINT_FIELD_NUMBER = 7; private double point_ = 0D; /** - * double point = 6; + * double point = 7; * @return The point. */ @java.lang.Override @@ -4867,10 +4884,10 @@ return point_; } - public static final int HITPOINTS_FIELD_NUMBER = 7; + public static final int HITPOINTS_FIELD_NUMBER = 8; private double hitPoints_ = 0D; /** - * double hitPoints = 7; + * double hitPoints = 8; * @return The hitPoints. */ @java.lang.Override @@ -4878,10 +4895,10 @@ return hitPoints_; } - public static final int ISFAILED_FIELD_NUMBER = 8; + public static final int ISFAILED_FIELD_NUMBER = 9; private boolean isFailed_ = false; /** - * bool isFailed = 8; + * bool isFailed = 9; * @return The isFailed. */ @java.lang.Override @@ -4889,10 +4906,10 @@ return isFailed_; } - public static final int LASTJUDGED_FIELD_NUMBER = 9; + public static final int LASTJUDGED_FIELD_NUMBER = 10; private int lastJudged_ = 0; /** - * int32 lastJudged = 9; + * int32 lastJudged = 10; * @return The lastJudged. */ @java.lang.Override @@ -4900,18 +4917,18 @@ return lastJudged_; } - public static final int DRAWINGS_FIELD_NUMBER = 10; + public static final int DRAWINGS_FIELD_NUMBER = 11; @SuppressWarnings("serial") private java.util.List drawings_; /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ @java.lang.Override public java.util.List getDrawingsList() { return drawings_; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ @java.lang.Override public java.util.List @@ -4919,21 +4936,21 @@ return drawings_; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ @java.lang.Override public int getDrawingsCount() { return drawings_.size(); } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ @java.lang.Override public EventOuterClass.Event.NetDrawing getDrawings(int index) { return drawings_.get(index); } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ @java.lang.Override public EventOuterClass.Event.NetDrawingOrBuilder getDrawingsOrBuilder( @@ -4941,10 +4958,10 @@ return drawings_.get(index); } - public static final int DRAWINGCOMPONENT_FIELD_NUMBER = 11; + public static final int DRAWINGCOMPONENT_FIELD_NUMBER = 12; private EventOuterClass.Event.DrawingComponent drawingComponent_; /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return Whether the drawingComponent field is set. */ @java.lang.Override @@ -4952,7 +4969,7 @@ return ((bitField0_ & 0x00000001) != 0); } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return The drawingComponent. */ @java.lang.Override @@ -4960,18 +4977,18 @@ return drawingComponent_ == null ? EventOuterClass.Event.DrawingComponent.getDefaultInstance() : drawingComponent_; } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ @java.lang.Override public EventOuterClass.Event.DrawingComponentOrBuilder getDrawingComponentOrBuilder() { return drawingComponent_ == null ? EventOuterClass.Event.DrawingComponent.getDefaultInstance() : drawingComponent_; } - public static final int TITLE_FIELD_NUMBER = 12; + public static final int TITLE_FIELD_NUMBER = 13; @SuppressWarnings("serial") private volatile java.lang.Object title_ = ""; /** - * string title = 12; + * string title = 13; * @return The title. */ @java.lang.Override @@ -4988,7 +5005,7 @@ } } /** - * string title = 12; + * string title = 13; * @return The bytes for title. */ @java.lang.Override @@ -5006,11 +5023,11 @@ } } - public static final int ARTIST_FIELD_NUMBER = 13; + public static final int ARTIST_FIELD_NUMBER = 14; @SuppressWarnings("serial") private volatile java.lang.Object artist_ = ""; /** - * string artist = 13; + * string artist = 14; * @return The artist. */ @java.lang.Override @@ -5027,7 +5044,7 @@ } } /** - * string artist = 13; + * string artist = 14; * @return The bytes for artist. */ @java.lang.Override @@ -5045,11 +5062,11 @@ } } - public static final int GENRE_FIELD_NUMBER = 14; + public static final int GENRE_FIELD_NUMBER = 15; @SuppressWarnings("serial") private volatile java.lang.Object genre_ = ""; /** - * string genre = 14; + * string genre = 15; * @return The genre. */ @java.lang.Override @@ -5066,7 +5083,7 @@ } } /** - * string genre = 14; + * string genre = 15; * @return The bytes for genre. */ @java.lang.Override @@ -5084,10 +5101,10 @@ } } - public static final int LEVEL_FIELD_NUMBER = 15; + public static final int LEVEL_FIELD_NUMBER = 16; private int level_ = 0; /** - * int32 level = 15; + * int32 level = 16; * @return The level. */ @java.lang.Override @@ -5095,11 +5112,11 @@ return level_; } - public static final int LEVELTEXT_FIELD_NUMBER = 16; + public static final int LEVELTEXT_FIELD_NUMBER = 17; @SuppressWarnings("serial") private volatile java.lang.Object levelText_ = ""; /** - * string levelText = 16; + * string levelText = 17; * @return The levelText. */ @java.lang.Override @@ -5116,7 +5133,7 @@ } } /** - * string levelText = 16; + * string levelText = 17; * @return The bytes for levelText. */ @java.lang.Override @@ -5134,11 +5151,11 @@ } } - public static final int WANTLEVELID_FIELD_NUMBER = 17; + public static final int WANTLEVELID_FIELD_NUMBER = 18; @SuppressWarnings("serial") private volatile java.lang.Object wantLevelID_ = ""; /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The wantLevelID. */ @java.lang.Override @@ -5155,7 +5172,7 @@ } } /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The bytes for wantLevelID. */ @java.lang.Override @@ -5173,10 +5190,10 @@ } } - public static final int AUTOMODE_FIELD_NUMBER = 18; + public static final int AUTOMODE_FIELD_NUMBER = 19; private int autoMode_ = 0; /** - * int32 autoMode = 18; + * int32 autoMode = 19; * @return The autoMode. */ @java.lang.Override @@ -5184,10 +5201,10 @@ return autoMode_; } - public static final int NOTESALTMODE_FIELD_NUMBER = 19; + public static final int NOTESALTMODE_FIELD_NUMBER = 20; private int noteSaltMode_ = 0; /** - * int32 noteSaltMode = 19; + * int32 noteSaltMode = 20; * @return The noteSaltMode. */ @java.lang.Override @@ -5195,10 +5212,10 @@ return noteSaltMode_; } - public static final int AUDIOMULTIPLIER_FIELD_NUMBER = 20; + public static final int AUDIOMULTIPLIER_FIELD_NUMBER = 21; private double audioMultiplier_ = 0D; /** - * double audioMultiplier = 20; + * double audioMultiplier = 21; * @return The audioMultiplier. */ @java.lang.Override @@ -5206,10 +5223,10 @@ return audioMultiplier_; } - public static final int FAINTNOTEMODE_FIELD_NUMBER = 21; + public static final int FAINTNOTEMODE_FIELD_NUMBER = 22; private int faintNoteMode_ = 0; /** - * int32 faintNoteMode = 21; + * int32 faintNoteMode = 22; * @return The faintNoteMode. */ @java.lang.Override @@ -5217,10 +5234,10 @@ return faintNoteMode_; } - public static final int JUDGMENTMODE_FIELD_NUMBER = 22; + public static final int JUDGMENTMODE_FIELD_NUMBER = 23; private int judgmentMode_ = 0; /** - * int32 judgmentMode = 22; + * int32 judgmentMode = 23; * @return The judgmentMode. */ @java.lang.Override @@ -5228,10 +5245,10 @@ return judgmentMode_; } - public static final int HITPOINTSMODE_FIELD_NUMBER = 23; + public static final int HITPOINTSMODE_FIELD_NUMBER = 24; private int hitPointsMode_ = 0; /** - * int32 hitPointsMode = 23; + * int32 hitPointsMode = 24; * @return The hitPointsMode. */ @java.lang.Override @@ -5239,10 +5256,10 @@ return hitPointsMode_; } - public static final int NOTEMOBILITYMODE_FIELD_NUMBER = 24; + public static final int NOTEMOBILITYMODE_FIELD_NUMBER = 25; private int noteMobilityMode_ = 0; /** - * int32 noteMobilityMode = 24; + * int32 noteMobilityMode = 25; * @return The noteMobilityMode. */ @java.lang.Override @@ -5250,10 +5267,10 @@ return noteMobilityMode_; } - public static final int LONGNOTEMODE_FIELD_NUMBER = 25; + public static final int LONGNOTEMODE_FIELD_NUMBER = 26; private int longNoteMode_ = 0; /** - * int32 longNoteMode = 25; + * int32 longNoteMode = 26; * @return The longNoteMode. */ @java.lang.Override @@ -5261,10 +5278,10 @@ return longNoteMode_; } - public static final int INPUTFAVORMODE_FIELD_NUMBER = 26; + public static final int INPUTFAVORMODE_FIELD_NUMBER = 27; private int inputFavorMode_ = 0; /** - * int32 inputFavorMode = 26; + * int32 inputFavorMode = 27; * @return The inputFavorMode. */ @java.lang.Override @@ -5272,10 +5289,10 @@ return inputFavorMode_; } - public static final int NOTEMODIFYMODE_FIELD_NUMBER = 27; + public static final int NOTEMODIFYMODE_FIELD_NUMBER = 28; private int noteModifyMode_ = 0; /** - * int32 noteModifyMode = 27; + * int32 noteModifyMode = 28; * @return The noteModifyMode. */ @java.lang.Override @@ -5283,10 +5300,10 @@ return noteModifyMode_; } - public static final int BPMMODE_FIELD_NUMBER = 28; + public static final int BPMMODE_FIELD_NUMBER = 29; private int bpmMode_ = 0; /** - * int32 bpmMode = 28; + * int32 bpmMode = 29; * @return The bpmMode. */ @java.lang.Override @@ -5294,10 +5311,10 @@ return bpmMode_; } - public static final int WAVEMODE_FIELD_NUMBER = 29; + public static final int WAVEMODE_FIELD_NUMBER = 30; private int waveMode_ = 0; /** - * int32 waveMode = 29; + * int32 waveMode = 30; * @return The waveMode. */ @java.lang.Override @@ -5305,10 +5322,10 @@ return waveMode_; } - public static final int SETNOTEMODE_FIELD_NUMBER = 30; + public static final int SETNOTEMODE_FIELD_NUMBER = 31; private int setNoteMode_ = 0; /** - * int32 setNoteMode = 30; + * int32 setNoteMode = 31; * @return The setNoteMode. */ @java.lang.Override @@ -5316,10 +5333,10 @@ return setNoteMode_; } - public static final int LOWESTJUDGMENTCONDITIONMODE_FIELD_NUMBER = 31; + public static final int LOWESTJUDGMENTCONDITIONMODE_FIELD_NUMBER = 32; private int lowestJudgmentConditionMode_ = 0; /** - * int32 lowestJudgmentConditionMode = 31; + * int32 lowestJudgmentConditionMode = 32; * @return The lowestJudgmentConditionMode. */ @java.lang.Override @@ -5327,10 +5344,10 @@ return lowestJudgmentConditionMode_; } - public static final int TOTALNOTES_FIELD_NUMBER = 32; + public static final int TOTALNOTES_FIELD_NUMBER = 33; private int totalNotes_ = 0; /** - * int32 totalNotes = 32; + * int32 totalNotes = 33; * @return The totalNotes. */ @java.lang.Override @@ -5338,10 +5355,10 @@ return totalNotes_; } - public static final int JUDGMENTSTAGE_FIELD_NUMBER = 33; + public static final int JUDGMENTSTAGE_FIELD_NUMBER = 34; private double judgmentStage_ = 0D; /** - * double judgmentStage = 33; + * double judgmentStage = 34; * @return The judgmentStage. */ @java.lang.Override @@ -5349,10 +5366,10 @@ return judgmentStage_; } - public static final int HITPOINTSVALUE_FIELD_NUMBER = 34; + public static final int HITPOINTSVALUE_FIELD_NUMBER = 35; private double hitPointsValue_ = 0D; /** - * double hitPointsValue = 34; + * double hitPointsValue = 35; * @return The hitPointsValue. */ @java.lang.Override @@ -5360,10 +5377,10 @@ return hitPointsValue_; } - public static final int HIGHESTINPUTCOUNT_FIELD_NUMBER = 35; + public static final int HIGHESTINPUTCOUNT_FIELD_NUMBER = 36; private int highestInputCount_ = 0; /** - * int32 highestInputCount = 35; + * int32 highestInputCount = 36; * @return The highestInputCount. */ @java.lang.Override @@ -5371,10 +5388,10 @@ return highestInputCount_; } - public static final int LENGTH_FIELD_NUMBER = 36; + public static final int LENGTH_FIELD_NUMBER = 37; private double length_ = 0D; /** - * double length = 36; + * double length = 37; * @return The length. */ @java.lang.Override @@ -5382,10 +5399,10 @@ return length_; } - public static final int BPM_FIELD_NUMBER = 37; + public static final int BPM_FIELD_NUMBER = 38; private double bpm_ = 0D; /** - * double bpm = 37; + * double bpm = 38; * @return The bpm. */ @java.lang.Override @@ -5393,10 +5410,10 @@ return bpm_; } - public static final int MULTIPLIER_FIELD_NUMBER = 38; + public static final int MULTIPLIER_FIELD_NUMBER = 39; private double multiplier_ = 0D; /** - * double multiplier = 38; + * double multiplier = 39; * @return The multiplier. */ @java.lang.Override @@ -5404,10 +5421,10 @@ return multiplier_; } - public static final int INPUTMODE_FIELD_NUMBER = 39; + public static final int INPUTMODE_FIELD_NUMBER = 40; private int inputMode_ = 0; /** - * int32 inputMode = 39; + * int32 inputMode = 40; * @return The inputMode. */ @java.lang.Override @@ -5415,10 +5432,10 @@ return inputMode_; } - public static final int HIGHESTJUDGMENT0_FIELD_NUMBER = 40; + public static final int HIGHESTJUDGMENT0_FIELD_NUMBER = 41; private double highestJudgment0_ = 0D; /** - * double highestJudgment0 = 40; + * double highestJudgment0 = 41; * @return The highestJudgment0. */ @java.lang.Override @@ -5426,10 +5443,10 @@ return highestJudgment0_; } - public static final int HIGHERJUDGMENT0_FIELD_NUMBER = 41; + public static final int HIGHERJUDGMENT0_FIELD_NUMBER = 42; private double higherJudgment0_ = 0D; /** - * double higherJudgment0 = 41; + * double higherJudgment0 = 42; * @return The higherJudgment0. */ @java.lang.Override @@ -5437,10 +5454,10 @@ return higherJudgment0_; } - public static final int HIGHJUDGMENT0_FIELD_NUMBER = 42; + public static final int HIGHJUDGMENT0_FIELD_NUMBER = 43; private double highJudgment0_ = 0D; /** - * double highJudgment0 = 42; + * double highJudgment0 = 43; * @return The highJudgment0. */ @java.lang.Override @@ -5448,10 +5465,10 @@ return highJudgment0_; } - public static final int LOWJUDGMENT0_FIELD_NUMBER = 43; + public static final int LOWJUDGMENT0_FIELD_NUMBER = 44; private double lowJudgment0_ = 0D; /** - * double lowJudgment0 = 43; + * double lowJudgment0 = 44; * @return The lowJudgment0. */ @java.lang.Override @@ -5459,10 +5476,10 @@ return lowJudgment0_; } - public static final int LOWERJUDGMENT0_FIELD_NUMBER = 44; + public static final int LOWERJUDGMENT0_FIELD_NUMBER = 45; private double lowerJudgment0_ = 0D; /** - * double lowerJudgment0 = 44; + * double lowerJudgment0 = 45; * @return The lowerJudgment0. */ @java.lang.Override @@ -5470,10 +5487,10 @@ return lowerJudgment0_; } - public static final int LOWESTJUDGMENT0_FIELD_NUMBER = 45; + public static final int LOWESTJUDGMENT0_FIELD_NUMBER = 46; private double lowestJudgment0_ = 0D; /** - * double lowestJudgment0 = 45; + * double lowestJudgment0 = 46; * @return The lowestJudgment0. */ @java.lang.Override @@ -5481,10 +5498,10 @@ return lowestJudgment0_; } - public static final int HIGHESTJUDGMENT1_FIELD_NUMBER = 46; + public static final int HIGHESTJUDGMENT1_FIELD_NUMBER = 47; private double highestJudgment1_ = 0D; /** - * double highestJudgment1 = 46; + * double highestJudgment1 = 47; * @return The highestJudgment1. */ @java.lang.Override @@ -5492,10 +5509,10 @@ return highestJudgment1_; } - public static final int HIGHERJUDGMENT1_FIELD_NUMBER = 47; + public static final int HIGHERJUDGMENT1_FIELD_NUMBER = 48; private double higherJudgment1_ = 0D; /** - * double higherJudgment1 = 47; + * double higherJudgment1 = 48; * @return The higherJudgment1. */ @java.lang.Override @@ -5503,10 +5520,10 @@ return higherJudgment1_; } - public static final int HIGHJUDGMENT1_FIELD_NUMBER = 48; + public static final int HIGHJUDGMENT1_FIELD_NUMBER = 49; private double highJudgment1_ = 0D; /** - * double highJudgment1 = 48; + * double highJudgment1 = 49; * @return The highJudgment1. */ @java.lang.Override @@ -5514,10 +5531,10 @@ return highJudgment1_; } - public static final int LOWJUDGMENT1_FIELD_NUMBER = 49; + public static final int LOWJUDGMENT1_FIELD_NUMBER = 50; private double lowJudgment1_ = 0D; /** - * double lowJudgment1 = 49; + * double lowJudgment1 = 50; * @return The lowJudgment1. */ @java.lang.Override @@ -5525,10 +5542,10 @@ return lowJudgment1_; } - public static final int LOWERJUDGMENT1_FIELD_NUMBER = 50; + public static final int LOWERJUDGMENT1_FIELD_NUMBER = 51; private double lowerJudgment1_ = 0D; /** - * double lowerJudgment1 = 50; + * double lowerJudgment1 = 51; * @return The lowerJudgment1. */ @java.lang.Override @@ -5536,10 +5553,10 @@ return lowerJudgment1_; } - public static final int LOWESTJUDGMENT1_FIELD_NUMBER = 51; + public static final int LOWESTJUDGMENT1_FIELD_NUMBER = 52; private double lowestJudgment1_ = 0D; /** - * double lowestJudgment1 = 51; + * double lowestJudgment1 = 52; * @return The lowestJudgment1. */ @java.lang.Override @@ -5547,10 +5564,10 @@ return lowestJudgment1_; } - public static final int HIGHESTJUDGMENT_FIELD_NUMBER = 52; + public static final int HIGHESTJUDGMENT_FIELD_NUMBER = 53; private int highestJudgment_ = 0; /** - * int32 highestJudgment = 52; + * int32 highestJudgment = 53; * @return The highestJudgment. */ @java.lang.Override @@ -5558,10 +5575,10 @@ return highestJudgment_; } - public static final int HIGHERJUDGMENT_FIELD_NUMBER = 53; + public static final int HIGHERJUDGMENT_FIELD_NUMBER = 54; private int higherJudgment_ = 0; /** - * int32 higherJudgment = 53; + * int32 higherJudgment = 54; * @return The higherJudgment. */ @java.lang.Override @@ -5569,10 +5586,10 @@ return higherJudgment_; } - public static final int HIGHJUDGMENT_FIELD_NUMBER = 54; + public static final int HIGHJUDGMENT_FIELD_NUMBER = 55; private int highJudgment_ = 0; /** - * int32 highJudgment = 54; + * int32 highJudgment = 55; * @return The highJudgment. */ @java.lang.Override @@ -5580,10 +5597,10 @@ return highJudgment_; } - public static final int LOWJUDGMENT_FIELD_NUMBER = 55; + public static final int LOWJUDGMENT_FIELD_NUMBER = 56; private int lowJudgment_ = 0; /** - * int32 lowJudgment = 55; + * int32 lowJudgment = 56; * @return The lowJudgment. */ @java.lang.Override @@ -5591,10 +5608,10 @@ return lowJudgment_; } - public static final int LOWERJUDGMENT_FIELD_NUMBER = 56; + public static final int LOWERJUDGMENT_FIELD_NUMBER = 57; private int lowerJudgment_ = 0; /** - * int32 lowerJudgment = 56; + * int32 lowerJudgment = 57; * @return The lowerJudgment. */ @java.lang.Override @@ -5602,10 +5619,10 @@ return lowerJudgment_; } - public static final int LOWESTJUDGMENT_FIELD_NUMBER = 57; + public static final int LOWESTJUDGMENT_FIELD_NUMBER = 58; private int lowestJudgment_ = 0; /** - * int32 lowestJudgment = 57; + * int32 lowestJudgment = 58; * @return The lowestJudgment. */ @java.lang.Override @@ -5639,164 +5656,167 @@ if (stand_ != 0) { output.writeInt32(4, stand_); } + if (band_ != 0) { + output.writeInt32(5, band_); + } if (highestBand_ != 0) { - output.writeInt32(5, highestBand_); + output.writeInt32(6, highestBand_); } if (java.lang.Double.doubleToRawLongBits(point_) != 0) { - output.writeDouble(6, point_); + output.writeDouble(7, point_); } if (java.lang.Double.doubleToRawLongBits(hitPoints_) != 0) { - output.writeDouble(7, hitPoints_); + output.writeDouble(8, hitPoints_); } if (isFailed_ != false) { - output.writeBool(8, isFailed_); + output.writeBool(9, isFailed_); } if (lastJudged_ != 0) { - output.writeInt32(9, lastJudged_); + output.writeInt32(10, lastJudged_); } for (int i = 0; i < drawings_.size(); i++) { - output.writeMessage(10, drawings_.get(i)); + output.writeMessage(11, drawings_.get(i)); } if (((bitField0_ & 0x00000001) != 0)) { - output.writeMessage(11, getDrawingComponent()); + output.writeMessage(12, getDrawingComponent()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 12, title_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 13, title_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(artist_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 13, artist_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 14, artist_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(genre_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 14, genre_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 15, genre_); } if (level_ != 0) { - output.writeInt32(15, level_); + output.writeInt32(16, level_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(levelText_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 16, levelText_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 17, levelText_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(wantLevelID_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 17, wantLevelID_); + com.google.protobuf.GeneratedMessageV3.writeString(output, 18, wantLevelID_); } if (autoMode_ != 0) { - output.writeInt32(18, autoMode_); + output.writeInt32(19, autoMode_); } if (noteSaltMode_ != 0) { - output.writeInt32(19, noteSaltMode_); + output.writeInt32(20, noteSaltMode_); } if (java.lang.Double.doubleToRawLongBits(audioMultiplier_) != 0) { - output.writeDouble(20, audioMultiplier_); + output.writeDouble(21, audioMultiplier_); } if (faintNoteMode_ != 0) { - output.writeInt32(21, faintNoteMode_); + output.writeInt32(22, faintNoteMode_); } if (judgmentMode_ != 0) { - output.writeInt32(22, judgmentMode_); + output.writeInt32(23, judgmentMode_); } if (hitPointsMode_ != 0) { - output.writeInt32(23, hitPointsMode_); + output.writeInt32(24, hitPointsMode_); } if (noteMobilityMode_ != 0) { - output.writeInt32(24, noteMobilityMode_); + output.writeInt32(25, noteMobilityMode_); } if (longNoteMode_ != 0) { - output.writeInt32(25, longNoteMode_); + output.writeInt32(26, longNoteMode_); } if (inputFavorMode_ != 0) { - output.writeInt32(26, inputFavorMode_); + output.writeInt32(27, inputFavorMode_); } if (noteModifyMode_ != 0) { - output.writeInt32(27, noteModifyMode_); + output.writeInt32(28, noteModifyMode_); } if (bpmMode_ != 0) { - output.writeInt32(28, bpmMode_); + output.writeInt32(29, bpmMode_); } if (waveMode_ != 0) { - output.writeInt32(29, waveMode_); + output.writeInt32(30, waveMode_); } if (setNoteMode_ != 0) { - output.writeInt32(30, setNoteMode_); + output.writeInt32(31, setNoteMode_); } if (lowestJudgmentConditionMode_ != 0) { - output.writeInt32(31, lowestJudgmentConditionMode_); + output.writeInt32(32, lowestJudgmentConditionMode_); } if (totalNotes_ != 0) { - output.writeInt32(32, totalNotes_); + output.writeInt32(33, totalNotes_); } if (java.lang.Double.doubleToRawLongBits(judgmentStage_) != 0) { - output.writeDouble(33, judgmentStage_); + output.writeDouble(34, judgmentStage_); } if (java.lang.Double.doubleToRawLongBits(hitPointsValue_) != 0) { - output.writeDouble(34, hitPointsValue_); + output.writeDouble(35, hitPointsValue_); } if (highestInputCount_ != 0) { - output.writeInt32(35, highestInputCount_); + output.writeInt32(36, highestInputCount_); } if (java.lang.Double.doubleToRawLongBits(length_) != 0) { - output.writeDouble(36, length_); + output.writeDouble(37, length_); } if (java.lang.Double.doubleToRawLongBits(bpm_) != 0) { - output.writeDouble(37, bpm_); + output.writeDouble(38, bpm_); } if (java.lang.Double.doubleToRawLongBits(multiplier_) != 0) { - output.writeDouble(38, multiplier_); + output.writeDouble(39, multiplier_); } if (inputMode_ != 0) { - output.writeInt32(39, inputMode_); + output.writeInt32(40, inputMode_); } if (java.lang.Double.doubleToRawLongBits(highestJudgment0_) != 0) { - output.writeDouble(40, highestJudgment0_); + output.writeDouble(41, highestJudgment0_); } if (java.lang.Double.doubleToRawLongBits(higherJudgment0_) != 0) { - output.writeDouble(41, higherJudgment0_); + output.writeDouble(42, higherJudgment0_); } if (java.lang.Double.doubleToRawLongBits(highJudgment0_) != 0) { - output.writeDouble(42, highJudgment0_); + output.writeDouble(43, highJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowJudgment0_) != 0) { - output.writeDouble(43, lowJudgment0_); + output.writeDouble(44, lowJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowerJudgment0_) != 0) { - output.writeDouble(44, lowerJudgment0_); + output.writeDouble(45, lowerJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowestJudgment0_) != 0) { - output.writeDouble(45, lowestJudgment0_); + output.writeDouble(46, lowestJudgment0_); } if (java.lang.Double.doubleToRawLongBits(highestJudgment1_) != 0) { - output.writeDouble(46, highestJudgment1_); + output.writeDouble(47, highestJudgment1_); } if (java.lang.Double.doubleToRawLongBits(higherJudgment1_) != 0) { - output.writeDouble(47, higherJudgment1_); + output.writeDouble(48, higherJudgment1_); } if (java.lang.Double.doubleToRawLongBits(highJudgment1_) != 0) { - output.writeDouble(48, highJudgment1_); + output.writeDouble(49, highJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowJudgment1_) != 0) { - output.writeDouble(49, lowJudgment1_); + output.writeDouble(50, lowJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowerJudgment1_) != 0) { - output.writeDouble(50, lowerJudgment1_); + output.writeDouble(51, lowerJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowestJudgment1_) != 0) { - output.writeDouble(51, lowestJudgment1_); + output.writeDouble(52, lowestJudgment1_); } if (highestJudgment_ != 0) { - output.writeInt32(52, highestJudgment_); + output.writeInt32(53, highestJudgment_); } if (higherJudgment_ != 0) { - output.writeInt32(53, higherJudgment_); + output.writeInt32(54, higherJudgment_); } if (highJudgment_ != 0) { - output.writeInt32(54, highJudgment_); + output.writeInt32(55, highJudgment_); } if (lowJudgment_ != 0) { - output.writeInt32(55, lowJudgment_); + output.writeInt32(56, lowJudgment_); } if (lowerJudgment_ != 0) { - output.writeInt32(56, lowerJudgment_); + output.writeInt32(57, lowerJudgment_); } if (lowestJudgment_ != 0) { - output.writeInt32(57, lowestJudgment_); + output.writeInt32(58, lowestJudgment_); } getUnknownFields().writeTo(output); } @@ -5821,212 +5841,216 @@ size += com.google.protobuf.CodedOutputStream .computeInt32Size(4, stand_); } + if (band_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, band_); + } if (highestBand_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, highestBand_); + .computeInt32Size(6, highestBand_); } if (java.lang.Double.doubleToRawLongBits(point_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(6, point_); + .computeDoubleSize(7, point_); } if (java.lang.Double.doubleToRawLongBits(hitPoints_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(7, hitPoints_); + .computeDoubleSize(8, hitPoints_); } if (isFailed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(8, isFailed_); + .computeBoolSize(9, isFailed_); } if (lastJudged_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, lastJudged_); + .computeInt32Size(10, lastJudged_); } for (int i = 0; i < drawings_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(10, drawings_.get(i)); + .computeMessageSize(11, drawings_.get(i)); } if (((bitField0_ & 0x00000001) != 0)) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, getDrawingComponent()); + .computeMessageSize(12, getDrawingComponent()); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(title_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(12, title_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, title_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(artist_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, artist_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, artist_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(genre_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, genre_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(15, genre_); } if (level_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(15, level_); + .computeInt32Size(16, level_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(levelText_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(16, levelText_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, levelText_); } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(wantLevelID_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(17, wantLevelID_); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(18, wantLevelID_); } if (autoMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(18, autoMode_); + .computeInt32Size(19, autoMode_); } if (noteSaltMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(19, noteSaltMode_); + .computeInt32Size(20, noteSaltMode_); } if (java.lang.Double.doubleToRawLongBits(audioMultiplier_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(20, audioMultiplier_); + .computeDoubleSize(21, audioMultiplier_); } if (faintNoteMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(21, faintNoteMode_); + .computeInt32Size(22, faintNoteMode_); } if (judgmentMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(22, judgmentMode_); + .computeInt32Size(23, judgmentMode_); } if (hitPointsMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(23, hitPointsMode_); + .computeInt32Size(24, hitPointsMode_); } if (noteMobilityMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(24, noteMobilityMode_); + .computeInt32Size(25, noteMobilityMode_); } if (longNoteMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(25, longNoteMode_); + .computeInt32Size(26, longNoteMode_); } if (inputFavorMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(26, inputFavorMode_); + .computeInt32Size(27, inputFavorMode_); } if (noteModifyMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(27, noteModifyMode_); + .computeInt32Size(28, noteModifyMode_); } if (bpmMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(28, bpmMode_); + .computeInt32Size(29, bpmMode_); } if (waveMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(29, waveMode_); + .computeInt32Size(30, waveMode_); } if (setNoteMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(30, setNoteMode_); + .computeInt32Size(31, setNoteMode_); } if (lowestJudgmentConditionMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(31, lowestJudgmentConditionMode_); + .computeInt32Size(32, lowestJudgmentConditionMode_); } if (totalNotes_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(32, totalNotes_); + .computeInt32Size(33, totalNotes_); } if (java.lang.Double.doubleToRawLongBits(judgmentStage_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(33, judgmentStage_); + .computeDoubleSize(34, judgmentStage_); } if (java.lang.Double.doubleToRawLongBits(hitPointsValue_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(34, hitPointsValue_); + .computeDoubleSize(35, hitPointsValue_); } if (highestInputCount_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(35, highestInputCount_); + .computeInt32Size(36, highestInputCount_); } if (java.lang.Double.doubleToRawLongBits(length_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(36, length_); + .computeDoubleSize(37, length_); } if (java.lang.Double.doubleToRawLongBits(bpm_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(37, bpm_); + .computeDoubleSize(38, bpm_); } if (java.lang.Double.doubleToRawLongBits(multiplier_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(38, multiplier_); + .computeDoubleSize(39, multiplier_); } if (inputMode_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(39, inputMode_); + .computeInt32Size(40, inputMode_); } if (java.lang.Double.doubleToRawLongBits(highestJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(40, highestJudgment0_); + .computeDoubleSize(41, highestJudgment0_); } if (java.lang.Double.doubleToRawLongBits(higherJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(41, higherJudgment0_); + .computeDoubleSize(42, higherJudgment0_); } if (java.lang.Double.doubleToRawLongBits(highJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(42, highJudgment0_); + .computeDoubleSize(43, highJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(43, lowJudgment0_); + .computeDoubleSize(44, lowJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowerJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(44, lowerJudgment0_); + .computeDoubleSize(45, lowerJudgment0_); } if (java.lang.Double.doubleToRawLongBits(lowestJudgment0_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(45, lowestJudgment0_); + .computeDoubleSize(46, lowestJudgment0_); } if (java.lang.Double.doubleToRawLongBits(highestJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(46, highestJudgment1_); + .computeDoubleSize(47, highestJudgment1_); } if (java.lang.Double.doubleToRawLongBits(higherJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(47, higherJudgment1_); + .computeDoubleSize(48, higherJudgment1_); } if (java.lang.Double.doubleToRawLongBits(highJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(48, highJudgment1_); + .computeDoubleSize(49, highJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(49, lowJudgment1_); + .computeDoubleSize(50, lowJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowerJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(50, lowerJudgment1_); + .computeDoubleSize(51, lowerJudgment1_); } if (java.lang.Double.doubleToRawLongBits(lowestJudgment1_) != 0) { size += com.google.protobuf.CodedOutputStream - .computeDoubleSize(51, lowestJudgment1_); + .computeDoubleSize(52, lowestJudgment1_); } if (highestJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(52, highestJudgment_); + .computeInt32Size(53, highestJudgment_); } if (higherJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(53, higherJudgment_); + .computeInt32Size(54, higherJudgment_); } if (highJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(54, highJudgment_); + .computeInt32Size(55, highJudgment_); } if (lowJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(55, lowJudgment_); + .computeInt32Size(56, lowJudgment_); } if (lowerJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(56, lowerJudgment_); + .computeInt32Size(57, lowerJudgment_); } if (lowestJudgment_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(57, lowestJudgment_); + .computeInt32Size(58, lowestJudgment_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -6050,6 +6074,8 @@ if (avatarNetStatus_ != other.avatarNetStatus_) return false; if (getStand() != other.getStand()) return false; + if (getBand() + != other.getBand()) return false; if (getHighestBand() != other.getHighestBand()) return false; if (java.lang.Double.doubleToLongBits(getPoint()) @@ -6198,6 +6224,8 @@ hash = (53 * hash) + avatarNetStatus_; hash = (37 * hash) + STAND_FIELD_NUMBER; hash = (53 * hash) + getStand(); + hash = (37 * hash) + BAND_FIELD_NUMBER; + hash = (53 * hash) + getBand(); hash = (37 * hash) + HIGHESTBAND_FIELD_NUMBER; hash = (53 * hash) + getHighestBand(); hash = (37 * hash) + POINT_FIELD_NUMBER; @@ -6472,6 +6500,7 @@ handlerID_ = ""; avatarNetStatus_ = 0; stand_ = 0; + band_ = 0; highestBand_ = 0; point_ = 0D; hitPoints_ = 0D; @@ -6483,7 +6512,7 @@ drawings_ = null; drawingsBuilder_.clear(); } - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); drawingComponent_ = null; if (drawingComponentBuilder_ != null) { drawingComponentBuilder_.dispose(); @@ -6570,9 +6599,9 @@ private void buildPartialRepeatedFields(EventOuterClass.Event.QwilightCallNet result) { if (drawingsBuilder_ == null) { - if (((bitField0_ & 0x00000200) != 0)) { + if (((bitField0_ & 0x00000400) != 0)) { drawings_ = java.util.Collections.unmodifiableList(drawings_); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); } result.drawings_ = drawings_; } else { @@ -6595,89 +6624,89 @@ result.stand_ = stand_; } if (((from_bitField0_ & 0x00000010) != 0)) { - result.highestBand_ = highestBand_; + result.band_ = band_; } if (((from_bitField0_ & 0x00000020) != 0)) { - result.point_ = point_; + result.highestBand_ = highestBand_; } if (((from_bitField0_ & 0x00000040) != 0)) { - result.hitPoints_ = hitPoints_; + result.point_ = point_; } if (((from_bitField0_ & 0x00000080) != 0)) { - result.isFailed_ = isFailed_; + result.hitPoints_ = hitPoints_; } if (((from_bitField0_ & 0x00000100) != 0)) { + result.isFailed_ = isFailed_; + } + if (((from_bitField0_ & 0x00000200) != 0)) { result.lastJudged_ = lastJudged_; } int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000400) != 0)) { + if (((from_bitField0_ & 0x00000800) != 0)) { result.drawingComponent_ = drawingComponentBuilder_ == null ? drawingComponent_ : drawingComponentBuilder_.build(); to_bitField0_ |= 0x00000001; } - if (((from_bitField0_ & 0x00000800) != 0)) { + if (((from_bitField0_ & 0x00001000) != 0)) { result.title_ = title_; } - if (((from_bitField0_ & 0x00001000) != 0)) { + if (((from_bitField0_ & 0x00002000) != 0)) { result.artist_ = artist_; } - if (((from_bitField0_ & 0x00002000) != 0)) { + if (((from_bitField0_ & 0x00004000) != 0)) { result.genre_ = genre_; } - if (((from_bitField0_ & 0x00004000) != 0)) { + if (((from_bitField0_ & 0x00008000) != 0)) { result.level_ = level_; } - if (((from_bitField0_ & 0x00008000) != 0)) { + if (((from_bitField0_ & 0x00010000) != 0)) { result.levelText_ = levelText_; } - if (((from_bitField0_ & 0x00010000) != 0)) { + if (((from_bitField0_ & 0x00020000) != 0)) { result.wantLevelID_ = wantLevelID_; } - if (((from_bitField0_ & 0x00020000) != 0)) { + if (((from_bitField0_ & 0x00040000) != 0)) { result.autoMode_ = autoMode_; } - if (((from_bitField0_ & 0x00040000) != 0)) { + if (((from_bitField0_ & 0x00080000) != 0)) { result.noteSaltMode_ = noteSaltMode_; } - if (((from_bitField0_ & 0x00080000) != 0)) { + if (((from_bitField0_ & 0x00100000) != 0)) { result.audioMultiplier_ = audioMultiplier_; } - if (((from_bitField0_ & 0x00100000) != 0)) { + if (((from_bitField0_ & 0x00200000) != 0)) { result.faintNoteMode_ = faintNoteMode_; } - if (((from_bitField0_ & 0x00200000) != 0)) { + if (((from_bitField0_ & 0x00400000) != 0)) { result.judgmentMode_ = judgmentMode_; } - if (((from_bitField0_ & 0x00400000) != 0)) { + if (((from_bitField0_ & 0x00800000) != 0)) { result.hitPointsMode_ = hitPointsMode_; } - if (((from_bitField0_ & 0x00800000) != 0)) { + if (((from_bitField0_ & 0x01000000) != 0)) { result.noteMobilityMode_ = noteMobilityMode_; } - if (((from_bitField0_ & 0x01000000) != 0)) { + if (((from_bitField0_ & 0x02000000) != 0)) { result.longNoteMode_ = longNoteMode_; } - if (((from_bitField0_ & 0x02000000) != 0)) { + if (((from_bitField0_ & 0x04000000) != 0)) { result.inputFavorMode_ = inputFavorMode_; } - if (((from_bitField0_ & 0x04000000) != 0)) { + if (((from_bitField0_ & 0x08000000) != 0)) { result.noteModifyMode_ = noteModifyMode_; } - if (((from_bitField0_ & 0x08000000) != 0)) { + if (((from_bitField0_ & 0x10000000) != 0)) { result.bpmMode_ = bpmMode_; } - if (((from_bitField0_ & 0x10000000) != 0)) { + if (((from_bitField0_ & 0x20000000) != 0)) { result.waveMode_ = waveMode_; } - if (((from_bitField0_ & 0x20000000) != 0)) { + if (((from_bitField0_ & 0x40000000) != 0)) { result.setNoteMode_ = setNoteMode_; } - if (((from_bitField0_ & 0x40000000) != 0)) { - result.lowestJudgmentConditionMode_ = lowestJudgmentConditionMode_; - } if (((from_bitField0_ & 0x80000000) != 0)) { - result.totalNotes_ = totalNotes_; + result.lowestJudgmentConditionMode_ = lowestJudgmentConditionMode_; } result.bitField0_ |= to_bitField0_; } @@ -6685,78 +6714,81 @@ private void buildPartial1(EventOuterClass.Event.QwilightCallNet result) { int from_bitField1_ = bitField1_; if (((from_bitField1_ & 0x00000001) != 0)) { - result.judgmentStage_ = judgmentStage_; + result.totalNotes_ = totalNotes_; } if (((from_bitField1_ & 0x00000002) != 0)) { - result.hitPointsValue_ = hitPointsValue_; + result.judgmentStage_ = judgmentStage_; } if (((from_bitField1_ & 0x00000004) != 0)) { - result.highestInputCount_ = highestInputCount_; + result.hitPointsValue_ = hitPointsValue_; } if (((from_bitField1_ & 0x00000008) != 0)) { - result.length_ = length_; + result.highestInputCount_ = highestInputCount_; } if (((from_bitField1_ & 0x00000010) != 0)) { - result.bpm_ = bpm_; + result.length_ = length_; } if (((from_bitField1_ & 0x00000020) != 0)) { - result.multiplier_ = multiplier_; + result.bpm_ = bpm_; } if (((from_bitField1_ & 0x00000040) != 0)) { - result.inputMode_ = inputMode_; + result.multiplier_ = multiplier_; } if (((from_bitField1_ & 0x00000080) != 0)) { - result.highestJudgment0_ = highestJudgment0_; + result.inputMode_ = inputMode_; } if (((from_bitField1_ & 0x00000100) != 0)) { - result.higherJudgment0_ = higherJudgment0_; + result.highestJudgment0_ = highestJudgment0_; } if (((from_bitField1_ & 0x00000200) != 0)) { - result.highJudgment0_ = highJudgment0_; + result.higherJudgment0_ = higherJudgment0_; } if (((from_bitField1_ & 0x00000400) != 0)) { - result.lowJudgment0_ = lowJudgment0_; + result.highJudgment0_ = highJudgment0_; } if (((from_bitField1_ & 0x00000800) != 0)) { - result.lowerJudgment0_ = lowerJudgment0_; + result.lowJudgment0_ = lowJudgment0_; } if (((from_bitField1_ & 0x00001000) != 0)) { - result.lowestJudgment0_ = lowestJudgment0_; + result.lowerJudgment0_ = lowerJudgment0_; } if (((from_bitField1_ & 0x00002000) != 0)) { - result.highestJudgment1_ = highestJudgment1_; + result.lowestJudgment0_ = lowestJudgment0_; } if (((from_bitField1_ & 0x00004000) != 0)) { - result.higherJudgment1_ = higherJudgment1_; + result.highestJudgment1_ = highestJudgment1_; } if (((from_bitField1_ & 0x00008000) != 0)) { - result.highJudgment1_ = highJudgment1_; + result.higherJudgment1_ = higherJudgment1_; } if (((from_bitField1_ & 0x00010000) != 0)) { - result.lowJudgment1_ = lowJudgment1_; + result.highJudgment1_ = highJudgment1_; } if (((from_bitField1_ & 0x00020000) != 0)) { - result.lowerJudgment1_ = lowerJudgment1_; + result.lowJudgment1_ = lowJudgment1_; } if (((from_bitField1_ & 0x00040000) != 0)) { - result.lowestJudgment1_ = lowestJudgment1_; + result.lowerJudgment1_ = lowerJudgment1_; } if (((from_bitField1_ & 0x00080000) != 0)) { - result.highestJudgment_ = highestJudgment_; + result.lowestJudgment1_ = lowestJudgment1_; } if (((from_bitField1_ & 0x00100000) != 0)) { - result.higherJudgment_ = higherJudgment_; + result.highestJudgment_ = highestJudgment_; } if (((from_bitField1_ & 0x00200000) != 0)) { - result.highJudgment_ = highJudgment_; + result.higherJudgment_ = higherJudgment_; } if (((from_bitField1_ & 0x00400000) != 0)) { - result.lowJudgment_ = lowJudgment_; + result.highJudgment_ = highJudgment_; } if (((from_bitField1_ & 0x00800000) != 0)) { - result.lowerJudgment_ = lowerJudgment_; + result.lowJudgment_ = lowJudgment_; } if (((from_bitField1_ & 0x01000000) != 0)) { + result.lowerJudgment_ = lowerJudgment_; + } + if (((from_bitField1_ & 0x02000000) != 0)) { result.lowestJudgment_ = lowestJudgment_; } } @@ -6821,6 +6853,9 @@ if (other.getStand() != 0) { setStand(other.getStand()); } + if (other.getBand() != 0) { + setBand(other.getBand()); + } if (other.getHighestBand() != 0) { setHighestBand(other.getHighestBand()); } @@ -6840,7 +6875,7 @@ if (!other.drawings_.isEmpty()) { if (drawings_.isEmpty()) { drawings_ = other.drawings_; - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); } else { ensureDrawingsIsMutable(); drawings_.addAll(other.drawings_); @@ -6853,7 +6888,7 @@ drawingsBuilder_.dispose(); drawingsBuilder_ = null; drawings_ = other.drawings_; - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); drawingsBuilder_ = com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ? getDrawingsFieldBuilder() : null; @@ -6867,17 +6902,17 @@ } if (!other.getTitle().isEmpty()) { title_ = other.title_; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); } if (!other.getArtist().isEmpty()) { artist_ = other.artist_; - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); } if (!other.getGenre().isEmpty()) { genre_ = other.genre_; - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); } if (other.getLevel() != 0) { @@ -6885,12 +6920,12 @@ } if (!other.getLevelText().isEmpty()) { levelText_ = other.levelText_; - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); } if (!other.getWantLevelID().isEmpty()) { wantLevelID_ = other.wantLevelID_; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; onChanged(); } if (other.getAutoMode() != 0) { @@ -7060,31 +7095,36 @@ break; } // case 32 case 40: { - highestBand_ = input.readInt32(); + band_ = input.readInt32(); bitField0_ |= 0x00000010; break; } // case 40 - case 49: { - point_ = input.readDouble(); + case 48: { + highestBand_ = input.readInt32(); bitField0_ |= 0x00000020; break; - } // case 49 + } // case 48 case 57: { - hitPoints_ = input.readDouble(); + point_ = input.readDouble(); bitField0_ |= 0x00000040; break; } // case 57 - case 64: { - isFailed_ = input.readBool(); + case 65: { + hitPoints_ = input.readDouble(); bitField0_ |= 0x00000080; break; - } // case 64 + } // case 65 case 72: { - lastJudged_ = input.readInt32(); + isFailed_ = input.readBool(); bitField0_ |= 0x00000100; break; } // case 72 - case 82: { + case 80: { + lastJudged_ = input.readInt32(); + bitField0_ |= 0x00000200; + break; + } // case 80 + case 90: { EventOuterClass.Event.NetDrawing m = input.readMessage( EventOuterClass.Event.NetDrawing.parser(), @@ -7096,244 +7136,244 @@ drawingsBuilder_.addMessage(m); } break; - } // case 82 - case 90: { + } // case 90 + case 98: { input.readMessage( getDrawingComponentFieldBuilder().getBuilder(), extensionRegistry); - bitField0_ |= 0x00000400; - break; - } // case 90 - case 98: { - title_ = input.readStringRequireUtf8(); bitField0_ |= 0x00000800; break; } // case 98 case 106: { - artist_ = input.readStringRequireUtf8(); + title_ = input.readStringRequireUtf8(); bitField0_ |= 0x00001000; break; } // case 106 case 114: { - genre_ = input.readStringRequireUtf8(); + artist_ = input.readStringRequireUtf8(); bitField0_ |= 0x00002000; break; } // case 114 - case 120: { - level_ = input.readInt32(); + case 122: { + genre_ = input.readStringRequireUtf8(); bitField0_ |= 0x00004000; break; - } // case 120 - case 130: { - levelText_ = input.readStringRequireUtf8(); + } // case 122 + case 128: { + level_ = input.readInt32(); bitField0_ |= 0x00008000; break; - } // case 130 + } // case 128 case 138: { - wantLevelID_ = input.readStringRequireUtf8(); + levelText_ = input.readStringRequireUtf8(); bitField0_ |= 0x00010000; break; } // case 138 - case 144: { - autoMode_ = input.readInt32(); + case 146: { + wantLevelID_ = input.readStringRequireUtf8(); bitField0_ |= 0x00020000; break; - } // case 144 + } // case 146 case 152: { - noteSaltMode_ = input.readInt32(); + autoMode_ = input.readInt32(); bitField0_ |= 0x00040000; break; } // case 152 - case 161: { - audioMultiplier_ = input.readDouble(); + case 160: { + noteSaltMode_ = input.readInt32(); bitField0_ |= 0x00080000; break; - } // case 161 - case 168: { - faintNoteMode_ = input.readInt32(); + } // case 160 + case 169: { + audioMultiplier_ = input.readDouble(); bitField0_ |= 0x00100000; break; - } // case 168 + } // case 169 case 176: { - judgmentMode_ = input.readInt32(); + faintNoteMode_ = input.readInt32(); bitField0_ |= 0x00200000; break; } // case 176 case 184: { - hitPointsMode_ = input.readInt32(); + judgmentMode_ = input.readInt32(); bitField0_ |= 0x00400000; break; } // case 184 case 192: { - noteMobilityMode_ = input.readInt32(); + hitPointsMode_ = input.readInt32(); bitField0_ |= 0x00800000; break; } // case 192 case 200: { - longNoteMode_ = input.readInt32(); + noteMobilityMode_ = input.readInt32(); bitField0_ |= 0x01000000; break; } // case 200 case 208: { - inputFavorMode_ = input.readInt32(); + longNoteMode_ = input.readInt32(); bitField0_ |= 0x02000000; break; } // case 208 case 216: { - noteModifyMode_ = input.readInt32(); + inputFavorMode_ = input.readInt32(); bitField0_ |= 0x04000000; break; } // case 216 case 224: { - bpmMode_ = input.readInt32(); + noteModifyMode_ = input.readInt32(); bitField0_ |= 0x08000000; break; } // case 224 case 232: { - waveMode_ = input.readInt32(); + bpmMode_ = input.readInt32(); bitField0_ |= 0x10000000; break; } // case 232 case 240: { - setNoteMode_ = input.readInt32(); + waveMode_ = input.readInt32(); bitField0_ |= 0x20000000; break; } // case 240 case 248: { - lowestJudgmentConditionMode_ = input.readInt32(); + setNoteMode_ = input.readInt32(); bitField0_ |= 0x40000000; break; } // case 248 case 256: { - totalNotes_ = input.readInt32(); + lowestJudgmentConditionMode_ = input.readInt32(); bitField0_ |= 0x80000000; break; } // case 256 - case 265: { - judgmentStage_ = input.readDouble(); + case 264: { + totalNotes_ = input.readInt32(); bitField1_ |= 0x00000001; break; - } // case 265 + } // case 264 case 273: { - hitPointsValue_ = input.readDouble(); + judgmentStage_ = input.readDouble(); bitField1_ |= 0x00000002; break; } // case 273 - case 280: { - highestInputCount_ = input.readInt32(); + case 281: { + hitPointsValue_ = input.readDouble(); bitField1_ |= 0x00000004; break; - } // case 280 - case 289: { - length_ = input.readDouble(); + } // case 281 + case 288: { + highestInputCount_ = input.readInt32(); bitField1_ |= 0x00000008; break; - } // case 289 + } // case 288 case 297: { - bpm_ = input.readDouble(); + length_ = input.readDouble(); bitField1_ |= 0x00000010; break; } // case 297 case 305: { - multiplier_ = input.readDouble(); + bpm_ = input.readDouble(); bitField1_ |= 0x00000020; break; } // case 305 - case 312: { - inputMode_ = input.readInt32(); + case 313: { + multiplier_ = input.readDouble(); bitField1_ |= 0x00000040; break; - } // case 312 - case 321: { - highestJudgment0_ = input.readDouble(); + } // case 313 + case 320: { + inputMode_ = input.readInt32(); bitField1_ |= 0x00000080; break; - } // case 321 + } // case 320 case 329: { - higherJudgment0_ = input.readDouble(); + highestJudgment0_ = input.readDouble(); bitField1_ |= 0x00000100; break; } // case 329 case 337: { - highJudgment0_ = input.readDouble(); + higherJudgment0_ = input.readDouble(); bitField1_ |= 0x00000200; break; } // case 337 case 345: { - lowJudgment0_ = input.readDouble(); + highJudgment0_ = input.readDouble(); bitField1_ |= 0x00000400; break; } // case 345 case 353: { - lowerJudgment0_ = input.readDouble(); + lowJudgment0_ = input.readDouble(); bitField1_ |= 0x00000800; break; } // case 353 case 361: { - lowestJudgment0_ = input.readDouble(); + lowerJudgment0_ = input.readDouble(); bitField1_ |= 0x00001000; break; } // case 361 case 369: { - highestJudgment1_ = input.readDouble(); + lowestJudgment0_ = input.readDouble(); bitField1_ |= 0x00002000; break; } // case 369 case 377: { - higherJudgment1_ = input.readDouble(); + highestJudgment1_ = input.readDouble(); bitField1_ |= 0x00004000; break; } // case 377 case 385: { - highJudgment1_ = input.readDouble(); + higherJudgment1_ = input.readDouble(); bitField1_ |= 0x00008000; break; } // case 385 case 393: { - lowJudgment1_ = input.readDouble(); + highJudgment1_ = input.readDouble(); bitField1_ |= 0x00010000; break; } // case 393 case 401: { - lowerJudgment1_ = input.readDouble(); + lowJudgment1_ = input.readDouble(); bitField1_ |= 0x00020000; break; } // case 401 case 409: { - lowestJudgment1_ = input.readDouble(); + lowerJudgment1_ = input.readDouble(); bitField1_ |= 0x00040000; break; } // case 409 - case 416: { - highestJudgment_ = input.readInt32(); + case 417: { + lowestJudgment1_ = input.readDouble(); bitField1_ |= 0x00080000; break; - } // case 416 + } // case 417 case 424: { - higherJudgment_ = input.readInt32(); + highestJudgment_ = input.readInt32(); bitField1_ |= 0x00100000; break; } // case 424 case 432: { - highJudgment_ = input.readInt32(); + higherJudgment_ = input.readInt32(); bitField1_ |= 0x00200000; break; } // case 432 case 440: { - lowJudgment_ = input.readInt32(); + highJudgment_ = input.readInt32(); bitField1_ |= 0x00400000; break; } // case 440 case 448: { - lowerJudgment_ = input.readInt32(); + lowJudgment_ = input.readInt32(); bitField1_ |= 0x00800000; break; } // case 448 case 456: { - lowestJudgment_ = input.readInt32(); + lowerJudgment_ = input.readInt32(); bitField1_ |= 0x01000000; break; } // case 456 + case 464: { + lowestJudgment_ = input.readInt32(); + bitField1_ |= 0x02000000; + break; + } // case 464 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -7581,9 +7621,41 @@ return this; } + private int band_ ; + /** + * int32 band = 5; + * @return The band. + */ + @java.lang.Override + public int getBand() { + return band_; + } + /** + * int32 band = 5; + * @param value The band to set. + * @return This builder for chaining. + */ + public Builder setBand(int value) { + + band_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * int32 band = 5; + * @return This builder for chaining. + */ + public Builder clearBand() { + bitField0_ = (bitField0_ & ~0x00000010); + band_ = 0; + onChanged(); + return this; + } + private int highestBand_ ; /** - * int32 highestBand = 5; + * int32 highestBand = 6; * @return The highestBand. */ @java.lang.Override @@ -7591,23 +7663,23 @@ return highestBand_; } /** - * int32 highestBand = 5; + * int32 highestBand = 6; * @param value The highestBand to set. * @return This builder for chaining. */ public Builder setHighestBand(int value) { highestBand_ = value; - bitField0_ |= 0x00000010; + bitField0_ |= 0x00000020; onChanged(); return this; } /** - * int32 highestBand = 5; + * int32 highestBand = 6; * @return This builder for chaining. */ public Builder clearHighestBand() { - bitField0_ = (bitField0_ & ~0x00000010); + bitField0_ = (bitField0_ & ~0x00000020); highestBand_ = 0; onChanged(); return this; @@ -7615,7 +7687,7 @@ private double point_ ; /** - * double point = 6; + * double point = 7; * @return The point. */ @java.lang.Override @@ -7623,23 +7695,23 @@ return point_; } /** - * double point = 6; + * double point = 7; * @param value The point to set. * @return This builder for chaining. */ public Builder setPoint(double value) { point_ = value; - bitField0_ |= 0x00000020; + bitField0_ |= 0x00000040; onChanged(); return this; } /** - * double point = 6; + * double point = 7; * @return This builder for chaining. */ public Builder clearPoint() { - bitField0_ = (bitField0_ & ~0x00000020); + bitField0_ = (bitField0_ & ~0x00000040); point_ = 0D; onChanged(); return this; @@ -7647,7 +7719,7 @@ private double hitPoints_ ; /** - * double hitPoints = 7; + * double hitPoints = 8; * @return The hitPoints. */ @java.lang.Override @@ -7655,23 +7727,23 @@ return hitPoints_; } /** - * double hitPoints = 7; + * double hitPoints = 8; * @param value The hitPoints to set. * @return This builder for chaining. */ public Builder setHitPoints(double value) { hitPoints_ = value; - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000080; onChanged(); return this; } /** - * double hitPoints = 7; + * double hitPoints = 8; * @return This builder for chaining. */ public Builder clearHitPoints() { - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000080); hitPoints_ = 0D; onChanged(); return this; @@ -7679,7 +7751,7 @@ private boolean isFailed_ ; /** - * bool isFailed = 8; + * bool isFailed = 9; * @return The isFailed. */ @java.lang.Override @@ -7687,23 +7759,23 @@ return isFailed_; } /** - * bool isFailed = 8; + * bool isFailed = 9; * @param value The isFailed to set. * @return This builder for chaining. */ public Builder setIsFailed(boolean value) { isFailed_ = value; - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000100; onChanged(); return this; } /** - * bool isFailed = 8; + * bool isFailed = 9; * @return This builder for chaining. */ public Builder clearIsFailed() { - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000100); isFailed_ = false; onChanged(); return this; @@ -7711,7 +7783,7 @@ private int lastJudged_ ; /** - * int32 lastJudged = 9; + * int32 lastJudged = 10; * @return The lastJudged. */ @java.lang.Override @@ -7719,23 +7791,23 @@ return lastJudged_; } /** - * int32 lastJudged = 9; + * int32 lastJudged = 10; * @param value The lastJudged to set. * @return This builder for chaining. */ public Builder setLastJudged(int value) { lastJudged_ = value; - bitField0_ |= 0x00000100; + bitField0_ |= 0x00000200; onChanged(); return this; } /** - * int32 lastJudged = 9; + * int32 lastJudged = 10; * @return This builder for chaining. */ public Builder clearLastJudged() { - bitField0_ = (bitField0_ & ~0x00000100); + bitField0_ = (bitField0_ & ~0x00000200); lastJudged_ = 0; onChanged(); return this; @@ -7744,9 +7816,9 @@ private java.util.List drawings_ = java.util.Collections.emptyList(); private void ensureDrawingsIsMutable() { - if (!((bitField0_ & 0x00000200) != 0)) { + if (!((bitField0_ & 0x00000400) != 0)) { drawings_ = new java.util.ArrayList(drawings_); - bitField0_ |= 0x00000200; + bitField0_ |= 0x00000400; } } @@ -7754,7 +7826,7 @@ EventOuterClass.Event.NetDrawing, EventOuterClass.Event.NetDrawing.Builder, EventOuterClass.Event.NetDrawingOrBuilder> drawingsBuilder_; /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public java.util.List getDrawingsList() { if (drawingsBuilder_ == null) { @@ -7764,7 +7836,7 @@ } } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public int getDrawingsCount() { if (drawingsBuilder_ == null) { @@ -7774,7 +7846,7 @@ } } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public EventOuterClass.Event.NetDrawing getDrawings(int index) { if (drawingsBuilder_ == null) { @@ -7784,7 +7856,7 @@ } } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder setDrawings( int index, EventOuterClass.Event.NetDrawing value) { @@ -7801,7 +7873,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder setDrawings( int index, EventOuterClass.Event.NetDrawing.Builder builderForValue) { @@ -7815,7 +7887,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder addDrawings(EventOuterClass.Event.NetDrawing value) { if (drawingsBuilder_ == null) { @@ -7831,7 +7903,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder addDrawings( int index, EventOuterClass.Event.NetDrawing value) { @@ -7848,7 +7920,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder addDrawings( EventOuterClass.Event.NetDrawing.Builder builderForValue) { @@ -7862,7 +7934,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder addDrawings( int index, EventOuterClass.Event.NetDrawing.Builder builderForValue) { @@ -7876,7 +7948,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder addAllDrawings( java.lang.Iterable values) { @@ -7891,12 +7963,12 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder clearDrawings() { if (drawingsBuilder_ == null) { drawings_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000200); + bitField0_ = (bitField0_ & ~0x00000400); onChanged(); } else { drawingsBuilder_.clear(); @@ -7904,7 +7976,7 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public Builder removeDrawings(int index) { if (drawingsBuilder_ == null) { @@ -7917,14 +7989,14 @@ return this; } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public EventOuterClass.Event.NetDrawing.Builder getDrawingsBuilder( int index) { return getDrawingsFieldBuilder().getBuilder(index); } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public EventOuterClass.Event.NetDrawingOrBuilder getDrawingsOrBuilder( int index) { @@ -7934,7 +8006,7 @@ } } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public java.util.List getDrawingsOrBuilderList() { @@ -7945,14 +8017,14 @@ } } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public EventOuterClass.Event.NetDrawing.Builder addDrawingsBuilder() { return getDrawingsFieldBuilder().addBuilder( EventOuterClass.Event.NetDrawing.getDefaultInstance()); } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public EventOuterClass.Event.NetDrawing.Builder addDrawingsBuilder( int index) { @@ -7960,7 +8032,7 @@ index, EventOuterClass.Event.NetDrawing.getDefaultInstance()); } /** - * repeated .Event.NetDrawing drawings = 10; + * repeated .Event.NetDrawing drawings = 11; */ public java.util.List getDrawingsBuilderList() { @@ -7973,7 +8045,7 @@ drawingsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< EventOuterClass.Event.NetDrawing, EventOuterClass.Event.NetDrawing.Builder, EventOuterClass.Event.NetDrawingOrBuilder>( drawings_, - ((bitField0_ & 0x00000200) != 0), + ((bitField0_ & 0x00000400) != 0), getParentForChildren(), isClean()); drawings_ = null; @@ -7985,14 +8057,14 @@ private com.google.protobuf.SingleFieldBuilderV3< EventOuterClass.Event.DrawingComponent, EventOuterClass.Event.DrawingComponent.Builder, EventOuterClass.Event.DrawingComponentOrBuilder> drawingComponentBuilder_; /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return Whether the drawingComponent field is set. */ public boolean hasDrawingComponent() { - return ((bitField0_ & 0x00000400) != 0); + return ((bitField0_ & 0x00000800) != 0); } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; * @return The drawingComponent. */ public EventOuterClass.Event.DrawingComponent getDrawingComponent() { @@ -8003,7 +8075,7 @@ } } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public Builder setDrawingComponent(EventOuterClass.Event.DrawingComponent value) { if (drawingComponentBuilder_ == null) { @@ -8014,12 +8086,12 @@ } else { drawingComponentBuilder_.setMessage(value); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return this; } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public Builder setDrawingComponent( EventOuterClass.Event.DrawingComponent.Builder builderForValue) { @@ -8028,16 +8100,16 @@ } else { drawingComponentBuilder_.setMessage(builderForValue.build()); } - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return this; } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public Builder mergeDrawingComponent(EventOuterClass.Event.DrawingComponent value) { if (drawingComponentBuilder_ == null) { - if (((bitField0_ & 0x00000400) != 0) && + if (((bitField0_ & 0x00000800) != 0) && drawingComponent_ != null && drawingComponent_ != EventOuterClass.Event.DrawingComponent.getDefaultInstance()) { getDrawingComponentBuilder().mergeFrom(value); @@ -8048,16 +8120,16 @@ drawingComponentBuilder_.mergeFrom(value); } if (drawingComponent_ != null) { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); } return this; } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public Builder clearDrawingComponent() { - bitField0_ = (bitField0_ & ~0x00000400); + bitField0_ = (bitField0_ & ~0x00000800); drawingComponent_ = null; if (drawingComponentBuilder_ != null) { drawingComponentBuilder_.dispose(); @@ -8067,15 +8139,15 @@ return this; } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public EventOuterClass.Event.DrawingComponent.Builder getDrawingComponentBuilder() { - bitField0_ |= 0x00000400; + bitField0_ |= 0x00000800; onChanged(); return getDrawingComponentFieldBuilder().getBuilder(); } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ public EventOuterClass.Event.DrawingComponentOrBuilder getDrawingComponentOrBuilder() { if (drawingComponentBuilder_ != null) { @@ -8086,7 +8158,7 @@ } } /** - * .Event.DrawingComponent drawingComponent = 11; + * .Event.DrawingComponent drawingComponent = 12; */ private com.google.protobuf.SingleFieldBuilderV3< EventOuterClass.Event.DrawingComponent, EventOuterClass.Event.DrawingComponent.Builder, EventOuterClass.Event.DrawingComponentOrBuilder> @@ -8104,7 +8176,7 @@ private java.lang.Object title_ = ""; /** - * string title = 12; + * string title = 13; * @return The title. */ public java.lang.String getTitle() { @@ -8120,7 +8192,7 @@ } } /** - * string title = 12; + * string title = 13; * @return The bytes for title. */ public com.google.protobuf.ByteString @@ -8137,7 +8209,7 @@ } } /** - * string title = 12; + * string title = 13; * @param value The title to set. * @return This builder for chaining. */ @@ -8145,22 +8217,22 @@ java.lang.String value) { if (value == null) { throw new NullPointerException(); } title_ = value; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); return this; } /** - * string title = 12; + * string title = 13; * @return This builder for chaining. */ public Builder clearTitle() { title_ = getDefaultInstance().getTitle(); - bitField0_ = (bitField0_ & ~0x00000800); + bitField0_ = (bitField0_ & ~0x00001000); onChanged(); return this; } /** - * string title = 12; + * string title = 13; * @param value The bytes for title to set. * @return This builder for chaining. */ @@ -8169,14 +8241,14 @@ if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); title_ = value; - bitField0_ |= 0x00000800; + bitField0_ |= 0x00001000; onChanged(); return this; } private java.lang.Object artist_ = ""; /** - * string artist = 13; + * string artist = 14; * @return The artist. */ public java.lang.String getArtist() { @@ -8192,7 +8264,7 @@ } } /** - * string artist = 13; + * string artist = 14; * @return The bytes for artist. */ public com.google.protobuf.ByteString @@ -8209,7 +8281,7 @@ } } /** - * string artist = 13; + * string artist = 14; * @param value The artist to set. * @return This builder for chaining. */ @@ -8217,22 +8289,22 @@ java.lang.String value) { if (value == null) { throw new NullPointerException(); } artist_ = value; - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); return this; } /** - * string artist = 13; + * string artist = 14; * @return This builder for chaining. */ public Builder clearArtist() { artist_ = getDefaultInstance().getArtist(); - bitField0_ = (bitField0_ & ~0x00001000); + bitField0_ = (bitField0_ & ~0x00002000); onChanged(); return this; } /** - * string artist = 13; + * string artist = 14; * @param value The bytes for artist to set. * @return This builder for chaining. */ @@ -8241,14 +8313,14 @@ if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); artist_ = value; - bitField0_ |= 0x00001000; + bitField0_ |= 0x00002000; onChanged(); return this; } private java.lang.Object genre_ = ""; /** - * string genre = 14; + * string genre = 15; * @return The genre. */ public java.lang.String getGenre() { @@ -8264,7 +8336,7 @@ } } /** - * string genre = 14; + * string genre = 15; * @return The bytes for genre. */ public com.google.protobuf.ByteString @@ -8281,7 +8353,7 @@ } } /** - * string genre = 14; + * string genre = 15; * @param value The genre to set. * @return This builder for chaining. */ @@ -8289,22 +8361,22 @@ java.lang.String value) { if (value == null) { throw new NullPointerException(); } genre_ = value; - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); return this; } /** - * string genre = 14; + * string genre = 15; * @return This builder for chaining. */ public Builder clearGenre() { genre_ = getDefaultInstance().getGenre(); - bitField0_ = (bitField0_ & ~0x00002000); + bitField0_ = (bitField0_ & ~0x00004000); onChanged(); return this; } /** - * string genre = 14; + * string genre = 15; * @param value The bytes for genre to set. * @return This builder for chaining. */ @@ -8313,14 +8385,14 @@ if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); genre_ = value; - bitField0_ |= 0x00002000; + bitField0_ |= 0x00004000; onChanged(); return this; } private int level_ ; /** - * int32 level = 15; + * int32 level = 16; * @return The level. */ @java.lang.Override @@ -8328,23 +8400,23 @@ return level_; } /** - * int32 level = 15; + * int32 level = 16; * @param value The level to set. * @return This builder for chaining. */ public Builder setLevel(int value) { level_ = value; - bitField0_ |= 0x00004000; + bitField0_ |= 0x00008000; onChanged(); return this; } /** - * int32 level = 15; + * int32 level = 16; * @return This builder for chaining. */ public Builder clearLevel() { - bitField0_ = (bitField0_ & ~0x00004000); + bitField0_ = (bitField0_ & ~0x00008000); level_ = 0; onChanged(); return this; @@ -8352,7 +8424,7 @@ private java.lang.Object levelText_ = ""; /** - * string levelText = 16; + * string levelText = 17; * @return The levelText. */ public java.lang.String getLevelText() { @@ -8368,7 +8440,7 @@ } } /** - * string levelText = 16; + * string levelText = 17; * @return The bytes for levelText. */ public com.google.protobuf.ByteString @@ -8385,7 +8457,7 @@ } } /** - * string levelText = 16; + * string levelText = 17; * @param value The levelText to set. * @return This builder for chaining. */ @@ -8393,22 +8465,22 @@ java.lang.String value) { if (value == null) { throw new NullPointerException(); } levelText_ = value; - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); return this; } /** - * string levelText = 16; + * string levelText = 17; * @return This builder for chaining. */ public Builder clearLevelText() { levelText_ = getDefaultInstance().getLevelText(); - bitField0_ = (bitField0_ & ~0x00008000); + bitField0_ = (bitField0_ & ~0x00010000); onChanged(); return this; } /** - * string levelText = 16; + * string levelText = 17; * @param value The bytes for levelText to set. * @return This builder for chaining. */ @@ -8417,14 +8489,14 @@ if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); levelText_ = value; - bitField0_ |= 0x00008000; + bitField0_ |= 0x00010000; onChanged(); return this; } private java.lang.Object wantLevelID_ = ""; /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The wantLevelID. */ public java.lang.String getWantLevelID() { @@ -8440,7 +8512,7 @@ } } /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return The bytes for wantLevelID. */ public com.google.protobuf.ByteString @@ -8457,7 +8529,7 @@ } } /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @param value The wantLevelID to set. * @return This builder for chaining. */ @@ -8465,22 +8537,22 @@ java.lang.String value) { if (value == null) { throw new NullPointerException(); } wantLevelID_ = value; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; onChanged(); return this; } /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @return This builder for chaining. */ public Builder clearWantLevelID() { wantLevelID_ = getDefaultInstance().getWantLevelID(); - bitField0_ = (bitField0_ & ~0x00010000); + bitField0_ = (bitField0_ & ~0x00020000); onChanged(); return this; } /** - * string wantLevelID = 17; + * string wantLevelID = 18; * @param value The bytes for wantLevelID to set. * @return This builder for chaining. */ @@ -8489,14 +8561,14 @@ if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); wantLevelID_ = value; - bitField0_ |= 0x00010000; + bitField0_ |= 0x00020000; onChanged(); return this; } private int autoMode_ ; /** - * int32 autoMode = 18; + * int32 autoMode = 19; * @return The autoMode. */ @java.lang.Override @@ -8504,23 +8576,23 @@ return autoMode_; } /** - * int32 autoMode = 18; + * int32 autoMode = 19; * @param value The autoMode to set. * @return This builder for chaining. */ public Builder setAutoMode(int value) { autoMode_ = value; - bitField0_ |= 0x00020000; + bitField0_ |= 0x00040000; onChanged(); return this; } /** - * int32 autoMode = 18; + * int32 autoMode = 19; * @return This builder for chaining. */ public Builder clearAutoMode() { - bitField0_ = (bitField0_ & ~0x00020000); + bitField0_ = (bitField0_ & ~0x00040000); autoMode_ = 0; onChanged(); return this; @@ -8528,7 +8600,7 @@ private int noteSaltMode_ ; /** - * int32 noteSaltMode = 19; + * int32 noteSaltMode = 20; * @return The noteSaltMode. */ @java.lang.Override @@ -8536,23 +8608,23 @@ return noteSaltMode_; } /** - * int32 noteSaltMode = 19; + * int32 noteSaltMode = 20; * @param value The noteSaltMode to set. * @return This builder for chaining. */ public Builder setNoteSaltMode(int value) { noteSaltMode_ = value; - bitField0_ |= 0x00040000; + bitField0_ |= 0x00080000; onChanged(); return this; } /** - * int32 noteSaltMode = 19; + * int32 noteSaltMode = 20; * @return This builder for chaining. */ public Builder clearNoteSaltMode() { - bitField0_ = (bitField0_ & ~0x00040000); + bitField0_ = (bitField0_ & ~0x00080000); noteSaltMode_ = 0; onChanged(); return this; @@ -8560,7 +8632,7 @@ private double audioMultiplier_ ; /** - * double audioMultiplier = 20; + * double audioMultiplier = 21; * @return The audioMultiplier. */ @java.lang.Override @@ -8568,23 +8640,23 @@ return audioMultiplier_; } /** - * double audioMultiplier = 20; + * double audioMultiplier = 21; * @param value The audioMultiplier to set. * @return This builder for chaining. */ public Builder setAudioMultiplier(double value) { audioMultiplier_ = value; - bitField0_ |= 0x00080000; + bitField0_ |= 0x00100000; onChanged(); return this; } /** - * double audioMultiplier = 20; + * double audioMultiplier = 21; * @return This builder for chaining. */ public Builder clearAudioMultiplier() { - bitField0_ = (bitField0_ & ~0x00080000); + bitField0_ = (bitField0_ & ~0x00100000); audioMultiplier_ = 0D; onChanged(); return this; @@ -8592,7 +8664,7 @@ private int faintNoteMode_ ; /** - * int32 faintNoteMode = 21; + * int32 faintNoteMode = 22; * @return The faintNoteMode. */ @java.lang.Override @@ -8600,23 +8672,23 @@ return faintNoteMode_; } /** - * int32 faintNoteMode = 21; + * int32 faintNoteMode = 22; * @param value The faintNoteMode to set. * @return This builder for chaining. */ public Builder setFaintNoteMode(int value) { faintNoteMode_ = value; - bitField0_ |= 0x00100000; + bitField0_ |= 0x00200000; onChanged(); return this; } /** - * int32 faintNoteMode = 21; + * int32 faintNoteMode = 22; * @return This builder for chaining. */ public Builder clearFaintNoteMode() { - bitField0_ = (bitField0_ & ~0x00100000); + bitField0_ = (bitField0_ & ~0x00200000); faintNoteMode_ = 0; onChanged(); return this; @@ -8624,7 +8696,7 @@ private int judgmentMode_ ; /** - * int32 judgmentMode = 22; + * int32 judgmentMode = 23; * @return The judgmentMode. */ @java.lang.Override @@ -8632,23 +8704,23 @@ return judgmentMode_; } /** - * int32 judgmentMode = 22; + * int32 judgmentMode = 23; * @param value The judgmentMode to set. * @return This builder for chaining. */ public Builder setJudgmentMode(int value) { judgmentMode_ = value; - bitField0_ |= 0x00200000; + bitField0_ |= 0x00400000; onChanged(); return this; } /** - * int32 judgmentMode = 22; + * int32 judgmentMode = 23; * @return This builder for chaining. */ public Builder clearJudgmentMode() { - bitField0_ = (bitField0_ & ~0x00200000); + bitField0_ = (bitField0_ & ~0x00400000); judgmentMode_ = 0; onChanged(); return this; @@ -8656,7 +8728,7 @@ private int hitPointsMode_ ; /** - * int32 hitPointsMode = 23; + * int32 hitPointsMode = 24; * @return The hitPointsMode. */ @java.lang.Override @@ -8664,23 +8736,23 @@ return hitPointsMode_; } /** - * int32 hitPointsMode = 23; + * int32 hitPointsMode = 24; * @param value The hitPointsMode to set. * @return This builder for chaining. */ public Builder setHitPointsMode(int value) { hitPointsMode_ = value; - bitField0_ |= 0x00400000; + bitField0_ |= 0x00800000; onChanged(); return this; } /** - * int32 hitPointsMode = 23; + * int32 hitPointsMode = 24; * @return This builder for chaining. */ public Builder clearHitPointsMode() { - bitField0_ = (bitField0_ & ~0x00400000); + bitField0_ = (bitField0_ & ~0x00800000); hitPointsMode_ = 0; onChanged(); return this; @@ -8688,7 +8760,7 @@ private int noteMobilityMode_ ; /** - * int32 noteMobilityMode = 24; + * int32 noteMobilityMode = 25; * @return The noteMobilityMode. */ @java.lang.Override @@ -8696,23 +8768,23 @@ return noteMobilityMode_; } /** - * int32 noteMobilityMode = 24; + * int32 noteMobilityMode = 25; * @param value The noteMobilityMode to set. * @return This builder for chaining. */ public Builder setNoteMobilityMode(int value) { noteMobilityMode_ = value; - bitField0_ |= 0x00800000; + bitField0_ |= 0x01000000; onChanged(); return this; } /** - * int32 noteMobilityMode = 24; + * int32 noteMobilityMode = 25; * @return This builder for chaining. */ public Builder clearNoteMobilityMode() { - bitField0_ = (bitField0_ & ~0x00800000); + bitField0_ = (bitField0_ & ~0x01000000); noteMobilityMode_ = 0; onChanged(); return this; @@ -8720,7 +8792,7 @@ private int longNoteMode_ ; /** - * int32 longNoteMode = 25; + * int32 longNoteMode = 26; * @return The longNoteMode. */ @java.lang.Override @@ -8728,23 +8800,23 @@ return longNoteMode_; } /** - * int32 longNoteMode = 25; + * int32 longNoteMode = 26; * @param value The longNoteMode to set. * @return This builder for chaining. */ public Builder setLongNoteMode(int value) { longNoteMode_ = value; - bitField0_ |= 0x01000000; + bitField0_ |= 0x02000000; onChanged(); return this; } /** - * int32 longNoteMode = 25; + * int32 longNoteMode = 26; * @return This builder for chaining. */ public Builder clearLongNoteMode() { - bitField0_ = (bitField0_ & ~0x01000000); + bitField0_ = (bitField0_ & ~0x02000000); longNoteMode_ = 0; onChanged(); return this; @@ -8752,7 +8824,7 @@ private int inputFavorMode_ ; /** - * int32 inputFavorMode = 26; + * int32 inputFavorMode = 27; * @return The inputFavorMode. */ @java.lang.Override @@ -8760,23 +8832,23 @@ return inputFavorMode_; } /** - * int32 inputFavorMode = 26; + * int32 inputFavorMode = 27; * @param value The inputFavorMode to set. * @return This builder for chaining. */ public Builder setInputFavorMode(int value) { inputFavorMode_ = value; - bitField0_ |= 0x02000000; + bitField0_ |= 0x04000000; onChanged(); return this; } /** - * int32 inputFavorMode = 26; + * int32 inputFavorMode = 27; * @return This builder for chaining. */ public Builder clearInputFavorMode() { - bitField0_ = (bitField0_ & ~0x02000000); + bitField0_ = (bitField0_ & ~0x04000000); inputFavorMode_ = 0; onChanged(); return this; @@ -8784,7 +8856,7 @@ private int noteModifyMode_ ; /** - * int32 noteModifyMode = 27; + * int32 noteModifyMode = 28; * @return The noteModifyMode. */ @java.lang.Override @@ -8792,23 +8864,23 @@ return noteModifyMode_; } /** - * int32 noteModifyMode = 27; + * int32 noteModifyMode = 28; * @param value The noteModifyMode to set. * @return This builder for chaining. */ public Builder setNoteModifyMode(int value) { noteModifyMode_ = value; - bitField0_ |= 0x04000000; + bitField0_ |= 0x08000000; onChanged(); return this; } /** - * int32 noteModifyMode = 27; + * int32 noteModifyMode = 28; * @return This builder for chaining. */ public Builder clearNoteModifyMode() { - bitField0_ = (bitField0_ & ~0x04000000); + bitField0_ = (bitField0_ & ~0x08000000); noteModifyMode_ = 0; onChanged(); return this; @@ -8816,7 +8888,7 @@ private int bpmMode_ ; /** - * int32 bpmMode = 28; + * int32 bpmMode = 29; * @return The bpmMode. */ @java.lang.Override @@ -8824,23 +8896,23 @@ return bpmMode_; } /** - * int32 bpmMode = 28; + * int32 bpmMode = 29; * @param value The bpmMode to set. * @return This builder for chaining. */ public Builder setBpmMode(int value) { bpmMode_ = value; - bitField0_ |= 0x08000000; + bitField0_ |= 0x10000000; onChanged(); return this; } /** - * int32 bpmMode = 28; + * int32 bpmMode = 29; * @return This builder for chaining. */ public Builder clearBpmMode() { - bitField0_ = (bitField0_ & ~0x08000000); + bitField0_ = (bitField0_ & ~0x10000000); bpmMode_ = 0; onChanged(); return this; @@ -8848,7 +8920,7 @@ private int waveMode_ ; /** - * int32 waveMode = 29; + * int32 waveMode = 30; * @return The waveMode. */ @java.lang.Override @@ -8856,23 +8928,23 @@ return waveMode_; } /** - * int32 waveMode = 29; + * int32 waveMode = 30; * @param value The waveMode to set. * @return This builder for chaining. */ public Builder setWaveMode(int value) { waveMode_ = value; - bitField0_ |= 0x10000000; + bitField0_ |= 0x20000000; onChanged(); return this; } /** - * int32 waveMode = 29; + * int32 waveMode = 30; * @return This builder for chaining. */ public Builder clearWaveMode() { - bitField0_ = (bitField0_ & ~0x10000000); + bitField0_ = (bitField0_ & ~0x20000000); waveMode_ = 0; onChanged(); return this; @@ -8880,7 +8952,7 @@ private int setNoteMode_ ; /** - * int32 setNoteMode = 30; + * int32 setNoteMode = 31; * @return The setNoteMode. */ @java.lang.Override @@ -8888,23 +8960,23 @@ return setNoteMode_; } /** - * int32 setNoteMode = 30; + * int32 setNoteMode = 31; * @param value The setNoteMode to set. * @return This builder for chaining. */ public Builder setSetNoteMode(int value) { setNoteMode_ = value; - bitField0_ |= 0x20000000; + bitField0_ |= 0x40000000; onChanged(); return this; } /** - * int32 setNoteMode = 30; + * int32 setNoteMode = 31; * @return This builder for chaining. */ public Builder clearSetNoteMode() { - bitField0_ = (bitField0_ & ~0x20000000); + bitField0_ = (bitField0_ & ~0x40000000); setNoteMode_ = 0; onChanged(); return this; @@ -8912,7 +8984,7 @@ private int lowestJudgmentConditionMode_ ; /** - * int32 lowestJudgmentConditionMode = 31; + * int32 lowestJudgmentConditionMode = 32; * @return The lowestJudgmentConditionMode. */ @java.lang.Override @@ -8920,23 +8992,23 @@ return lowestJudgmentConditionMode_; } /** - * int32 lowestJudgmentConditionMode = 31; + * int32 lowestJudgmentConditionMode = 32; * @param value The lowestJudgmentConditionMode to set. * @return This builder for chaining. */ public Builder setLowestJudgmentConditionMode(int value) { lowestJudgmentConditionMode_ = value; - bitField0_ |= 0x40000000; + bitField0_ |= 0x80000000; onChanged(); return this; } /** - * int32 lowestJudgmentConditionMode = 31; + * int32 lowestJudgmentConditionMode = 32; * @return This builder for chaining. */ public Builder clearLowestJudgmentConditionMode() { - bitField0_ = (bitField0_ & ~0x40000000); + bitField0_ = (bitField0_ & ~0x80000000); lowestJudgmentConditionMode_ = 0; onChanged(); return this; @@ -8944,7 +9016,7 @@ private int totalNotes_ ; /** - * int32 totalNotes = 32; + * int32 totalNotes = 33; * @return The totalNotes. */ @java.lang.Override @@ -8952,23 +9024,23 @@ return totalNotes_; } /** - * int32 totalNotes = 32; + * int32 totalNotes = 33; * @param value The totalNotes to set. * @return This builder for chaining. */ public Builder setTotalNotes(int value) { totalNotes_ = value; - bitField0_ |= 0x80000000; + bitField1_ |= 0x00000001; onChanged(); return this; } /** - * int32 totalNotes = 32; + * int32 totalNotes = 33; * @return This builder for chaining. */ public Builder clearTotalNotes() { - bitField0_ = (bitField0_ & ~0x80000000); + bitField1_ = (bitField1_ & ~0x00000001); totalNotes_ = 0; onChanged(); return this; @@ -8976,7 +9048,7 @@ private double judgmentStage_ ; /** - * double judgmentStage = 33; + * double judgmentStage = 34; * @return The judgmentStage. */ @java.lang.Override @@ -8984,23 +9056,23 @@ return judgmentStage_; } /** - * double judgmentStage = 33; + * double judgmentStage = 34; * @param value The judgmentStage to set. * @return This builder for chaining. */ public Builder setJudgmentStage(double value) { judgmentStage_ = value; - bitField1_ |= 0x00000001; + bitField1_ |= 0x00000002; onChanged(); return this; } /** - * double judgmentStage = 33; + * double judgmentStage = 34; * @return This builder for chaining. */ public Builder clearJudgmentStage() { - bitField1_ = (bitField1_ & ~0x00000001); + bitField1_ = (bitField1_ & ~0x00000002); judgmentStage_ = 0D; onChanged(); return this; @@ -9008,7 +9080,7 @@ private double hitPointsValue_ ; /** - * double hitPointsValue = 34; + * double hitPointsValue = 35; * @return The hitPointsValue. */ @java.lang.Override @@ -9016,23 +9088,23 @@ return hitPointsValue_; } /** - * double hitPointsValue = 34; + * double hitPointsValue = 35; * @param value The hitPointsValue to set. * @return This builder for chaining. */ public Builder setHitPointsValue(double value) { hitPointsValue_ = value; - bitField1_ |= 0x00000002; + bitField1_ |= 0x00000004; onChanged(); return this; } /** - * double hitPointsValue = 34; + * double hitPointsValue = 35; * @return This builder for chaining. */ public Builder clearHitPointsValue() { - bitField1_ = (bitField1_ & ~0x00000002); + bitField1_ = (bitField1_ & ~0x00000004); hitPointsValue_ = 0D; onChanged(); return this; @@ -9040,7 +9112,7 @@ private int highestInputCount_ ; /** - * int32 highestInputCount = 35; + * int32 highestInputCount = 36; * @return The highestInputCount. */ @java.lang.Override @@ -9048,23 +9120,23 @@ return highestInputCount_; } /** - * int32 highestInputCount = 35; + * int32 highestInputCount = 36; * @param value The highestInputCount to set. * @return This builder for chaining. */ public Builder setHighestInputCount(int value) { highestInputCount_ = value; - bitField1_ |= 0x00000004; + bitField1_ |= 0x00000008; onChanged(); return this; } /** - * int32 highestInputCount = 35; + * int32 highestInputCount = 36; * @return This builder for chaining. */ public Builder clearHighestInputCount() { - bitField1_ = (bitField1_ & ~0x00000004); + bitField1_ = (bitField1_ & ~0x00000008); highestInputCount_ = 0; onChanged(); return this; @@ -9072,7 +9144,7 @@ private double length_ ; /** - * double length = 36; + * double length = 37; * @return The length. */ @java.lang.Override @@ -9080,23 +9152,23 @@ return length_; } /** - * double length = 36; + * double length = 37; * @param value The length to set. * @return This builder for chaining. */ public Builder setLength(double value) { length_ = value; - bitField1_ |= 0x00000008; + bitField1_ |= 0x00000010; onChanged(); return this; } /** - * double length = 36; + * double length = 37; * @return This builder for chaining. */ public Builder clearLength() { - bitField1_ = (bitField1_ & ~0x00000008); + bitField1_ = (bitField1_ & ~0x00000010); length_ = 0D; onChanged(); return this; @@ -9104,7 +9176,7 @@ private double bpm_ ; /** - * double bpm = 37; + * double bpm = 38; * @return The bpm. */ @java.lang.Override @@ -9112,23 +9184,23 @@ return bpm_; } /** - * double bpm = 37; + * double bpm = 38; * @param value The bpm to set. * @return This builder for chaining. */ public Builder setBpm(double value) { bpm_ = value; - bitField1_ |= 0x00000010; + bitField1_ |= 0x00000020; onChanged(); return this; } /** - * double bpm = 37; + * double bpm = 38; * @return This builder for chaining. */ public Builder clearBpm() { - bitField1_ = (bitField1_ & ~0x00000010); + bitField1_ = (bitField1_ & ~0x00000020); bpm_ = 0D; onChanged(); return this; @@ -9136,7 +9208,7 @@ private double multiplier_ ; /** - * double multiplier = 38; + * double multiplier = 39; * @return The multiplier. */ @java.lang.Override @@ -9144,23 +9216,23 @@ return multiplier_; } /** - * double multiplier = 38; + * double multiplier = 39; * @param value The multiplier to set. * @return This builder for chaining. */ public Builder setMultiplier(double value) { multiplier_ = value; - bitField1_ |= 0x00000020; + bitField1_ |= 0x00000040; onChanged(); return this; } /** - * double multiplier = 38; + * double multiplier = 39; * @return This builder for chaining. */ public Builder clearMultiplier() { - bitField1_ = (bitField1_ & ~0x00000020); + bitField1_ = (bitField1_ & ~0x00000040); multiplier_ = 0D; onChanged(); return this; @@ -9168,7 +9240,7 @@ private int inputMode_ ; /** - * int32 inputMode = 39; + * int32 inputMode = 40; * @return The inputMode. */ @java.lang.Override @@ -9176,23 +9248,23 @@ return inputMode_; } /** - * int32 inputMode = 39; + * int32 inputMode = 40; * @param value The inputMode to set. * @return This builder for chaining. */ public Builder setInputMode(int value) { inputMode_ = value; - bitField1_ |= 0x00000040; + bitField1_ |= 0x00000080; onChanged(); return this; } /** - * int32 inputMode = 39; + * int32 inputMode = 40; * @return This builder for chaining. */ public Builder clearInputMode() { - bitField1_ = (bitField1_ & ~0x00000040); + bitField1_ = (bitField1_ & ~0x00000080); inputMode_ = 0; onChanged(); return this; @@ -9200,7 +9272,7 @@ private double highestJudgment0_ ; /** - * double highestJudgment0 = 40; + * double highestJudgment0 = 41; * @return The highestJudgment0. */ @java.lang.Override @@ -9208,23 +9280,23 @@ return highestJudgment0_; } /** - * double highestJudgment0 = 40; + * double highestJudgment0 = 41; * @param value The highestJudgment0 to set. * @return This builder for chaining. */ public Builder setHighestJudgment0(double value) { highestJudgment0_ = value; - bitField1_ |= 0x00000080; + bitField1_ |= 0x00000100; onChanged(); return this; } /** - * double highestJudgment0 = 40; + * double highestJudgment0 = 41; * @return This builder for chaining. */ public Builder clearHighestJudgment0() { - bitField1_ = (bitField1_ & ~0x00000080); + bitField1_ = (bitField1_ & ~0x00000100); highestJudgment0_ = 0D; onChanged(); return this; @@ -9232,7 +9304,7 @@ private double higherJudgment0_ ; /** - * double higherJudgment0 = 41; + * double higherJudgment0 = 42; * @return The higherJudgment0. */ @java.lang.Override @@ -9240,23 +9312,23 @@ return higherJudgment0_; } /** - * double higherJudgment0 = 41; + * double higherJudgment0 = 42; * @param value The higherJudgment0 to set. * @return This builder for chaining. */ public Builder setHigherJudgment0(double value) { higherJudgment0_ = value; - bitField1_ |= 0x00000100; + bitField1_ |= 0x00000200; onChanged(); return this; } /** - * double higherJudgment0 = 41; + * double higherJudgment0 = 42; * @return This builder for chaining. */ public Builder clearHigherJudgment0() { - bitField1_ = (bitField1_ & ~0x00000100); + bitField1_ = (bitField1_ & ~0x00000200); higherJudgment0_ = 0D; onChanged(); return this; @@ -9264,7 +9336,7 @@ private double highJudgment0_ ; /** - * double highJudgment0 = 42; + * double highJudgment0 = 43; * @return The highJudgment0. */ @java.lang.Override @@ -9272,23 +9344,23 @@ return highJudgment0_; } /** - * double highJudgment0 = 42; + * double highJudgment0 = 43; * @param value The highJudgment0 to set. * @return This builder for chaining. */ public Builder setHighJudgment0(double value) { highJudgment0_ = value; - bitField1_ |= 0x00000200; + bitField1_ |= 0x00000400; onChanged(); return this; } /** - * double highJudgment0 = 42; + * double highJudgment0 = 43; * @return This builder for chaining. */ public Builder clearHighJudgment0() { - bitField1_ = (bitField1_ & ~0x00000200); + bitField1_ = (bitField1_ & ~0x00000400); highJudgment0_ = 0D; onChanged(); return this; @@ -9296,7 +9368,7 @@ private double lowJudgment0_ ; /** - * double lowJudgment0 = 43; + * double lowJudgment0 = 44; * @return The lowJudgment0. */ @java.lang.Override @@ -9304,23 +9376,23 @@ return lowJudgment0_; } /** - * double lowJudgment0 = 43; + * double lowJudgment0 = 44; * @param value The lowJudgment0 to set. * @return This builder for chaining. */ public Builder setLowJudgment0(double value) { lowJudgment0_ = value; - bitField1_ |= 0x00000400; + bitField1_ |= 0x00000800; onChanged(); return this; } /** - * double lowJudgment0 = 43; + * double lowJudgment0 = 44; * @return This builder for chaining. */ public Builder clearLowJudgment0() { - bitField1_ = (bitField1_ & ~0x00000400); + bitField1_ = (bitField1_ & ~0x00000800); lowJudgment0_ = 0D; onChanged(); return this; @@ -9328,7 +9400,7 @@ private double lowerJudgment0_ ; /** - * double lowerJudgment0 = 44; + * double lowerJudgment0 = 45; * @return The lowerJudgment0. */ @java.lang.Override @@ -9336,23 +9408,23 @@ return lowerJudgment0_; } /** - * double lowerJudgment0 = 44; + * double lowerJudgment0 = 45; * @param value The lowerJudgment0 to set. * @return This builder for chaining. */ public Builder setLowerJudgment0(double value) { lowerJudgment0_ = value; - bitField1_ |= 0x00000800; + bitField1_ |= 0x00001000; onChanged(); return this; } /** - * double lowerJudgment0 = 44; + * double lowerJudgment0 = 45; * @return This builder for chaining. */ public Builder clearLowerJudgment0() { - bitField1_ = (bitField1_ & ~0x00000800); + bitField1_ = (bitField1_ & ~0x00001000); lowerJudgment0_ = 0D; onChanged(); return this; @@ -9360,7 +9432,7 @@ private double lowestJudgment0_ ; /** - * double lowestJudgment0 = 45; + * double lowestJudgment0 = 46; * @return The lowestJudgment0. */ @java.lang.Override @@ -9368,23 +9440,23 @@ return lowestJudgment0_; } /** - * double lowestJudgment0 = 45; + * double lowestJudgment0 = 46; * @param value The lowestJudgment0 to set. * @return This builder for chaining. */ public Builder setLowestJudgment0(double value) { lowestJudgment0_ = value; - bitField1_ |= 0x00001000; + bitField1_ |= 0x00002000; onChanged(); return this; } /** - * double lowestJudgment0 = 45; + * double lowestJudgment0 = 46; * @return This builder for chaining. */ public Builder clearLowestJudgment0() { - bitField1_ = (bitField1_ & ~0x00001000); + bitField1_ = (bitField1_ & ~0x00002000); lowestJudgment0_ = 0D; onChanged(); return this; @@ -9392,7 +9464,7 @@ private double highestJudgment1_ ; /** - * double highestJudgment1 = 46; + * double highestJudgment1 = 47; * @return The highestJudgment1. */ @java.lang.Override @@ -9400,23 +9472,23 @@ return highestJudgment1_; } /** - * double highestJudgment1 = 46; + * double highestJudgment1 = 47; * @param value The highestJudgment1 to set. * @return This builder for chaining. */ public Builder setHighestJudgment1(double value) { highestJudgment1_ = value; - bitField1_ |= 0x00002000; + bitField1_ |= 0x00004000; onChanged(); return this; } /** - * double highestJudgment1 = 46; + * double highestJudgment1 = 47; * @return This builder for chaining. */ public Builder clearHighestJudgment1() { - bitField1_ = (bitField1_ & ~0x00002000); + bitField1_ = (bitField1_ & ~0x00004000); highestJudgment1_ = 0D; onChanged(); return this; @@ -9424,7 +9496,7 @@ private double higherJudgment1_ ; /** - * double higherJudgment1 = 47; + * double higherJudgment1 = 48; * @return The higherJudgment1. */ @java.lang.Override @@ -9432,23 +9504,23 @@ return higherJudgment1_; } /** - * double higherJudgment1 = 47; + * double higherJudgment1 = 48; * @param value The higherJudgment1 to set. * @return This builder for chaining. */ public Builder setHigherJudgment1(double value) { higherJudgment1_ = value; - bitField1_ |= 0x00004000; + bitField1_ |= 0x00008000; onChanged(); return this; } /** - * double higherJudgment1 = 47; + * double higherJudgment1 = 48; * @return This builder for chaining. */ public Builder clearHigherJudgment1() { - bitField1_ = (bitField1_ & ~0x00004000); + bitField1_ = (bitField1_ & ~0x00008000); higherJudgment1_ = 0D; onChanged(); return this; @@ -9456,7 +9528,7 @@ private double highJudgment1_ ; /** - * double highJudgment1 = 48; + * double highJudgment1 = 49; * @return The highJudgment1. */ @java.lang.Override @@ -9464,23 +9536,23 @@ return highJudgment1_; } /** - * double highJudgment1 = 48; + * double highJudgment1 = 49; * @param value The highJudgment1 to set. * @return This builder for chaining. */ public Builder setHighJudgment1(double value) { highJudgment1_ = value; - bitField1_ |= 0x00008000; + bitField1_ |= 0x00010000; onChanged(); return this; } /** - * double highJudgment1 = 48; + * double highJudgment1 = 49; * @return This builder for chaining. */ public Builder clearHighJudgment1() { - bitField1_ = (bitField1_ & ~0x00008000); + bitField1_ = (bitField1_ & ~0x00010000); highJudgment1_ = 0D; onChanged(); return this; @@ -9488,7 +9560,7 @@ private double lowJudgment1_ ; /** - * double lowJudgment1 = 49; + * double lowJudgment1 = 50; * @return The lowJudgment1. */ @java.lang.Override @@ -9496,23 +9568,23 @@ return lowJudgment1_; } /** - * double lowJudgment1 = 49; + * double lowJudgment1 = 50; * @param value The lowJudgment1 to set. * @return This builder for chaining. */ public Builder setLowJudgment1(double value) { lowJudgment1_ = value; - bitField1_ |= 0x00010000; + bitField1_ |= 0x00020000; onChanged(); return this; } /** - * double lowJudgment1 = 49; + * double lowJudgment1 = 50; * @return This builder for chaining. */ public Builder clearLowJudgment1() { - bitField1_ = (bitField1_ & ~0x00010000); + bitField1_ = (bitField1_ & ~0x00020000); lowJudgment1_ = 0D; onChanged(); return this; @@ -9520,7 +9592,7 @@ private double lowerJudgment1_ ; /** - * double lowerJudgment1 = 50; + * double lowerJudgment1 = 51; * @return The lowerJudgment1. */ @java.lang.Override @@ -9528,23 +9600,23 @@ return lowerJudgment1_; } /** - * double lowerJudgment1 = 50; + * double lowerJudgment1 = 51; * @param value The lowerJudgment1 to set. * @return This builder for chaining. */ public Builder setLowerJudgment1(double value) { lowerJudgment1_ = value; - bitField1_ |= 0x00020000; + bitField1_ |= 0x00040000; onChanged(); return this; } /** - * double lowerJudgment1 = 50; + * double lowerJudgment1 = 51; * @return This builder for chaining. */ public Builder clearLowerJudgment1() { - bitField1_ = (bitField1_ & ~0x00020000); + bitField1_ = (bitField1_ & ~0x00040000); lowerJudgment1_ = 0D; onChanged(); return this; @@ -9552,7 +9624,7 @@ private double lowestJudgment1_ ; /** - * double lowestJudgment1 = 51; + * double lowestJudgment1 = 52; * @return The lowestJudgment1. */ @java.lang.Override @@ -9560,23 +9632,23 @@ return lowestJudgment1_; } /** - * double lowestJudgment1 = 51; + * double lowestJudgment1 = 52; * @param value The lowestJudgment1 to set. * @return This builder for chaining. */ public Builder setLowestJudgment1(double value) { lowestJudgment1_ = value; - bitField1_ |= 0x00040000; + bitField1_ |= 0x00080000; onChanged(); return this; } /** - * double lowestJudgment1 = 51; + * double lowestJudgment1 = 52; * @return This builder for chaining. */ public Builder clearLowestJudgment1() { - bitField1_ = (bitField1_ & ~0x00040000); + bitField1_ = (bitField1_ & ~0x00080000); lowestJudgment1_ = 0D; onChanged(); return this; @@ -9584,7 +9656,7 @@ private int highestJudgment_ ; /** - * int32 highestJudgment = 52; + * int32 highestJudgment = 53; * @return The highestJudgment. */ @java.lang.Override @@ -9592,23 +9664,23 @@ return highestJudgment_; } /** - * int32 highestJudgment = 52; + * int32 highestJudgment = 53; * @param value The highestJudgment to set. * @return This builder for chaining. */ public Builder setHighestJudgment(int value) { highestJudgment_ = value; - bitField1_ |= 0x00080000; + bitField1_ |= 0x00100000; onChanged(); return this; } /** - * int32 highestJudgment = 52; + * int32 highestJudgment = 53; * @return This builder for chaining. */ public Builder clearHighestJudgment() { - bitField1_ = (bitField1_ & ~0x00080000); + bitField1_ = (bitField1_ & ~0x00100000); highestJudgment_ = 0; onChanged(); return this; @@ -9616,7 +9688,7 @@ private int higherJudgment_ ; /** - * int32 higherJudgment = 53; + * int32 higherJudgment = 54; * @return The higherJudgment. */ @java.lang.Override @@ -9624,23 +9696,23 @@ return higherJudgment_; } /** - * int32 higherJudgment = 53; + * int32 higherJudgment = 54; * @param value The higherJudgment to set. * @return This builder for chaining. */ public Builder setHigherJudgment(int value) { higherJudgment_ = value; - bitField1_ |= 0x00100000; + bitField1_ |= 0x00200000; onChanged(); return this; } /** - * int32 higherJudgment = 53; + * int32 higherJudgment = 54; * @return This builder for chaining. */ public Builder clearHigherJudgment() { - bitField1_ = (bitField1_ & ~0x00100000); + bitField1_ = (bitField1_ & ~0x00200000); higherJudgment_ = 0; onChanged(); return this; @@ -9648,7 +9720,7 @@ private int highJudgment_ ; /** - * int32 highJudgment = 54; + * int32 highJudgment = 55; * @return The highJudgment. */ @java.lang.Override @@ -9656,23 +9728,23 @@ return highJudgment_; } /** - * int32 highJudgment = 54; + * int32 highJudgment = 55; * @param value The highJudgment to set. * @return This builder for chaining. */ public Builder setHighJudgment(int value) { highJudgment_ = value; - bitField1_ |= 0x00200000; + bitField1_ |= 0x00400000; onChanged(); return this; } /** - * int32 highJudgment = 54; + * int32 highJudgment = 55; * @return This builder for chaining. */ public Builder clearHighJudgment() { - bitField1_ = (bitField1_ & ~0x00200000); + bitField1_ = (bitField1_ & ~0x00400000); highJudgment_ = 0; onChanged(); return this; @@ -9680,7 +9752,7 @@ private int lowJudgment_ ; /** - * int32 lowJudgment = 55; + * int32 lowJudgment = 56; * @return The lowJudgment. */ @java.lang.Override @@ -9688,23 +9760,23 @@ return lowJudgment_; } /** - * int32 lowJudgment = 55; + * int32 lowJudgment = 56; * @param value The lowJudgment to set. * @return This builder for chaining. */ public Builder setLowJudgment(int value) { lowJudgment_ = value; - bitField1_ |= 0x00400000; + bitField1_ |= 0x00800000; onChanged(); return this; } /** - * int32 lowJudgment = 55; + * int32 lowJudgment = 56; * @return This builder for chaining. */ public Builder clearLowJudgment() { - bitField1_ = (bitField1_ & ~0x00400000); + bitField1_ = (bitField1_ & ~0x00800000); lowJudgment_ = 0; onChanged(); return this; @@ -9712,7 +9784,7 @@ private int lowerJudgment_ ; /** - * int32 lowerJudgment = 56; + * int32 lowerJudgment = 57; * @return The lowerJudgment. */ @java.lang.Override @@ -9720,23 +9792,23 @@ return lowerJudgment_; } /** - * int32 lowerJudgment = 56; + * int32 lowerJudgment = 57; * @param value The lowerJudgment to set. * @return This builder for chaining. */ public Builder setLowerJudgment(int value) { lowerJudgment_ = value; - bitField1_ |= 0x00800000; + bitField1_ |= 0x01000000; onChanged(); return this; } /** - * int32 lowerJudgment = 56; + * int32 lowerJudgment = 57; * @return This builder for chaining. */ public Builder clearLowerJudgment() { - bitField1_ = (bitField1_ & ~0x00800000); + bitField1_ = (bitField1_ & ~0x01000000); lowerJudgment_ = 0; onChanged(); return this; @@ -9744,7 +9816,7 @@ private int lowestJudgment_ ; /** - * int32 lowestJudgment = 57; + * int32 lowestJudgment = 58; * @return The lowestJudgment. */ @java.lang.Override @@ -9752,23 +9824,23 @@ return lowestJudgment_; } /** - * int32 lowestJudgment = 57; + * int32 lowestJudgment = 58; * @param value The lowestJudgment to set. * @return This builder for chaining. */ public Builder setLowestJudgment(int value) { lowestJudgment_ = value; - bitField1_ |= 0x01000000; + bitField1_ |= 0x02000000; onChanged(); return this; } /** - * int32 lowestJudgment = 57; + * int32 lowestJudgment = 58; * @return This builder for chaining. */ public Builder clearLowestJudgment() { - bitField1_ = (bitField1_ & ~0x01000000); + bitField1_ = (bitField1_ & ~0x02000000); lowestJudgment_ = 0; onChanged(); return this; @@ -28246,7 +28318,7 @@ descriptor; static { java.lang.String[] descriptorData = { - "\n\013Event.proto\"\3760\n\005Event\022\016\n\006millis\030\001 \001(\003\022" + + "\n\013Event.proto\"\2141\n\005Event\022\016\n\006millis\030\001 \001(\003\022" + "\020\n\010avatarID\030\002 \001(\t\022\037\n\007eventID\030\003 \001(\0162\016.Eve" + "nt.EventID\022\014\n\004text\030\004 \001(\t\022\014\n\004data\030\005 \003(\014\0221" + "\n\017qwilightCallNet\030\006 \001(\0132\026.Event.Qwilight" + @@ -28284,126 +28356,126 @@ "lastJudged\030\t \001(\005\022\025\n\rhitPointsMode\030\n \001(\005\022" + "\026\n\016targetPosition\030\013 \001(\005\022#\n\010drawings\030\014 \003(" + "\0132\021.Event.NetDrawing\0221\n\020drawingComponent" + - "\030\r \001(\0132\027.Event.DrawingComponent\032\237\n\n\017Qwil" + + "\030\r \001(\0132\027.Event.DrawingComponent\032\255\n\n\017Qwil" + "ightCallNet\022\016\n\006siteID\030\001 \001(\t\022\021\n\thandlerID" + "\030\002 \001(\t\022/\n\017avatarNetStatus\030\003 \001(\0162\026.Event." + - "AvatarNetStatus\022\r\n\005stand\030\004 \001(\005\022\023\n\013highes" + - "tBand\030\005 \001(\005\022\r\n\005point\030\006 \001(\001\022\021\n\thitPoints\030" + - "\007 \001(\001\022\020\n\010isFailed\030\010 \001(\010\022\022\n\nlastJudged\030\t " + - "\001(\005\022#\n\010drawings\030\n \003(\0132\021.Event.NetDrawing" + - "\0221\n\020drawingComponent\030\013 \001(\0132\027.Event.Drawi" + - "ngComponent\022\r\n\005title\030\014 \001(\t\022\016\n\006artist\030\r \001" + - "(\t\022\r\n\005genre\030\016 \001(\t\022\r\n\005level\030\017 \001(\005\022\021\n\tleve" + - "lText\030\020 \001(\t\022\023\n\013wantLevelID\030\021 \001(\t\022\020\n\010auto" + - "Mode\030\022 \001(\005\022\024\n\014noteSaltMode\030\023 \001(\005\022\027\n\017audi" + - "oMultiplier\030\024 \001(\001\022\025\n\rfaintNoteMode\030\025 \001(\005" + - "\022\024\n\014judgmentMode\030\026 \001(\005\022\025\n\rhitPointsMode\030" + - "\027 \001(\005\022\030\n\020noteMobilityMode\030\030 \001(\005\022\024\n\014longN" + - "oteMode\030\031 \001(\005\022\026\n\016inputFavorMode\030\032 \001(\005\022\026\n" + - "\016noteModifyMode\030\033 \001(\005\022\017\n\007bpmMode\030\034 \001(\005\022\020" + - "\n\010waveMode\030\035 \001(\005\022\023\n\013setNoteMode\030\036 \001(\005\022#\n" + - "\033lowestJudgmentConditionMode\030\037 \001(\005\022\022\n\nto" + - "talNotes\030 \001(\005\022\025\n\rjudgmentStage\030! \001(\001\022\026\n" + - "\016hitPointsValue\030\" \001(\001\022\031\n\021highestInputCou" + - "nt\030# \001(\005\022\016\n\006length\030$ \001(\001\022\013\n\003bpm\030% \001(\001\022\022\n" + - "\nmultiplier\030& \001(\001\022\021\n\tinputMode\030\' \001(\005\022\030\n\020" + - "highestJudgment0\030( \001(\001\022\027\n\017higherJudgment" + - "0\030) \001(\001\022\025\n\rhighJudgment0\030* \001(\001\022\024\n\014lowJud" + - "gment0\030+ \001(\001\022\026\n\016lowerJudgment0\030, \001(\001\022\027\n\017" + - "lowestJudgment0\030- \001(\001\022\030\n\020highestJudgment" + - "1\030. \001(\001\022\027\n\017higherJudgment1\030/ \001(\001\022\025\n\rhigh" + - "Judgment1\0300 \001(\001\022\024\n\014lowJudgment1\0301 \001(\001\022\026\n" + - "\016lowerJudgment1\0302 \001(\001\022\027\n\017lowestJudgment1" + - "\0303 \001(\001\022\027\n\017highestJudgment\0304 \001(\005\022\026\n\016highe" + - "rJudgment\0305 \001(\005\022\024\n\014highJudgment\0306 \001(\005\022\023\n" + - "\013lowJudgment\0307 \001(\005\022\025\n\rlowerJudgment\0308 \001(" + - "\005\022\026\n\016lowestJudgment\0309 \001(\005\032\276\001\n\nNetDrawing" + - "\0221\n\016drawingVariety\030\001 \001(\0162\031.Event.NetDraw" + - "ing.Variety\022\r\n\005param\030\002 \001(\r\022\021\n\tposition0\030" + - "\003 \001(\001\022\021\n\tposition1\030\004 \001(\001\022\016\n\006length\030\005 \001(\001" + - "\022\016\n\006height\030\006 \001(\001\"(\n\007Variety\022\010\n\004Note\020\000\022\010\n" + - "\004Main\020\001\022\t\n\005Meter\020\002\032G\n\020DrawingComponent\022\025" + - "\n\rp2BuiltLength\030\001 \001(\002\022\034\n\024judgmentMainPos" + - "ition\030\002 \001(\002\032U\n\017QwilightIOInput\022\021\n\tavatar" + - "IDs\030\001 \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\r\n\005input\030\003 " + - "\001(\005\022\r\n\005power\030\004 \001(\005\032B\n\017TwilightIOInput\022\021\n" + - "\thandlerID\030\001 \001(\t\022\r\n\005input\030\002 \001(\005\022\r\n\005power" + - "\030\003 \001(\005\032W\n\017QwilightIOJudge\022\021\n\tavatarIDs\030\001" + - " \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\016\n\006noteID\030\003 \001(\005\022" + - "\016\n\006judged\030\004 \001(\005\032D\n\017TwilightIOJudge\022\021\n\tha" + - "ndlerID\030\001 \001(\t\022\016\n\006noteID\030\002 \001(\005\022\016\n\006judged\030" + - "\003 \001(\005\032u\n\027QwilightIOJudgmentMeter\022\021\n\tavat" + - "arIDs\030\001 \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\r\n\005input\030" + - "\003 \001(\005\022\025\n\rjudgmentMeter\030\004 \001(\001\022\016\n\006assist\030\005" + - " \001(\005\032b\n\027TwilightIOJudgmentMeter\022\021\n\thandl" + - "erID\030\001 \001(\t\022\r\n\005input\030\002 \001(\005\022\025\n\rjudgmentMet" + - "er\030\003 \001(\001\022\016\n\006assist\030\004 \001(\005\032\204\001\n\030QwilightION" + - "oteVisibility\022\021\n\tavatarIDs\030\001 \003(\t\022\021\n\thand" + - "lerID\030\002 \001(\t\022\016\n\006noteID\030\003 \001(\005\022\033\n\023setValidJ" + - "udgedNotes\030\004 \001(\010\022\025\n\rsetNoteFailed\030\005 \001(\010\032" + - "q\n\030TwilightIONoteVisibility\022\021\n\thandlerID" + - "\030\001 \001(\t\022\016\n\006noteID\030\002 \001(\005\022\033\n\023setValidJudged" + - "Notes\030\003 \001(\010\022\025\n\rsetNoteFailed\030\004 \001(\010\032P\n\024Qw" + - "ilightIOMultiplier\022\021\n\tavatarIDs\030\001 \003(\t\022\021\n" + - "\thandlerID\030\002 \001(\t\022\022\n\nmultiplier\030\003 \001(\001\032=\n\024" + - "TwilightIOMultiplier\022\021\n\thandlerID\030\001 \001(\t\022" + - "\022\n\nmultiplier\030\002 \001(\001\032Z\n\031QwilightIOAudioMu" + - "ltiplier\022\021\n\tavatarIDs\030\001 \003(\t\022\021\n\thandlerID" + - "\030\002 \001(\t\022\027\n\017audioMultiplier\030\003 \001(\001\032G\n\031Twili" + - "ghtIOAudioMultiplier\022\021\n\thandlerID\030\001 \001(\t\022" + - "\027\n\017audioMultiplier\030\002 \001(\001\0326\n\022TwilightAudi" + - "oInput\022\016\n\006siteID\030\001 \001(\t\022\020\n\010avatarID\030\002 \001(\t" + - "\032\206\001\n\020QwilightPostItem\022\016\n\006siteID\030\001 \001(\t\022\021\n" + - "\thandlerID\030\002 \001(\t\022\022\n\npostedItem\030\003 \001(\005\022\022\n\n" + - "isPositive\030\004 \001(\005\022\022\n\nlowestWait\030\005 \001(\001\022\023\n\013" + - "highestWait\030\006 \001(\001\032[\n\020TwilightPostItem\022\021\n" + - "\thandlerID\030\001 \001(\t\022\022\n\npostedItem\030\002 \001(\005\022\022\n\n" + - "avatarName\030\003 \001(\t\022\014\n\004wait\030\004 \001(\001\"5\n\017Avatar" + - "NetStatus\022\013\n\007Default\020\000\022\t\n\005Clear\020\001\022\n\n\006Fai" + - "led\020\002\"\252\r\n\007EventID\022\013\n\007SIGN_IN\020\000\022\017\n\013NOT_SI" + - "GN_IN\020\001\022\013\n\007WARNING\020\002\022\r\n\tSITE_YELL\020\003\022\017\n\013C" + - "ALL_BUNDLE\020\004\022\022\n\016SAVE_AS_BUNDLE\020\005\022\021\n\rSAVI" + - "NG_BUNDLE\020\006\022\017\n\013WIPE_BUNDLE\020\007\022\016\n\nSET_BUND" + - "LE\020\010\022\017\n\013CALL_UBUNTU\020\t\022\024\n\020CALL_SITE_AVATA" + - "R\020\n\022\013\n\007COMMENT\020\013\022\021\n\rSET_SITUATION\020\014\022\r\n\tN" + - "EW_TITLE\020\r\022\026\n\022STOP_SAVING_BUNDLE\020\016\022\020\n\014SA" + - "VED_BUNDLE\020\017\022\017\n\013SAVE_BUNDLE\020\020\022\016\n\nENTER_S" + - "ITE\020\021\022\r\n\tQUIT_SITE\020\022\022\017\n\013WIPE_UBUNTU\020\023\022\014\n" + - "\010NEW_SITE\020\024\022\016\n\nNEW_UBUNTU\020\025\022\020\n\014EXILE_AVA" + - "TAR\020\026\022\023\n\017NEW_SILENT_SITE\020\027\022\r\n\tESTABLISH\020" + - "\030\022\022\n\016CALL_CONFIGURE\020\031\022\021\n\rSET_CONFIGURE\020\032" + - "\022\017\n\013NOTIFY_INFO\020\033\022\014\n\010LEVY_NET\020\034\022\014\n\010COMPI" + - "LED\020\035\022\014\n\010CALL_NET\020\036\022\026\n\022SET_MODE_COMPONEN" + - "T\020\037\022\034\n\030SET_FAVOR_MODE_COMPONENT\020 \022\031\n\025SET" + - "_VALID_HUNTER_MODE\020!\022\032\n\026CALL_NET_SITE_CO" + - "MMENTS\020\"\022\021\n\rSET_NOTE_FILE\020#\022\021\n\rSET_SITE_" + - "NAME\020$\022\021\n\rSET_SITE_HAND\020%\022\014\n\010QUIT_NET\020&\022" + - "\024\n\020SAVING_AS_BUNDLE\020\'\022\023\n\017SAVED_AS_BUNDLE" + - "\020(\022\031\n\025STOP_SAVING_AS_BUNDLE\020)\022\025\n\021SAVE_DE" + - "FAULT_NOTE\020*\022\r\n\tPOST_FILE\020+\022\023\n\017SAVE_DEFA" + - "ULT_UI\020,\022\036\n\032SET_FAVOR_AUDIO_MULTIPLIER\020-" + - "\022\021\n\rCALL_SITE_NET\020.\022\016\n\nNOTIFY_YES\020/\022\013\n\007C" + - "ALL_IO\0200\022\025\n\021CALL_IO_COMPONENT\0201\022\017\n\013COMPI" + - "LED_IO\0202\022\013\n\007LEVY_IO\0203\022\014\n\010IO_INPUT\0204\022\014\n\010I" + - "O_JUDGE\0205\022\026\n\022IO_NOTE_VISIBILITY\0206\022\025\n\021IO_" + - "JUDGMENT_METER\0208\022\021\n\rIO_MULTIPLIER\0209\022\027\n\023I" + - "O_AUDIO_MULTIPLIER\020:\022\014\n\010IO_PAUSE\020;\022\013\n\007IO" + - "_QUIT\020<\022\n\n\006IO_NOT\020=\022\017\n\013AUDIO_INPUT\020>\022\034\n\030" + - "CALL_SITE_MODE_COMPONENT\020?\022\016\n\nCOMMENTARY" + - "\020A\022\r\n\tWWW_LEVEL\020B\022\020\n\014AVATAR_TITLE\020C\022\035\n\031I" + - "NVALIDATE_AVATAR_DRAWING\020D\022\033\n\027INVALIDATE" + - "_AVATAR_TITLE\020E\022\014\n\010LEVEL_UP\020F\022\027\n\023SET_FAV" + - "OR_NOTE_FILE\020G\022\022\n\016GET_SITE_YELLS\020H\022\020\n\014SE" + - "T_LANGUAGE\020I\022\021\n\rVALVE_COMMENT\020J\022\016\n\nABILI" + - "TY_UP\020K\022\t\n\005CLOSE\020L\022\024\n\020UNAVAILABLE_DATE\020M" + - "\022\017\n\013AVATAR_EDGE\020N\022\032\n\026INVALIDATE_AVATAR_E" + - "DGE\020O\022\031\n\025FAILED_VALIDATE_TOTEM\020P\022\024\n\020MODI" + - "FY_SITE_YELL\020Q\022\022\n\016WIPE_SITE_YELL\020R\022\032\n\026AL" + - "READY_LOADING_BUNDLE\020S\022\r\n\tSET_FAVOR\020T\022\026\n" + - "\022SET_AUTO_SITE_HAND\020U\022\024\n\020SET_AVATAR_GROU" + - "P\020V\022\r\n\tPOST_ITEM\020W\022\026\n\022SET_VALID_NET_MODE" + - "\020X\022\036\n\032SET_ALLOWED_POSTABLE_ITEMS\020YB\n\n\010fa" + - "stTextb\006proto3" + "AvatarNetStatus\022\r\n\005stand\030\004 \001(\005\022\014\n\004band\030\005" + + " \001(\005\022\023\n\013highestBand\030\006 \001(\005\022\r\n\005point\030\007 \001(\001" + + "\022\021\n\thitPoints\030\010 \001(\001\022\020\n\010isFailed\030\t \001(\010\022\022\n" + + "\nlastJudged\030\n \001(\005\022#\n\010drawings\030\013 \003(\0132\021.Ev" + + "ent.NetDrawing\0221\n\020drawingComponent\030\014 \001(\013" + + "2\027.Event.DrawingComponent\022\r\n\005title\030\r \001(\t" + + "\022\016\n\006artist\030\016 \001(\t\022\r\n\005genre\030\017 \001(\t\022\r\n\005level" + + "\030\020 \001(\005\022\021\n\tlevelText\030\021 \001(\t\022\023\n\013wantLevelID" + + "\030\022 \001(\t\022\020\n\010autoMode\030\023 \001(\005\022\024\n\014noteSaltMode" + + "\030\024 \001(\005\022\027\n\017audioMultiplier\030\025 \001(\001\022\025\n\rfaint" + + "NoteMode\030\026 \001(\005\022\024\n\014judgmentMode\030\027 \001(\005\022\025\n\r" + + "hitPointsMode\030\030 \001(\005\022\030\n\020noteMobilityMode\030" + + "\031 \001(\005\022\024\n\014longNoteMode\030\032 \001(\005\022\026\n\016inputFavo" + + "rMode\030\033 \001(\005\022\026\n\016noteModifyMode\030\034 \001(\005\022\017\n\007b" + + "pmMode\030\035 \001(\005\022\020\n\010waveMode\030\036 \001(\005\022\023\n\013setNot" + + "eMode\030\037 \001(\005\022#\n\033lowestJudgmentConditionMo" + + "de\030 \001(\005\022\022\n\ntotalNotes\030! \001(\005\022\025\n\rjudgment" + + "Stage\030\" \001(\001\022\026\n\016hitPointsValue\030# \001(\001\022\031\n\021h" + + "ighestInputCount\030$ \001(\005\022\016\n\006length\030% \001(\001\022\013" + + "\n\003bpm\030& \001(\001\022\022\n\nmultiplier\030\' \001(\001\022\021\n\tinput" + + "Mode\030( \001(\005\022\030\n\020highestJudgment0\030) \001(\001\022\027\n\017" + + "higherJudgment0\030* \001(\001\022\025\n\rhighJudgment0\030+" + + " \001(\001\022\024\n\014lowJudgment0\030, \001(\001\022\026\n\016lowerJudgm" + + "ent0\030- \001(\001\022\027\n\017lowestJudgment0\030. \001(\001\022\030\n\020h" + + "ighestJudgment1\030/ \001(\001\022\027\n\017higherJudgment1" + + "\0300 \001(\001\022\025\n\rhighJudgment1\0301 \001(\001\022\024\n\014lowJudg" + + "ment1\0302 \001(\001\022\026\n\016lowerJudgment1\0303 \001(\001\022\027\n\017l" + + "owestJudgment1\0304 \001(\001\022\027\n\017highestJudgment\030" + + "5 \001(\005\022\026\n\016higherJudgment\0306 \001(\005\022\024\n\014highJud" + + "gment\0307 \001(\005\022\023\n\013lowJudgment\0308 \001(\005\022\025\n\rlowe" + + "rJudgment\0309 \001(\005\022\026\n\016lowestJudgment\030: \001(\005\032" + + "\276\001\n\nNetDrawing\0221\n\016drawingVariety\030\001 \001(\0162\031" + + ".Event.NetDrawing.Variety\022\r\n\005param\030\002 \001(\r" + + "\022\021\n\tposition0\030\003 \001(\001\022\021\n\tposition1\030\004 \001(\001\022\016" + + "\n\006length\030\005 \001(\001\022\016\n\006height\030\006 \001(\001\"(\n\007Variet" + + "y\022\010\n\004Note\020\000\022\010\n\004Main\020\001\022\t\n\005Meter\020\002\032G\n\020Draw" + + "ingComponent\022\025\n\rp2BuiltLength\030\001 \001(\002\022\034\n\024j" + + "udgmentMainPosition\030\002 \001(\002\032U\n\017QwilightIOI" + + "nput\022\021\n\tavatarIDs\030\001 \003(\t\022\021\n\thandlerID\030\002 \001" + + "(\t\022\r\n\005input\030\003 \001(\005\022\r\n\005power\030\004 \001(\005\032B\n\017Twil" + + "ightIOInput\022\021\n\thandlerID\030\001 \001(\t\022\r\n\005input\030" + + "\002 \001(\005\022\r\n\005power\030\003 \001(\005\032W\n\017QwilightIOJudge\022" + + "\021\n\tavatarIDs\030\001 \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\016\n" + + "\006noteID\030\003 \001(\005\022\016\n\006judged\030\004 \001(\005\032D\n\017Twiligh" + + "tIOJudge\022\021\n\thandlerID\030\001 \001(\t\022\016\n\006noteID\030\002 " + + "\001(\005\022\016\n\006judged\030\003 \001(\005\032u\n\027QwilightIOJudgmen" + + "tMeter\022\021\n\tavatarIDs\030\001 \003(\t\022\021\n\thandlerID\030\002" + + " \001(\t\022\r\n\005input\030\003 \001(\005\022\025\n\rjudgmentMeter\030\004 \001" + + "(\001\022\016\n\006assist\030\005 \001(\005\032b\n\027TwilightIOJudgment" + + "Meter\022\021\n\thandlerID\030\001 \001(\t\022\r\n\005input\030\002 \001(\005\022" + + "\025\n\rjudgmentMeter\030\003 \001(\001\022\016\n\006assist\030\004 \001(\005\032\204" + + "\001\n\030QwilightIONoteVisibility\022\021\n\tavatarIDs" + + "\030\001 \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\016\n\006noteID\030\003 \001(" + + "\005\022\033\n\023setValidJudgedNotes\030\004 \001(\010\022\025\n\rsetNot" + + "eFailed\030\005 \001(\010\032q\n\030TwilightIONoteVisibilit" + + "y\022\021\n\thandlerID\030\001 \001(\t\022\016\n\006noteID\030\002 \001(\005\022\033\n\023" + + "setValidJudgedNotes\030\003 \001(\010\022\025\n\rsetNoteFail" + + "ed\030\004 \001(\010\032P\n\024QwilightIOMultiplier\022\021\n\tavat" + + "arIDs\030\001 \003(\t\022\021\n\thandlerID\030\002 \001(\t\022\022\n\nmultip" + + "lier\030\003 \001(\001\032=\n\024TwilightIOMultiplier\022\021\n\tha" + + "ndlerID\030\001 \001(\t\022\022\n\nmultiplier\030\002 \001(\001\032Z\n\031Qwi" + + "lightIOAudioMultiplier\022\021\n\tavatarIDs\030\001 \003(" + + "\t\022\021\n\thandlerID\030\002 \001(\t\022\027\n\017audioMultiplier\030" + + "\003 \001(\001\032G\n\031TwilightIOAudioMultiplier\022\021\n\tha" + + "ndlerID\030\001 \001(\t\022\027\n\017audioMultiplier\030\002 \001(\001\0326" + + "\n\022TwilightAudioInput\022\016\n\006siteID\030\001 \001(\t\022\020\n\010" + + "avatarID\030\002 \001(\t\032\206\001\n\020QwilightPostItem\022\016\n\006s" + + "iteID\030\001 \001(\t\022\021\n\thandlerID\030\002 \001(\t\022\022\n\nposted" + + "Item\030\003 \001(\005\022\022\n\nisPositive\030\004 \001(\005\022\022\n\nlowest" + + "Wait\030\005 \001(\001\022\023\n\013highestWait\030\006 \001(\001\032[\n\020Twili" + + "ghtPostItem\022\021\n\thandlerID\030\001 \001(\t\022\022\n\nposted" + + "Item\030\002 \001(\005\022\022\n\navatarName\030\003 \001(\t\022\014\n\004wait\030\004" + + " \001(\001\"5\n\017AvatarNetStatus\022\013\n\007Default\020\000\022\t\n\005" + + "Clear\020\001\022\n\n\006Failed\020\002\"\252\r\n\007EventID\022\013\n\007SIGN_" + + "IN\020\000\022\017\n\013NOT_SIGN_IN\020\001\022\013\n\007WARNING\020\002\022\r\n\tSI" + + "TE_YELL\020\003\022\017\n\013CALL_BUNDLE\020\004\022\022\n\016SAVE_AS_BU" + + "NDLE\020\005\022\021\n\rSAVING_BUNDLE\020\006\022\017\n\013WIPE_BUNDLE" + + "\020\007\022\016\n\nSET_BUNDLE\020\010\022\017\n\013CALL_UBUNTU\020\t\022\024\n\020C" + + "ALL_SITE_AVATAR\020\n\022\013\n\007COMMENT\020\013\022\021\n\rSET_SI" + + "TUATION\020\014\022\r\n\tNEW_TITLE\020\r\022\026\n\022STOP_SAVING_" + + "BUNDLE\020\016\022\020\n\014SAVED_BUNDLE\020\017\022\017\n\013SAVE_BUNDL" + + "E\020\020\022\016\n\nENTER_SITE\020\021\022\r\n\tQUIT_SITE\020\022\022\017\n\013WI" + + "PE_UBUNTU\020\023\022\014\n\010NEW_SITE\020\024\022\016\n\nNEW_UBUNTU\020" + + "\025\022\020\n\014EXILE_AVATAR\020\026\022\023\n\017NEW_SILENT_SITE\020\027" + + "\022\r\n\tESTABLISH\020\030\022\022\n\016CALL_CONFIGURE\020\031\022\021\n\rS" + + "ET_CONFIGURE\020\032\022\017\n\013NOTIFY_INFO\020\033\022\014\n\010LEVY_" + + "NET\020\034\022\014\n\010COMPILED\020\035\022\014\n\010CALL_NET\020\036\022\026\n\022SET" + + "_MODE_COMPONENT\020\037\022\034\n\030SET_FAVOR_MODE_COMP" + + "ONENT\020 \022\031\n\025SET_VALID_HUNTER_MODE\020!\022\032\n\026CA" + + "LL_NET_SITE_COMMENTS\020\"\022\021\n\rSET_NOTE_FILE\020" + + "#\022\021\n\rSET_SITE_NAME\020$\022\021\n\rSET_SITE_HAND\020%\022" + + "\014\n\010QUIT_NET\020&\022\024\n\020SAVING_AS_BUNDLE\020\'\022\023\n\017S" + + "AVED_AS_BUNDLE\020(\022\031\n\025STOP_SAVING_AS_BUNDL" + + "E\020)\022\025\n\021SAVE_DEFAULT_NOTE\020*\022\r\n\tPOST_FILE\020" + + "+\022\023\n\017SAVE_DEFAULT_UI\020,\022\036\n\032SET_FAVOR_AUDI" + + "O_MULTIPLIER\020-\022\021\n\rCALL_SITE_NET\020.\022\016\n\nNOT" + + "IFY_YES\020/\022\013\n\007CALL_IO\0200\022\025\n\021CALL_IO_COMPON" + + "ENT\0201\022\017\n\013COMPILED_IO\0202\022\013\n\007LEVY_IO\0203\022\014\n\010I" + + "O_INPUT\0204\022\014\n\010IO_JUDGE\0205\022\026\n\022IO_NOTE_VISIB" + + "ILITY\0206\022\025\n\021IO_JUDGMENT_METER\0208\022\021\n\rIO_MUL" + + "TIPLIER\0209\022\027\n\023IO_AUDIO_MULTIPLIER\020:\022\014\n\010IO" + + "_PAUSE\020;\022\013\n\007IO_QUIT\020<\022\n\n\006IO_NOT\020=\022\017\n\013AUD" + + "IO_INPUT\020>\022\034\n\030CALL_SITE_MODE_COMPONENT\020?" + + "\022\016\n\nCOMMENTARY\020A\022\r\n\tWWW_LEVEL\020B\022\020\n\014AVATA" + + "R_TITLE\020C\022\035\n\031INVALIDATE_AVATAR_DRAWING\020D" + + "\022\033\n\027INVALIDATE_AVATAR_TITLE\020E\022\014\n\010LEVEL_U" + + "P\020F\022\027\n\023SET_FAVOR_NOTE_FILE\020G\022\022\n\016GET_SITE" + + "_YELLS\020H\022\020\n\014SET_LANGUAGE\020I\022\021\n\rVALVE_COMM" + + "ENT\020J\022\016\n\nABILITY_UP\020K\022\t\n\005CLOSE\020L\022\024\n\020UNAV" + + "AILABLE_DATE\020M\022\017\n\013AVATAR_EDGE\020N\022\032\n\026INVAL" + + "IDATE_AVATAR_EDGE\020O\022\031\n\025FAILED_VALIDATE_T" + + "OTEM\020P\022\024\n\020MODIFY_SITE_YELL\020Q\022\022\n\016WIPE_SIT" + + "E_YELL\020R\022\032\n\026ALREADY_LOADING_BUNDLE\020S\022\r\n\t" + + "SET_FAVOR\020T\022\026\n\022SET_AUTO_SITE_HAND\020U\022\024\n\020S" + + "ET_AVATAR_GROUP\020V\022\r\n\tPOST_ITEM\020W\022\026\n\022SET_" + + "VALID_NET_MODE\020X\022\036\n\032SET_ALLOWED_POSTABLE" + + "_ITEMS\020YB\n\n\010fastTextb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -28432,7 +28504,7 @@ internal_static_Event_QwilightCallNet_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Event_QwilightCallNet_descriptor, - new java.lang.String[] { "SiteID", "HandlerID", "AvatarNetStatus", "Stand", "HighestBand", "Point", "HitPoints", "IsFailed", "LastJudged", "Drawings", "DrawingComponent", "Title", "Artist", "Genre", "Level", "LevelText", "WantLevelID", "AutoMode", "NoteSaltMode", "AudioMultiplier", "FaintNoteMode", "JudgmentMode", "HitPointsMode", "NoteMobilityMode", "LongNoteMode", "InputFavorMode", "NoteModifyMode", "BpmMode", "WaveMode", "SetNoteMode", "LowestJudgmentConditionMode", "TotalNotes", "JudgmentStage", "HitPointsValue", "HighestInputCount", "Length", "Bpm", "Multiplier", "InputMode", "HighestJudgment0", "HigherJudgment0", "HighJudgment0", "LowJudgment0", "LowerJudgment0", "LowestJudgment0", "HighestJudgment1", "HigherJudgment1", "HighJudgment1", "LowJudgment1", "LowerJudgment1", "LowestJudgment1", "HighestJudgment", "HigherJudgment", "HighJudgment", "LowJudgment", "LowerJudgment", "LowestJudgment", }); + new java.lang.String[] { "SiteID", "HandlerID", "AvatarNetStatus", "Stand", "Band", "HighestBand", "Point", "HitPoints", "IsFailed", "LastJudged", "Drawings", "DrawingComponent", "Title", "Artist", "Genre", "Level", "LevelText", "WantLevelID", "AutoMode", "NoteSaltMode", "AudioMultiplier", "FaintNoteMode", "JudgmentMode", "HitPointsMode", "NoteMobilityMode", "LongNoteMode", "InputFavorMode", "NoteModifyMode", "BpmMode", "WaveMode", "SetNoteMode", "LowestJudgmentConditionMode", "TotalNotes", "JudgmentStage", "HitPointsValue", "HighestInputCount", "Length", "Bpm", "Multiplier", "InputMode", "HighestJudgment0", "HigherJudgment0", "HighJudgment0", "LowJudgment0", "LowerJudgment0", "LowestJudgment0", "HighestJudgment1", "HigherJudgment1", "HighJudgment1", "LowJudgment1", "LowerJudgment1", "LowestJudgment1", "HighestJudgment", "HigherJudgment", "HighJudgment", "LowJudgment", "LowerJudgment", "LowestJudgment", }); internal_static_Event_NetDrawing_descriptor = internal_static_Event_descriptor.getNestedTypes().get(2); internal_static_Event_NetDrawing_fieldAccessorTable = new diff --git a/src/main/kotlin/EventKt.kt b/src/main/kotlin/EventKt.kt index 895b23c..8997b5d 100644 --- a/src/main/kotlin/EventKt.kt +++ b/src/main/kotlin/EventKt.kt @@ -1103,7 +1103,24 @@ } /** - * `int32 highestBand = 5;` + * `int32 band = 5;` + */ + public var band: kotlin.Int + @JvmName("getBand") + get() = _builder.getBand() + @JvmName("setBand") + set(value) { + _builder.setBand(value) + } + /** + * `int32 band = 5;` + */ + public fun clearBand() { + _builder.clearBand() + } + + /** + * `int32 highestBand = 6;` */ public var highestBand: kotlin.Int @JvmName("getHighestBand") @@ -1113,14 +1130,14 @@ _builder.setHighestBand(value) } /** - * `int32 highestBand = 5;` + * `int32 highestBand = 6;` */ public fun clearHighestBand() { _builder.clearHighestBand() } /** - * `double point = 6;` + * `double point = 7;` */ public var point: kotlin.Double @JvmName("getPoint") @@ -1130,14 +1147,14 @@ _builder.setPoint(value) } /** - * `double point = 6;` + * `double point = 7;` */ public fun clearPoint() { _builder.clearPoint() } /** - * `double hitPoints = 7;` + * `double hitPoints = 8;` */ public var hitPoints: kotlin.Double @JvmName("getHitPoints") @@ -1147,14 +1164,14 @@ _builder.setHitPoints(value) } /** - * `double hitPoints = 7;` + * `double hitPoints = 8;` */ public fun clearHitPoints() { _builder.clearHitPoints() } /** - * `bool isFailed = 8;` + * `bool isFailed = 9;` */ public var isFailed: kotlin.Boolean @JvmName("getIsFailed") @@ -1164,14 +1181,14 @@ _builder.setIsFailed(value) } /** - * `bool isFailed = 8;` + * `bool isFailed = 9;` */ public fun clearIsFailed() { _builder.clearIsFailed() } /** - * `int32 lastJudged = 9;` + * `int32 lastJudged = 10;` */ public var lastJudged: kotlin.Int @JvmName("getLastJudged") @@ -1181,7 +1198,7 @@ _builder.setLastJudged(value) } /** - * `int32 lastJudged = 9;` + * `int32 lastJudged = 10;` */ public fun clearLastJudged() { _builder.clearLastJudged() @@ -1194,7 +1211,7 @@ @kotlin.OptIn(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class) public class DrawingsProxy private constructor() : com.google.protobuf.kotlin.DslProxy() /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` */ public val drawings: com.google.protobuf.kotlin.DslList @kotlin.jvm.JvmSynthetic @@ -1202,7 +1219,7 @@ _builder.getDrawingsList() ) /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` * @param value The drawings to add. */ @kotlin.jvm.JvmSynthetic @@ -1211,7 +1228,7 @@ _builder.addDrawings(value) } /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` * @param value The drawings to add. */ @kotlin.jvm.JvmSynthetic @@ -1221,7 +1238,7 @@ add(value) } /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` * @param values The drawings to add. */ @kotlin.jvm.JvmSynthetic @@ -1230,7 +1247,7 @@ _builder.addAllDrawings(values) } /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` * @param values The drawings to add. */ @kotlin.jvm.JvmSynthetic @@ -1240,7 +1257,7 @@ addAll(values) } /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` * @param index The index to set the value at. * @param value The drawings to set. */ @@ -1250,7 +1267,7 @@ _builder.setDrawings(index, value) } /** - * `repeated .Event.NetDrawing drawings = 10;` + * `repeated .Event.NetDrawing drawings = 11;` */ @kotlin.jvm.JvmSynthetic @kotlin.jvm.JvmName("clearDrawings") @@ -1260,7 +1277,7 @@ /** - * `.Event.DrawingComponent drawingComponent = 11;` + * `.Event.DrawingComponent drawingComponent = 12;` */ public var drawingComponent: EventOuterClass.Event.DrawingComponent @JvmName("getDrawingComponent") @@ -1270,13 +1287,13 @@ _builder.setDrawingComponent(value) } /** - * `.Event.DrawingComponent drawingComponent = 11;` + * `.Event.DrawingComponent drawingComponent = 12;` */ public fun clearDrawingComponent() { _builder.clearDrawingComponent() } /** - * `.Event.DrawingComponent drawingComponent = 11;` + * `.Event.DrawingComponent drawingComponent = 12;` * @return Whether the drawingComponent field is set. */ public fun hasDrawingComponent(): kotlin.Boolean { @@ -1284,7 +1301,7 @@ } /** - * `string title = 12;` + * `string title = 13;` */ public var title: kotlin.String @JvmName("getTitle") @@ -1294,14 +1311,14 @@ _builder.setTitle(value) } /** - * `string title = 12;` + * `string title = 13;` */ public fun clearTitle() { _builder.clearTitle() } /** - * `string artist = 13;` + * `string artist = 14;` */ public var artist: kotlin.String @JvmName("getArtist") @@ -1311,14 +1328,14 @@ _builder.setArtist(value) } /** - * `string artist = 13;` + * `string artist = 14;` */ public fun clearArtist() { _builder.clearArtist() } /** - * `string genre = 14;` + * `string genre = 15;` */ public var genre: kotlin.String @JvmName("getGenre") @@ -1328,14 +1345,14 @@ _builder.setGenre(value) } /** - * `string genre = 14;` + * `string genre = 15;` */ public fun clearGenre() { _builder.clearGenre() } /** - * `int32 level = 15;` + * `int32 level = 16;` */ public var level: kotlin.Int @JvmName("getLevel") @@ -1345,14 +1362,14 @@ _builder.setLevel(value) } /** - * `int32 level = 15;` + * `int32 level = 16;` */ public fun clearLevel() { _builder.clearLevel() } /** - * `string levelText = 16;` + * `string levelText = 17;` */ public var levelText: kotlin.String @JvmName("getLevelText") @@ -1362,14 +1379,14 @@ _builder.setLevelText(value) } /** - * `string levelText = 16;` + * `string levelText = 17;` */ public fun clearLevelText() { _builder.clearLevelText() } /** - * `string wantLevelID = 17;` + * `string wantLevelID = 18;` */ public var wantLevelID: kotlin.String @JvmName("getWantLevelID") @@ -1379,14 +1396,14 @@ _builder.setWantLevelID(value) } /** - * `string wantLevelID = 17;` + * `string wantLevelID = 18;` */ public fun clearWantLevelID() { _builder.clearWantLevelID() } /** - * `int32 autoMode = 18;` + * `int32 autoMode = 19;` */ public var autoMode: kotlin.Int @JvmName("getAutoMode") @@ -1396,14 +1413,14 @@ _builder.setAutoMode(value) } /** - * `int32 autoMode = 18;` + * `int32 autoMode = 19;` */ public fun clearAutoMode() { _builder.clearAutoMode() } /** - * `int32 noteSaltMode = 19;` + * `int32 noteSaltMode = 20;` */ public var noteSaltMode: kotlin.Int @JvmName("getNoteSaltMode") @@ -1413,14 +1430,14 @@ _builder.setNoteSaltMode(value) } /** - * `int32 noteSaltMode = 19;` + * `int32 noteSaltMode = 20;` */ public fun clearNoteSaltMode() { _builder.clearNoteSaltMode() } /** - * `double audioMultiplier = 20;` + * `double audioMultiplier = 21;` */ public var audioMultiplier: kotlin.Double @JvmName("getAudioMultiplier") @@ -1430,14 +1447,14 @@ _builder.setAudioMultiplier(value) } /** - * `double audioMultiplier = 20;` + * `double audioMultiplier = 21;` */ public fun clearAudioMultiplier() { _builder.clearAudioMultiplier() } /** - * `int32 faintNoteMode = 21;` + * `int32 faintNoteMode = 22;` */ public var faintNoteMode: kotlin.Int @JvmName("getFaintNoteMode") @@ -1447,14 +1464,14 @@ _builder.setFaintNoteMode(value) } /** - * `int32 faintNoteMode = 21;` + * `int32 faintNoteMode = 22;` */ public fun clearFaintNoteMode() { _builder.clearFaintNoteMode() } /** - * `int32 judgmentMode = 22;` + * `int32 judgmentMode = 23;` */ public var judgmentMode: kotlin.Int @JvmName("getJudgmentMode") @@ -1464,14 +1481,14 @@ _builder.setJudgmentMode(value) } /** - * `int32 judgmentMode = 22;` + * `int32 judgmentMode = 23;` */ public fun clearJudgmentMode() { _builder.clearJudgmentMode() } /** - * `int32 hitPointsMode = 23;` + * `int32 hitPointsMode = 24;` */ public var hitPointsMode: kotlin.Int @JvmName("getHitPointsMode") @@ -1481,14 +1498,14 @@ _builder.setHitPointsMode(value) } /** - * `int32 hitPointsMode = 23;` + * `int32 hitPointsMode = 24;` */ public fun clearHitPointsMode() { _builder.clearHitPointsMode() } /** - * `int32 noteMobilityMode = 24;` + * `int32 noteMobilityMode = 25;` */ public var noteMobilityMode: kotlin.Int @JvmName("getNoteMobilityMode") @@ -1498,14 +1515,14 @@ _builder.setNoteMobilityMode(value) } /** - * `int32 noteMobilityMode = 24;` + * `int32 noteMobilityMode = 25;` */ public fun clearNoteMobilityMode() { _builder.clearNoteMobilityMode() } /** - * `int32 longNoteMode = 25;` + * `int32 longNoteMode = 26;` */ public var longNoteMode: kotlin.Int @JvmName("getLongNoteMode") @@ -1515,14 +1532,14 @@ _builder.setLongNoteMode(value) } /** - * `int32 longNoteMode = 25;` + * `int32 longNoteMode = 26;` */ public fun clearLongNoteMode() { _builder.clearLongNoteMode() } /** - * `int32 inputFavorMode = 26;` + * `int32 inputFavorMode = 27;` */ public var inputFavorMode: kotlin.Int @JvmName("getInputFavorMode") @@ -1532,14 +1549,14 @@ _builder.setInputFavorMode(value) } /** - * `int32 inputFavorMode = 26;` + * `int32 inputFavorMode = 27;` */ public fun clearInputFavorMode() { _builder.clearInputFavorMode() } /** - * `int32 noteModifyMode = 27;` + * `int32 noteModifyMode = 28;` */ public var noteModifyMode: kotlin.Int @JvmName("getNoteModifyMode") @@ -1549,14 +1566,14 @@ _builder.setNoteModifyMode(value) } /** - * `int32 noteModifyMode = 27;` + * `int32 noteModifyMode = 28;` */ public fun clearNoteModifyMode() { _builder.clearNoteModifyMode() } /** - * `int32 bpmMode = 28;` + * `int32 bpmMode = 29;` */ public var bpmMode: kotlin.Int @JvmName("getBpmMode") @@ -1566,14 +1583,14 @@ _builder.setBpmMode(value) } /** - * `int32 bpmMode = 28;` + * `int32 bpmMode = 29;` */ public fun clearBpmMode() { _builder.clearBpmMode() } /** - * `int32 waveMode = 29;` + * `int32 waveMode = 30;` */ public var waveMode: kotlin.Int @JvmName("getWaveMode") @@ -1583,14 +1600,14 @@ _builder.setWaveMode(value) } /** - * `int32 waveMode = 29;` + * `int32 waveMode = 30;` */ public fun clearWaveMode() { _builder.clearWaveMode() } /** - * `int32 setNoteMode = 30;` + * `int32 setNoteMode = 31;` */ public var setNoteMode: kotlin.Int @JvmName("getSetNoteMode") @@ -1600,14 +1617,14 @@ _builder.setSetNoteMode(value) } /** - * `int32 setNoteMode = 30;` + * `int32 setNoteMode = 31;` */ public fun clearSetNoteMode() { _builder.clearSetNoteMode() } /** - * `int32 lowestJudgmentConditionMode = 31;` + * `int32 lowestJudgmentConditionMode = 32;` */ public var lowestJudgmentConditionMode: kotlin.Int @JvmName("getLowestJudgmentConditionMode") @@ -1617,14 +1634,14 @@ _builder.setLowestJudgmentConditionMode(value) } /** - * `int32 lowestJudgmentConditionMode = 31;` + * `int32 lowestJudgmentConditionMode = 32;` */ public fun clearLowestJudgmentConditionMode() { _builder.clearLowestJudgmentConditionMode() } /** - * `int32 totalNotes = 32;` + * `int32 totalNotes = 33;` */ public var totalNotes: kotlin.Int @JvmName("getTotalNotes") @@ -1634,14 +1651,14 @@ _builder.setTotalNotes(value) } /** - * `int32 totalNotes = 32;` + * `int32 totalNotes = 33;` */ public fun clearTotalNotes() { _builder.clearTotalNotes() } /** - * `double judgmentStage = 33;` + * `double judgmentStage = 34;` */ public var judgmentStage: kotlin.Double @JvmName("getJudgmentStage") @@ -1651,14 +1668,14 @@ _builder.setJudgmentStage(value) } /** - * `double judgmentStage = 33;` + * `double judgmentStage = 34;` */ public fun clearJudgmentStage() { _builder.clearJudgmentStage() } /** - * `double hitPointsValue = 34;` + * `double hitPointsValue = 35;` */ public var hitPointsValue: kotlin.Double @JvmName("getHitPointsValue") @@ -1668,14 +1685,14 @@ _builder.setHitPointsValue(value) } /** - * `double hitPointsValue = 34;` + * `double hitPointsValue = 35;` */ public fun clearHitPointsValue() { _builder.clearHitPointsValue() } /** - * `int32 highestInputCount = 35;` + * `int32 highestInputCount = 36;` */ public var highestInputCount: kotlin.Int @JvmName("getHighestInputCount") @@ -1685,14 +1702,14 @@ _builder.setHighestInputCount(value) } /** - * `int32 highestInputCount = 35;` + * `int32 highestInputCount = 36;` */ public fun clearHighestInputCount() { _builder.clearHighestInputCount() } /** - * `double length = 36;` + * `double length = 37;` */ public var length: kotlin.Double @JvmName("getLength") @@ -1702,14 +1719,14 @@ _builder.setLength(value) } /** - * `double length = 36;` + * `double length = 37;` */ public fun clearLength() { _builder.clearLength() } /** - * `double bpm = 37;` + * `double bpm = 38;` */ public var bpm: kotlin.Double @JvmName("getBpm") @@ -1719,14 +1736,14 @@ _builder.setBpm(value) } /** - * `double bpm = 37;` + * `double bpm = 38;` */ public fun clearBpm() { _builder.clearBpm() } /** - * `double multiplier = 38;` + * `double multiplier = 39;` */ public var multiplier: kotlin.Double @JvmName("getMultiplier") @@ -1736,14 +1753,14 @@ _builder.setMultiplier(value) } /** - * `double multiplier = 38;` + * `double multiplier = 39;` */ public fun clearMultiplier() { _builder.clearMultiplier() } /** - * `int32 inputMode = 39;` + * `int32 inputMode = 40;` */ public var inputMode: kotlin.Int @JvmName("getInputMode") @@ -1753,14 +1770,14 @@ _builder.setInputMode(value) } /** - * `int32 inputMode = 39;` + * `int32 inputMode = 40;` */ public fun clearInputMode() { _builder.clearInputMode() } /** - * `double highestJudgment0 = 40;` + * `double highestJudgment0 = 41;` */ public var highestJudgment0: kotlin.Double @JvmName("getHighestJudgment0") @@ -1770,14 +1787,14 @@ _builder.setHighestJudgment0(value) } /** - * `double highestJudgment0 = 40;` + * `double highestJudgment0 = 41;` */ public fun clearHighestJudgment0() { _builder.clearHighestJudgment0() } /** - * `double higherJudgment0 = 41;` + * `double higherJudgment0 = 42;` */ public var higherJudgment0: kotlin.Double @JvmName("getHigherJudgment0") @@ -1787,14 +1804,14 @@ _builder.setHigherJudgment0(value) } /** - * `double higherJudgment0 = 41;` + * `double higherJudgment0 = 42;` */ public fun clearHigherJudgment0() { _builder.clearHigherJudgment0() } /** - * `double highJudgment0 = 42;` + * `double highJudgment0 = 43;` */ public var highJudgment0: kotlin.Double @JvmName("getHighJudgment0") @@ -1804,14 +1821,14 @@ _builder.setHighJudgment0(value) } /** - * `double highJudgment0 = 42;` + * `double highJudgment0 = 43;` */ public fun clearHighJudgment0() { _builder.clearHighJudgment0() } /** - * `double lowJudgment0 = 43;` + * `double lowJudgment0 = 44;` */ public var lowJudgment0: kotlin.Double @JvmName("getLowJudgment0") @@ -1821,14 +1838,14 @@ _builder.setLowJudgment0(value) } /** - * `double lowJudgment0 = 43;` + * `double lowJudgment0 = 44;` */ public fun clearLowJudgment0() { _builder.clearLowJudgment0() } /** - * `double lowerJudgment0 = 44;` + * `double lowerJudgment0 = 45;` */ public var lowerJudgment0: kotlin.Double @JvmName("getLowerJudgment0") @@ -1838,14 +1855,14 @@ _builder.setLowerJudgment0(value) } /** - * `double lowerJudgment0 = 44;` + * `double lowerJudgment0 = 45;` */ public fun clearLowerJudgment0() { _builder.clearLowerJudgment0() } /** - * `double lowestJudgment0 = 45;` + * `double lowestJudgment0 = 46;` */ public var lowestJudgment0: kotlin.Double @JvmName("getLowestJudgment0") @@ -1855,14 +1872,14 @@ _builder.setLowestJudgment0(value) } /** - * `double lowestJudgment0 = 45;` + * `double lowestJudgment0 = 46;` */ public fun clearLowestJudgment0() { _builder.clearLowestJudgment0() } /** - * `double highestJudgment1 = 46;` + * `double highestJudgment1 = 47;` */ public var highestJudgment1: kotlin.Double @JvmName("getHighestJudgment1") @@ -1872,14 +1889,14 @@ _builder.setHighestJudgment1(value) } /** - * `double highestJudgment1 = 46;` + * `double highestJudgment1 = 47;` */ public fun clearHighestJudgment1() { _builder.clearHighestJudgment1() } /** - * `double higherJudgment1 = 47;` + * `double higherJudgment1 = 48;` */ public var higherJudgment1: kotlin.Double @JvmName("getHigherJudgment1") @@ -1889,14 +1906,14 @@ _builder.setHigherJudgment1(value) } /** - * `double higherJudgment1 = 47;` + * `double higherJudgment1 = 48;` */ public fun clearHigherJudgment1() { _builder.clearHigherJudgment1() } /** - * `double highJudgment1 = 48;` + * `double highJudgment1 = 49;` */ public var highJudgment1: kotlin.Double @JvmName("getHighJudgment1") @@ -1906,14 +1923,14 @@ _builder.setHighJudgment1(value) } /** - * `double highJudgment1 = 48;` + * `double highJudgment1 = 49;` */ public fun clearHighJudgment1() { _builder.clearHighJudgment1() } /** - * `double lowJudgment1 = 49;` + * `double lowJudgment1 = 50;` */ public var lowJudgment1: kotlin.Double @JvmName("getLowJudgment1") @@ -1923,14 +1940,14 @@ _builder.setLowJudgment1(value) } /** - * `double lowJudgment1 = 49;` + * `double lowJudgment1 = 50;` */ public fun clearLowJudgment1() { _builder.clearLowJudgment1() } /** - * `double lowerJudgment1 = 50;` + * `double lowerJudgment1 = 51;` */ public var lowerJudgment1: kotlin.Double @JvmName("getLowerJudgment1") @@ -1940,14 +1957,14 @@ _builder.setLowerJudgment1(value) } /** - * `double lowerJudgment1 = 50;` + * `double lowerJudgment1 = 51;` */ public fun clearLowerJudgment1() { _builder.clearLowerJudgment1() } /** - * `double lowestJudgment1 = 51;` + * `double lowestJudgment1 = 52;` */ public var lowestJudgment1: kotlin.Double @JvmName("getLowestJudgment1") @@ -1957,14 +1974,14 @@ _builder.setLowestJudgment1(value) } /** - * `double lowestJudgment1 = 51;` + * `double lowestJudgment1 = 52;` */ public fun clearLowestJudgment1() { _builder.clearLowestJudgment1() } /** - * `int32 highestJudgment = 52;` + * `int32 highestJudgment = 53;` */ public var highestJudgment: kotlin.Int @JvmName("getHighestJudgment") @@ -1974,14 +1991,14 @@ _builder.setHighestJudgment(value) } /** - * `int32 highestJudgment = 52;` + * `int32 highestJudgment = 53;` */ public fun clearHighestJudgment() { _builder.clearHighestJudgment() } /** - * `int32 higherJudgment = 53;` + * `int32 higherJudgment = 54;` */ public var higherJudgment: kotlin.Int @JvmName("getHigherJudgment") @@ -1991,14 +2008,14 @@ _builder.setHigherJudgment(value) } /** - * `int32 higherJudgment = 53;` + * `int32 higherJudgment = 54;` */ public fun clearHigherJudgment() { _builder.clearHigherJudgment() } /** - * `int32 highJudgment = 54;` + * `int32 highJudgment = 55;` */ public var highJudgment: kotlin.Int @JvmName("getHighJudgment") @@ -2008,14 +2025,14 @@ _builder.setHighJudgment(value) } /** - * `int32 highJudgment = 54;` + * `int32 highJudgment = 55;` */ public fun clearHighJudgment() { _builder.clearHighJudgment() } /** - * `int32 lowJudgment = 55;` + * `int32 lowJudgment = 56;` */ public var lowJudgment: kotlin.Int @JvmName("getLowJudgment") @@ -2025,14 +2042,14 @@ _builder.setLowJudgment(value) } /** - * `int32 lowJudgment = 55;` + * `int32 lowJudgment = 56;` */ public fun clearLowJudgment() { _builder.clearLowJudgment() } /** - * `int32 lowerJudgment = 56;` + * `int32 lowerJudgment = 57;` */ public var lowerJudgment: kotlin.Int @JvmName("getLowerJudgment") @@ -2042,14 +2059,14 @@ _builder.setLowerJudgment(value) } /** - * `int32 lowerJudgment = 56;` + * `int32 lowerJudgment = 57;` */ public fun clearLowerJudgment() { _builder.clearLowerJudgment() } /** - * `int32 lowestJudgment = 57;` + * `int32 lowestJudgment = 58;` */ public var lowestJudgment: kotlin.Int @JvmName("getLowestJudgment") @@ -2059,7 +2076,7 @@ _builder.setLowestJudgment(value) } /** - * `int32 lowestJudgment = 57;` + * `int32 lowestJudgment = 58;` */ public fun clearLowestJudgment() { _builder.clearLowestJudgment() diff --git a/src/main/kotlin/net/taehui/twilight/JSON.kt b/src/main/kotlin/net/taehui/twilight/JSON.kt index 6f63e8e..a88b138 100644 --- a/src/main/kotlin/net/taehui/twilight/JSON.kt +++ b/src/main/kotlin/net/taehui/twilight/JSON.kt @@ -534,13 +534,13 @@ @JsonProperty("target") val target: String ) { - constructor(siteID: String, siteYellItem: SiteYell, target: String) : this( + constructor(siteID: String, siteYell: SiteYell, target: String) : this( siteID, - siteYellItem.avatarID, - siteYellItem.avatarName, - siteYellItem.date, - siteYellItem.siteYell, - siteYellItem.siteYellID, + siteYell.avatarID, + siteYell.avatarName, + siteYell.date, + siteYell.siteYell, + siteYell.siteYellID, target ) } diff --git a/src/main/kotlin/net/taehui/twilight/NetItem.kt b/src/main/kotlin/net/taehui/twilight/NetItem.kt index 0c26008..8d45cb0 100644 --- a/src/main/kotlin/net/taehui/twilight/NetItem.kt +++ b/src/main/kotlin/net/taehui/twilight/NetItem.kt @@ -8,6 +8,7 @@ } var stand = 0 + var band = 0 var highestBand = 0 var point = 1.0 var avatarNetStatus = EventOuterClass.Event.AvatarNetStatus.Default @@ -60,6 +61,7 @@ fun setValues(qwilightCallNet: EventOuterClass.Event.QwilightCallNet, comment: CommentOuterClass.Comment?) { stand = qwilightCallNet.stand + band = qwilightCallNet.band highestBand = qwilightCallNet.highestBand point = qwilightCallNet.point hitPoints = qwilightCallNet.hitPoints diff --git a/src/main/kotlin/net/taehui/twilight/Site.kt b/src/main/kotlin/net/taehui/twilight/Site.kt index 333754e..e07028f 100644 --- a/src/main/kotlin/net/taehui/twilight/Site.kt +++ b/src/main/kotlin/net/taehui/twilight/Site.kt @@ -259,7 +259,7 @@ return when (validHunterMode) { NetItem.STAND_MODE -> netItem.stand.toDouble() NetItem.POINT_MODE -> netItem.point - NetItem.BAND_MODE -> netItem.highestBand.toDouble() + NetItem.BAND_MODE -> netItem.band.toDouble() else -> 0.0 } } @@ -310,30 +310,22 @@ } } - private fun sendSiteYell(twilightSiteYell: JSON.TwilightSiteYell) { - synchronized(avatarsCSX) { - avatars.forEach { - it.send( - EventOuterClass.Event.EventID.SITE_YELL, twilightSiteYell - ) - } - } - PlatformSystem.sendSiteYell(twilightSiteYell) - } - - private fun sendTranslatedSiteYell(twilightSiteYell: JSON.TwilightSiteYell) { + private fun sendSiteYell(siteID: UUID, siteYell: SiteYell, target: String) { + val twilightSiteYell = JSON.TwilightSiteYell(siteID.toString(), siteYell, target) synchronized(avatarsCSX) { avatars.forEach { avatar -> avatar.send( EventOuterClass.Event.EventID.SITE_YELL, twilightSiteYell ) - Translator.translate(avatar.language, twilightSiteYell.siteYell, avatar).thenAccept { - avatar.send( - EventOuterClass.Event.EventID.MODIFY_SITE_YELL, object { - val siteID = this@Site.siteID.toString() - val siteYellID = twilightSiteYell.siteYellID - val siteYell = it - }) + if (siteYell.translate) { + Translator.translate(avatar.language, twilightSiteYell.siteYell, avatar).thenAccept { + avatar.send( + EventOuterClass.Event.EventID.MODIFY_SITE_YELL, object { + val siteID = this@Site.siteID.toString() + val siteYellID = twilightSiteYell.siteYellID + val siteYell = it + }) + } } } } @@ -625,7 +617,7 @@ this.avatarID = it.avatarID this.avatarName = it.avatarName this.stand = it.stand - this.band = it.highestBand + this.band = it.band this.point = it.point this.hitPoints = it.hitPoints this.isFailed = it.failed @@ -728,6 +720,7 @@ val date = it.date val siteYell = if (isWiped) avatarName else it.siteYell val siteYellID = it.siteYellID + val translate = it.translate } }.toList() } @@ -793,7 +786,7 @@ }) data.filter { !it.avatarName.startsWith("@") - }.forEach { siteYell -> + }.filter { it.translate }.forEach { siteYell -> Translator.translate(avatar.language, siteYell.siteYell, avatar).thenAccept { avatar.send(EventOuterClass.Event.EventID.MODIFY_SITE_YELL, object { val siteID = this@Site.siteID.toString() @@ -886,15 +879,15 @@ fun putSiteYell(siteID: UUID, siteName: String, avatarID: String, avatarName: String, millis: Long) { val target = getTarget(avatarID) - sendSiteYell(JSON.TwilightSiteYell(SiteHandler.defaultSiteID.toString(), synchronized(siteYells) { + sendSiteYell(SiteHandler.defaultSiteID, synchronized(siteYells) { val siteYell = SiteYell(avatarID, "@Invite", millis, ObjectMapper().writeValueAsString(object { val avatarName = avatarName val siteID = siteID.toString() val siteName = siteName - }), siteYells.size, -1) + }), siteYells.size, -1, false) putSiteYell(siteYell) siteYell - }, target)) + }, target) } fun putSiteYell(tvItem: TVSystem.TVItem) { @@ -906,29 +899,30 @@ System.currentTimeMillis(), ObjectMapper().writeValueAsString(tvItem), siteYells.size, - -1 + -1, + false ) putSiteYell(siteYell) siteYell } - sendSiteYell(JSON.TwilightSiteYell(SiteHandler.defaultSiteID.toString(), siteYell, target)) + sendSiteYell(SiteHandler.defaultSiteID, siteYell, target) DB.saveSiteYell(siteID.toString(), siteYell) } fun putSiteYell(situation: String, avatarID: String, avatarName: String, millis: Long) { val target = getTarget(avatarID) val siteYell = synchronized(siteYells) { - val siteYell = SiteYell(avatarID, situation, millis, avatarName, siteYells.size, -1) + val siteYell = SiteYell(avatarID, situation, millis, avatarName, siteYells.size, -1, false) putSiteYell(siteYell) siteYell } - sendSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, target)) + sendSiteYell(siteID, siteYell, target) if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) } } - fun putSiteYell(avatar: Avatar, qwilightSiteYell: JSON.QwilightSiteYell) { + fun putSiteYell(avatar: Avatar, qwilightSiteYell: JSON.QwilightSiteYell, translate: Boolean) { synchronized(avatarsCSX) { if (isAvatarJoined(avatar)) { if (isEditable) { @@ -947,17 +941,16 @@ millis, qwilightSiteYell.siteYell, siteYells.size, - -1 + -1, + translate ) putSiteYell(siteYell) siteYell } - sendTranslatedSiteYell( - JSON.TwilightSiteYell( - siteID.toString(), - siteYell, - qwilightSiteYell.target - ) + sendSiteYell( + siteID, + siteYell, + qwilightSiteYell.target ) if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) @@ -975,7 +968,8 @@ millis, avatar.translateLanguage("millisNotSuitable"), -1, - -1 + -1, + false ), "" ) @@ -999,12 +993,13 @@ System.currentTimeMillis(), event.message.contentDisplay, siteYells.size, - event.messageIdLong + event.messageIdLong, + true ) putSiteYell(siteYell) siteYell } - sendTranslatedSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, target)) + sendSiteYell(siteID, siteYell, target) if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1020,12 +1015,13 @@ System.currentTimeMillis(), it.iconUrl, siteYells.size, - event.messageIdLong + event.messageIdLong, + false ) putSiteYell(siteYell) siteYell } - sendTranslatedSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, target)) + sendSiteYell(siteID, siteYell, target) if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1041,12 +1037,13 @@ System.currentTimeMillis(), it.url, siteYells.size, - event.messageIdLong + event.messageIdLong, + false ) putSiteYell(siteYell) siteYell } - sendTranslatedSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, target)) + sendSiteYell(siteID, siteYell, target) if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1111,6 +1108,7 @@ val date = it.date val siteYell = if (isWiped) avatarName else it.siteYell val siteYellID = it.siteYellID + val translate = it.translate } }.toList() } @@ -1120,12 +1118,12 @@ }) data.filter { !it.avatarName.startsWith("@") - }.forEach { siteYell -> - Translator.translate(avatar.language, siteYell.siteYell, avatar).thenAccept { + }.filter { it.translate }.forEach { + Translator.translate(avatar.language, it.siteYell, avatar).thenAccept { siteYell -> avatar.send(EventOuterClass.Event.EventID.MODIFY_SITE_YELL, object { val siteID = this@Site.siteID - val siteYellID = siteYell.siteYellID - val siteYell = it + val siteYellID = it.siteYellID + val siteYell = siteYell }) } } @@ -1148,11 +1146,11 @@ this.siteNotify = siteNotify val siteYell = synchronized(siteYells) { val siteYell = - SiteYell("", "@Notify", System.currentTimeMillis(), siteNotify, siteYells.size, -1) + SiteYell("", "@Notify", System.currentTimeMillis(), siteNotify, siteYells.size, -1, true) putSiteYell(siteYell) siteYell } - sendTranslatedSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, "")) + sendSiteYell(siteID, siteYell, "") if (isEssential) { DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1166,12 +1164,13 @@ System.currentTimeMillis(), ObjectMapper().writeValueAsString(twilightCommentSiteYell), siteYells.size, - -1 + -1, + false ) putSiteYell(siteYell) siteYell } - sendSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, "")) + sendSiteYell(siteID, siteYell, "") DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1183,12 +1182,13 @@ System.currentTimeMillis(), ObjectMapper().writeValueAsString(twilightAbilitySiteYell), siteYells.size, - -1 + -1, + false ) putSiteYell(siteYell) siteYell } - sendSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, "")) + sendSiteYell(siteID, siteYell, "") DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1200,12 +1200,13 @@ System.currentTimeMillis(), ObjectMapper().writeValueAsString(twilightLevelSiteYell), siteYells.size, - -1 + -1, + false ) putSiteYell(siteYell) siteYell } - sendSiteYell(JSON.TwilightSiteYell(siteID.toString(), siteYell, "")) + sendSiteYell(siteID, siteYell, "") DB.saveSiteYell(siteID.toString(), siteYell) } @@ -1331,7 +1332,7 @@ val avatarID = netItem.avatarID val avatarName = netItem.avatarName val stand = netItem.stand - val band = netItem.highestBand + val band = netItem.band val point = netItem.point val highestJudgment = netItem.comment?.highestJudgment ?: 0 val higherJudgment = netItem.comment?.higherJudgment ?: 0 diff --git a/src/main/kotlin/net/taehui/twilight/SiteYell.kt b/src/main/kotlin/net/taehui/twilight/SiteYell.kt index db17be4..cd1674a 100644 --- a/src/main/kotlin/net/taehui/twilight/SiteYell.kt +++ b/src/main/kotlin/net/taehui/twilight/SiteYell.kt @@ -6,7 +6,8 @@ val date: Long, var siteYell: String, val siteYellID: Int, - val platformID: Long + val platformID: Long, + val translate: Boolean ) { var isWiped = false } \ No newline at end of file diff --git a/src/main/kotlin/net/taehui/twilight/awilight/AwilightAvatar.kt b/src/main/kotlin/net/taehui/twilight/awilight/AwilightAvatar.kt index e3bc0f2..aebc4fa 100644 --- a/src/main/kotlin/net/taehui/twilight/awilight/AwilightAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/awilight/AwilightAvatar.kt @@ -407,7 +407,7 @@ tmpComputer.isF ), Py.newUnicode(tmpComputer.title), - Py.newInteger(tmpComputer.targetStand) + Py.newInteger(tmpComputer.stand) ) ) } diff --git a/src/main/kotlin/net/taehui/twilight/awilight/DefaultCompute.kt b/src/main/kotlin/net/taehui/twilight/awilight/DefaultCompute.kt index 42bb55c..989e6f3 100644 --- a/src/main/kotlin/net/taehui/twilight/awilight/DefaultCompute.kt +++ b/src/main/kotlin/net/taehui/twilight/awilight/DefaultCompute.kt @@ -32,14 +32,14 @@ private val r = Random() private lateinit var noteFileData: ByteArray var setStop = false - var targetStand = 0 + var stand = 0 var isF = false - private var targetHitPoints = 1.0 + private var hitPoints = 1.0 private var isFailed = false private var lastJudged = Component.Judged.NOT - private var targetBand = 0 + private var band = 0 private var highestBand = 0 - private var targetPoint = 1.0 + private var point = 1.0 private var savedPoint = 0.0 private var totalPoint = 0.0 private var savedStand = 0.0 @@ -148,9 +148,9 @@ fun onNoteJudged(judgedNote: BaseNote) { val judged = judgedNote.judged if (judged == Component.Judged.LOWEST) { - targetBand = 0 + band = 0 } else { - highestBand = (++targetBand).coerceAtLeast(highestBand) + highestBand = (++band).coerceAtLeast(highestBand) } when (judged) { Component.Judged.HIGHEST -> comment.highestJudgment += 1 @@ -166,18 +166,18 @@ else -> Unit } lastJudged = judged - targetPoint = Component.POINT_MAP[judged.value] + point = Component.POINT_MAP[judged.value] .let { savedPoint += it; savedPoint } / Component.POINT_MAP[Component.Judged.HIGHEST.value].let { totalPoint += it; totalPoint } - targetStand = + stand = (1000000 * ((Component.STAND_MAP[judged.value]) .let { savedStand += it; savedStand }) / (totalNotes * Component.STAND_MAP[Component.Judged.HIGHEST.value])).toInt() - targetHitPoints += (if (judged != Component.Judged.LOWEST) hitPointsValue else 1.5 * targetHitPoints + 0.5) * Component.HIT_POINTS_MAP[judged.value] - targetHitPoints = targetHitPoints.coerceIn(0.0, 1.0) + hitPoints += (if (judged != Component.Judged.LOWEST) hitPointsValue else 1.5 * hitPoints + 0.5) * Component.HIT_POINTS_MAP[judged.value] + hitPoints = hitPoints.coerceIn(0.0, 1.0) comment.addPaints( - CommentOuterClass.PaintEvent.newBuilder().setWait(loopingCounter).setHitPoints(targetHitPoints) - .setStand(targetStand) - .setBand(targetBand) - .setPoint(targetPoint).build() + CommentOuterClass.PaintEvent.newBuilder().setWait(loopingCounter).setHitPoints(hitPoints) + .setStand(stand) + .setBand(band) + .setPoint(point).build() ) } @@ -270,10 +270,10 @@ this.handlerID = this@DefaultCompute.handlerID this.hitPointsMode = modeComponentValue.hitPointsMode this.avatarNetStatus = avatarNetStatus - this.stand = targetStand - this.highestBand = this@DefaultCompute.highestBand - this.point = targetPoint - this.hitPoints = targetHitPoints + this.stand = stand + this.band = band + this.point = point + this.hitPoints = hitPoints this.isFailed = this@DefaultCompute.isFailed this.lastJudged = this@DefaultCompute.lastJudged.value if (avatarNetStatus != EventOuterClass.Event.AvatarNetStatus.Default) { @@ -544,7 +544,7 @@ } } - if (targetHitPoints == 0.0 && !isF) { + if (hitPoints == 0.0 && !isF) { isF = true sendCallNetEvent(EventOuterClass.Event.AvatarNetStatus.Failed) isFailed = false diff --git a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt index 4d9b7ac..14e84a1 100644 --- a/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/qwilight/QwilightAvatar.kt @@ -350,7 +350,8 @@ EventOuterClass.Event.EventID.SITE_YELL -> wantEstablished { SiteHandler.putSiteYell( this, - jm.readValue(eventText, JSON.QwilightSiteYell::class.java) + jm.readValue(eventText, JSON.QwilightSiteYell::class.java), + true ) } @@ -473,10 +474,11 @@ JSON.QwilightSiteYell().apply { siteID = etc siteYell = String.format( - translateLanguage("savedAsNetBundle"), + translateLanguage("tryNetBundle"), bundleFileName ) - } + }, + false ) SiteHandler.setNetBundle( UUID.fromString(etc), diff --git a/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt b/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt index ba5ac9d..04ba3da 100644 --- a/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/site/SiteAvatar.kt @@ -139,7 +139,7 @@ EventOuterClass.Event.EventID.NOT_SIGN_IN -> wantSignedIn { handleNotSignIn() } EventOuterClass.Event.EventID.SITE_YELL -> wantEstablished { - SiteHandler.putSiteYell(this, jm.readValue(eventText, JSON.QwilightSiteYell::class.java)) + SiteHandler.putSiteYell(this, jm.readValue(eventText, JSON.QwilightSiteYell::class.java), true) } EventOuterClass.Event.EventID.GET_SITE_YELLS -> wantEstablished { diff --git a/src/main/kotlin/net/taehui/twilight/system/DB.kt b/src/main/kotlin/net/taehui/twilight/system/DB.kt index 53625a0..f871843 100644 --- a/src/main/kotlin/net/taehui/twilight/system/DB.kt +++ b/src/main/kotlin/net/taehui/twilight/system/DB.kt @@ -36,7 +36,9 @@ }) AND Long_Note_Mode = ${Component.DEFAULT_LONG_NOTE_MODE} AND Note_Modify_Mode = ${Component.DEFAULT_NOTE_MODIFY_MODE}" } - private val pool = BasicDataSource() + private val pool = BasicDataSource().apply { + maxTotal = Int.MAX_VALUE + } private val yyyyMMFormat = DateTimeFormatter.ofPattern("yyyy-MM").withZone(ZoneId.systemDefault()) private val yyyyMMDDFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()) @@ -206,6 +208,7 @@ Date LONG NOT NULL, Site_Yell TEXT NOT NULL, Platform_ID LONG NOT NULL, + Translate BOOLEAN NOT NULL, KEY (Site_ID), KEY (Platform_ID) ) COLLATE=utf8mb4_general_ci ENGINE=InnoDB @@ -272,7 +275,7 @@ pool.connection.use { it.prepareStatement( """ - SELECT Avatar_ID, Avatar_Name, Date, Site_Yell, Platform_ID + SELECT Avatar_ID, Avatar_Name, Date, Site_Yell, Platform_ID, Translate FROM tw_site WHERE Site_ID = ? ORDER BY Date @@ -290,7 +293,8 @@ rows.getLong("Date"), rows.getString("Site_Yell"), ++siteYellID, - rows.getLong("Platform_ID") + rows.getLong("Platform_ID"), + rows.getBoolean("Translate") ) ) } @@ -819,7 +823,8 @@ dbStatement.setString(1, avatarNoteID.first) dbStatement.setString(2, avatarNoteID.second) dbStatement.setInt( - 3, (if (defaultHandledComments.any { comment -> comment.isP }) Component.Handled.BAND1 else { + 3, + (if (defaultHandledComments.any { comment -> comment.isP }) Component.Handled.BAND1 else { when (defaultHandledComments.maxBy { comment -> when (comment.hitPointsMode) { Component.HIGHEST_HIT_POINTS_MODE, Component.FAILED_HIT_POINTS_MODE -> 2 @@ -1815,7 +1820,7 @@ """ INSERT INTO tw_site - VALUES(?, ?, ?, ?, ?, ?) + VALUES(?, ?, ?, ?, ?, ?, ?) """.trimIndent() ).use { dbStatement -> dbStatement.setString(1, siteID) @@ -1824,6 +1829,7 @@ dbStatement.setLong(4, siteYell.date) dbStatement.setString(5, siteYell.siteYell) dbStatement.setLong(6, siteYell.platformID) + dbStatement.setBoolean(7, siteYell.translate) dbStatement.execute() } } diff --git a/src/main/kotlin/net/taehui/twilight/system/SiteHandler.kt b/src/main/kotlin/net/taehui/twilight/system/SiteHandler.kt index 4adfaf9..37953f1 100644 --- a/src/main/kotlin/net/taehui/twilight/system/SiteHandler.kt +++ b/src/main/kotlin/net/taehui/twilight/system/SiteHandler.kt @@ -335,9 +335,9 @@ sites[defaultSiteID]?.putSiteYell(tvItem) } - fun putSiteYell(avatar: Avatar, qwilightSiteYell: JSON.QwilightSiteYell) { + fun putSiteYell(avatar: Avatar, qwilightSiteYell: JSON.QwilightSiteYell, translate: Boolean) { if (qwilightSiteYell.siteYell.length <= 160 && qwilightSiteYell.siteYell.isNotBlank()) { - sites[UUID.fromString(qwilightSiteYell.siteID)]?.putSiteYell(avatar, qwilightSiteYell) + sites[UUID.fromString(qwilightSiteYell.siteID)]?.putSiteYell(avatar, qwilightSiteYell, translate) } } diff --git a/src/main/kotlin/net/taehui/twilight/system/Translator.kt b/src/main/kotlin/net/taehui/twilight/system/Translator.kt index c94eec0..678ade4 100644 --- a/src/main/kotlin/net/taehui/twilight/system/Translator.kt +++ b/src/main/kotlin/net/taehui/twilight/system/Translator.kt @@ -50,7 +50,7 @@ } val targetLanguage = language.split('-')[0] - if (textLanguage.isEmpty() || textLanguage == "unk" || textLanguage == "en" || textLanguage == targetLanguage) { + if ((textLanguage != "ko" && textLanguage != "ja") || textLanguage == targetLanguage) { text } else { val loadedTranslatedText = DB.loadTranslatedText(text, targetLanguage) diff --git a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt index aa9cdf0..76683a1 100644 --- a/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt +++ b/src/main/kotlin/net/taehui/twilight/www/WwwAvatar.kt @@ -331,10 +331,10 @@ "/qwilight/www/avatar/levelVS" -> { val targetID = params.getOrDefault("targetID", "") - if (avatarID.isEmpty() || targetID.isEmpty() || avatarID == targetID) { + val levelName = params.getOrDefault("levelName", "") + if (avatarID.isEmpty() || targetID.isEmpty() || levelName.isEmpty() || avatarID == targetID) { send400(ctx) } else { - val levelName = params.getOrDefault("levelName", "") DB.getAvatarLevelVS(avatarID, targetID, levelName).thenAccept { send(ctx, it) } diff --git a/src/main/resources/Language.json b/src/main/resources/Language.json index a499a0e..dbd8087 100644 --- a/src/main/resources/Language.json +++ b/src/main/resources/Language.json @@ -59,10 +59,6 @@ "ko-KR": "서버 점검중입니다.", "en-US": "Checking the server." }, - "savedAsNetBundle": { - "ko-KR": "공유 받기를 눌러서 %s를 다운로드 받으세요", - "en-US": "Click Get Share to download %s" - }, "signInAsEnter": { "ko-KR": "이 방에 참가하려면 먼저 로그인하세요", "en-US": "Please log in first to join this room" @@ -87,6 +83,10 @@ "ko-KR": "더 이상 방이 존재하지 않습니다.", "en-US": "The room no longer exists." }, + "tryNetBundle": { + "ko-KR": "공유 받기를 눌러서 %s를 다운로드 받으세요", + "en-US": "Click Get Share to download %s" + }, "ubuntuIsYou": { "ko-KR": "다른 사용자를 친구 추가하세요", "en-US": "Add another user as a friend"