admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-29 01:35:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove PregeneratedText proto and unused service handling (#5637)

Browse Source 
* Remove PregeneratedText proto and unused service handling

Now that clients no longer request pregenerated texts (they're sent via
normal ClientTextStore streaming), remove the unused proto messages:
- PregeneratedTextRequest/Response from eagle.proto
- pregenerated_text.proto file entirely
- Empty case handler in EagleServiceImpl.scala

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

* Remove pregenerated_text.proto reference from protos.csproj

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
admin
2026-01-27 12:52:12 -08:00
committed by GitHub
co-authored by Claude Opus 4.5
parent 3eda670759
commit 7d5320220c
5 changed files with 5 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/csharp/net/eagle0/clients/unity/eagle0/protos/protos.csproj
-3
View File
@@ -145,9 +145,6 @@
<Protobuf Include="..\..\..\..\..\..\..\..\..\src\main\protobuf\net\eagle0\eagle\views\faction_relationship_view.proto" ProtoRoot="..\..\..\..\..\..\..\..\..\">
<Link>src\main\protobuf\net\eagle0\eagle\views\faction_relationship_view.proto</Link>
</Protobuf>
<Protobuf Include="..\..\..\..\..\..\..\..\..\src\main\protobuf\net\eagle0\eagle\api\pregenerated_text.proto" ProtoRoot="..\..\..\..\..\..\..\..\..\">
<Link>src\main\protobuf\net\eagle0\eagle\api\pregenerated_text.proto</Link>
</Protobuf>
<Protobuf Include="..\..\..\..\..\..\..\..\..\src\main\protobuf\net\eagle0\eagle\common\tribute_amount.proto" ProtoRoot="..\..\..\..\..\..\..\..\..\">
<Link>src\main\protobuf\net\eagle0\eagle\common\tribute_amount.proto</Link>
</Protobuf>
src/main/protobuf/net/eagle0/eagle/api/BUILD.bazel
-18
View File
@@ -35,7 +35,6 @@ proto_library(
visibility = ["//visibility:public"],
deps = [
":command_proto",
":pregenerated_text_proto",
":selected_command_proto",
":streaming_text_response_proto",
"//src/main/protobuf/net/eagle0/common:game_setup_info_proto",
@@ -107,21 +106,6 @@ proto_library(
],
)
scala_proto_library(
name = "pregenerated_text_scala_proto",
visibility = [
"//src/main/scala/net/eagle0/eagle/service:__subpackages__",
"//src/test/scala/net/eagle0/eagle:__subpackages__",
],
deps = [":pregenerated_text_proto"],
)
proto_library(
name = "pregenerated_text_proto",
srcs = ["pregenerated_text.proto"],
visibility = ["//visibility:public"],
)
scala_proto_library(
name = "selected_command_scala_proto",
visibility = [
@@ -181,7 +165,6 @@ go_proto_library(
protos = [
":available_command_proto",
":command_proto",
":pregenerated_text_proto",
":selected_command_proto",
":streaming_text_response_proto",
],
@@ -207,7 +190,6 @@ go_proto_library(
":available_command_proto",
":command_proto",
":eagle_grpc",
":pregenerated_text_proto",
":selected_command_proto",
":streaming_text_response_proto",
],
src/main/protobuf/net/eagle0/eagle/api/eagle.proto
+2 -11
View File
@@ -9,7 +9,6 @@ package net.eagle0.eagle.api;
import "google/protobuf/wrappers.proto";
import "src/main/protobuf/net/eagle0/common/game_setup_info.proto";
import "src/main/protobuf/net/eagle0/eagle/api/command.proto";
import "src/main/protobuf/net/eagle0/eagle/api/pregenerated_text.proto";
import "src/main/protobuf/net/eagle0/eagle/api/selected_command.proto";
import "src/main/protobuf/net/eagle0/eagle/api/streaming_text_response.proto";
import "src/main/protobuf/net/eagle0/eagle/common/profession.proto";
@@ -56,16 +55,12 @@ message LobbyResponse {
NewGameOptions new_game_options = 5;
}
message PregeneratedTextRequest {
int64 known_pregenerated_text_hash = 1;
}
message UpdateStreamRequest {
oneof request_details {
StreamGameRequest stream_game_request = 1;
HeartbeatRequest heartbeat_request = 2;
EnterLobbyRequest enter_lobby_request = 3;
PregeneratedTextRequest pregenerated_text_request = 4;
// Field 4 was pregenerated_text_request, now removed
JoinGameRequest join_game_request = 5;
CreateGameRequest create_game_request = 6;
CustomBattleRequest custom_battle_request = 7;
@@ -103,16 +98,12 @@ message UpdateStreamRequest {
}
}
message PregeneratedTextResponse {
PregeneratedText pregenerated_text = 1;
}
message UpdateStreamResponse {
oneof response_details {
GameUpdate game_update = 1;
HeartbeatResponse heartbeat_response = 2;
LobbyResponse lobby_response = 3;
PregeneratedTextResponse pregenerated_text_response = 4;
// Field 4 was pregenerated_text_response, now removed
JoinGameResponse join_game_response = 5;
CreateGameResponse create_game_response = 6;
CustomBattleResponse custom_battle_response = 7;
src/main/protobuf/net/eagle0/eagle/api/pregenerated_text.proto
-22
View File
@@ -1,22 +0,0 @@
//
// Copyright 2024 Dan Crosby
//
syntax = "proto3";
package net.eagle0.eagle.api;
option java_multiple_files = true;
option java_package = "net.eagle0.eagle.api";
option java_outer_classname = "PregeneratedTextProto";
option objc_class_prefix = "E0G";
message PregeneratedText {
message Entry {
string text_id = 1;
string text = 2;
}
repeated Entry entries = 1;
int64 hash = 2;
}
src/main/scala/net/eagle0/eagle/service/EagleServiceImpl.scala
+3 -7
View File
@@ -177,24 +177,20 @@ class EagleServiceImpl(
) extends StreamObserver[UpdateStreamRequest] {
override def onNext(value: UpdateStreamRequest): Unit = try {
value.requestDetails match {
case UpdateStreamRequest.RequestDetails.Empty =>
case UpdateStreamRequest.RequestDetails.Empty =>
throw new EagleClientException("Must include a request")
case UpdateStreamRequest.RequestDetails.StreamGameRequest(
streamGameRequest
) =>
streamOneUpdate(streamGameRequest, responseObserver)
case UpdateStreamRequest.RequestDetails.HeartbeatRequest(value) =>
case UpdateStreamRequest.RequestDetails.HeartbeatRequest(value) =>
handleHeartbeat(value, responseObserver)
case UpdateStreamRequest.RequestDetails.EnterLobbyRequest(_) =>
case UpdateStreamRequest.RequestDetails.EnterLobbyRequest(_) =>
lockAndDoWithUserName { userName =>
lobbyUsers = lobbyUsers + (userName -> responseObserver)
lockedSendLobbyUpdate(userName)
}
()
// PregeneratedTextRequest is no longer handled - pregenerated texts are now
// populated into each game's ClientTextStore and sent via normal text streaming.
case UpdateStreamRequest.RequestDetails.PregeneratedTextRequest(_) =>
() // Ignored for backward compatibility with old clients
case UpdateStreamRequest.RequestDetails.JoinGameRequest(request) =>
joinGame(request).map { joinGameResponse =>