OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2025-04-17 19:12:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Result handlers for custom forms with labels now work again

Browse source
This commit is contained in:
Tim203 2025-03-26 20:43:49 +01:00
parent b1177389d3
commit 8cf65814ce
No known key found for this signature in database
1 changed files with 59 additions and 7 deletions

66
core/src/main/java/org/geysermc/geyser/session/cache/FormCache.java vendored
View file

@ -25,23 +25,32 @@
package org.geysermc.geyser.session.cache;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import it.unimi.dsi.fastutil.ints.IntList;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.RequiredArgsConstructor;
import org.cloudburstmc.protocol.bedrock.packet.ModalFormRequestPacket;
import org.cloudburstmc.protocol.bedrock.packet.ModalFormResponsePacket;
import org.cloudburstmc.protocol.bedrock.packet.NetworkStackLatencyPacket;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import lombok.RequiredArgsConstructor;
import org.geysermc.cumulus.component.util.ComponentType;
import org.geysermc.cumulus.form.CustomForm;
import org.geysermc.cumulus.form.Form;
import org.geysermc.cumulus.form.SimpleForm;
import org.geysermc.cumulus.form.impl.FormDefinitions;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.network.GameProtocol;
import org.geysermc.geyser.session.GeyserSession;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@RequiredArgsConstructor
public class FormCache {
private static final Gson GSON_TEMP = new Gson();
/**
* The magnitude of this doesn't actually matter, but it must be negative so that
@ -100,9 +109,52 @@ public class FormCache {
return;
}
String responseData = response.getFormData();
//todo work on a proper solution in Cumulus, but that'd require all Floodgate instances to update as well and
// drops support for older Bedrock versions (because Cumulus isn't made to support multiple versions). That's
// why this hotfix exists.
if (form instanceof CustomForm customForm && GameProtocol.is1_21_70orHigher(session)) {
// Labels are no longer included as a json null, so we have to manually add them for now.
IntList labelIndexes = new IntArrayList();
for (int i = 0; i < customForm.content().size(); i++) {
var component = customForm.content().get(i);
if (component == null) {
continue;
}
if (component.type() == ComponentType.LABEL) {
labelIndexes.add(i);
}
}
if (!labelIndexes.isEmpty()) {
// If the form only has labels, the response is the literal
// null (with a newline char) instead of a json array
if (responseData.startsWith("null")) {
List<Object> newResponse = new ArrayList<>();
for (int i = 0; i < labelIndexes.size(); i++) {
newResponse.add(null);
}
responseData = GSON_TEMP.toJson(newResponse);
} else {
JsonArray responseDataArray = GSON_TEMP.fromJson(responseData, JsonArray.class);
List<Object> newResponse = new ArrayList<>();
int handledLabelCount = 0;
for (int i = 0; i < responseDataArray.size() + labelIndexes.size(); i++) {
if (labelIndexes.contains(i)) {
newResponse.add(null);
handledLabelCount++;
continue;
}
newResponse.add(responseDataArray.get(i - handledLabelCount));
}
responseData = GSON_TEMP.toJson(newResponse);
}
}
}
try {
formDefinitions.definitionFor(form)
.handleFormResponse(form, response.getFormData());
.handleFormResponse(form, responseData);
} catch (Exception e) {
GeyserImpl.getInstance().getLogger().error("Error while processing form response!", e);
}