Skip to content

Fix sync transformer sets, add better error logging and mark renderstate dirty #4444

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jurrejelle merged 5 commits into from
Jan 8, 2026
Merged

Fix sync transformer sets, add better error logging and mark renderstate dirty #4444

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db3858
test
YoungOnionMC Jan 8, 2026
9ffc920
Actually update the render state
jurrejelle Jan 8, 2026
7c1976c
more fixes
YoungOnionMC Jan 8, 2026
740b74e
spotless
YoungOnionMC Jan 8, 2026
3ddea4e
logging
YoungOnionMC Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/com/gregtechceu/gtceu/api/blockentity/MetaMachineBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ public boolean triggerEvent(int id, int para) {
@Override
public void setRenderState(MachineRenderState state) {
this.renderState = state;
if (level != null && !level.isClientSide) {
syncDataHolder.markClientSyncFieldDirty("renderState");
}
scheduleRenderUpdate();
}

Expand Down
22 changes: 12 additions & 10 deletions src/main/java/com/gregtechceu/gtceu/syncsystem/SyncDataHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,23 +193,25 @@ private static void deserialiseField(ISyncManaged holder, ClassSyncData.FieldSyn
try {
if (field.transformer != null) {
IValueTransformer<Object> transformer = (IValueTransformer<Object>) field.transformer;
if (transformer.mustProvideObject()) {
if (readingClientFields) {
transformer.deserializeClientNBT(savedValue, holder, field.handle.get(holder));
try {
if (transformer.mustProvideObject()) {
if (readingClientFields) {
transformer.deserializeClientNBT(savedValue, holder, field.handle.get(holder));
} else {
transformer.deserializeNBT(savedValue, holder, field.handle.get(holder));
}
} else {
transformer.deserializeNBT(savedValue, holder, field.handle.get(holder));
}
} else {
try {

if (readingClientFields) {
field.handle.set(holder, transformer.deserializeClientNBT(savedValue, holder, null));
} else {
field.handle.set(holder, transformer.deserializeNBT(savedValue, holder, null));
}
} catch (UnsupportedOperationException e) {
GTCEu.LOGGER.error("Sync: failed to perform VarHandle set: unsupported op {} {}",
field.fieldName, field.handle.toString());

}
} catch (UnsupportedOperationException e) {
GTCEu.LOGGER.error("Sync: failed to perform VarHandle set: unsupported op {} {}",
field.fieldName, field.handle.toString());
}
} else if (field.isComplex && savedValue instanceof CompoundTag compound) {
if (currentVal == null) {
Expand Down
11 changes: 6 additions & 5 deletions ...n/java/com/gregtechceu/gtceu/syncsystem/data_transformers/collections/SetTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ public Tag serializeNBT(Set<T> value, ISyncManaged holder) {
}

@Override
public Set<T> deserializeNBT(Tag tag, ISyncManaged holder, Set<T> currentVal) {
if (!(tag instanceof ListTag listTag)) return Set.of();
Set<T> set = new HashSet<>();
public Set<T> deserializeNBT(Tag tag, ISyncManaged holder, Set<T> current) {
if (!(tag instanceof ListTag listTag)) return current;
if (current != null) current.clear();
else current = new HashSet<>();
for (Tag elementTag : listTag) {
set.add(elementTransformer.deserializeNBT(elementTag, null, null));
current.add(elementTransformer.deserializeNBT(elementTag, null, null));
}
return set;
return current;
}
}