Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 553889f

Browse files
committed
Fix block marker particle.
Closes #459 Closes #461
1 parent 0cfb10e commit 553889f

File tree

2 files changed

+8
-2
lines changed
  • src/main/java/net/earthcomputer/multiconnect/packets
  • translatorCompiler/src/main/kotlin/net/earthcomputer/multiconnect/compiler/gen

2 files changed

+8
-2
lines changed

src/main/java/net/earthcomputer/multiconnect/packets/CommonTypes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public static abstract class Particle_Latest implements Particle {
417417
@Registry(Registries.PARTICLE_TYPE)
418418
public int particleId;
419419

420-
@Polymorphic(stringValue = {"block", "falling_dust", "multiconnect:block_dust"})
420+
@Polymorphic(stringValue = {"block", "falling_dust", "block_marker", "multiconnect:block_dust"})
421421
@MessageVariant(minVersion = Protocols.V1_13)
422422
public static class BlockState extends Particle_Latest implements Particle.BlockState {
423423
@Registry(Registries.BLOCK_STATE)

translatorCompiler/src/main/kotlin/net/earthcomputer/multiconnect/compiler/gen/Common.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,13 @@ internal fun ProtocolCompiler.generatePolymorphicInstantiationGraph(
224224
ThrowStmtOp,
225225
McNode(
226226
NewOp("java.lang.IllegalArgumentException", listOf(McType.STRING)),
227-
createCstNode("Could not select polymorphic child of \"${splitPackageClass(message.className).second}\"")
227+
McNode(BinaryExpressionOp("+", McType.STRING, McType.STRING),
228+
createCstNode("Could not select polymorphic child of \"${splitPackageClass(message.className).second}\" for field value \""),
229+
McNode(BinaryExpressionOp("+", type.realType, McType.STRING),
230+
loadTypeField,
231+
createCstNode("\"")
232+
)
233+
)
228234
)
229235
)
230236
}

0 commit comments

Comments
 (0)