Skip to content

Commit 0385f6b

Browse files
committed
Add builder for CameraSetInstruction & respect default optional values
1 parent 68f5aff commit 0385f6b

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/camera/CameraPreset.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
@NoArgsConstructor
1515
public class CameraPreset {
1616
private String identifier;
17+
@Builder.Default
1718
private String parentPreset = "";
1819
// All the values below are optional, and will not be encoded if null is used
1920
private Vector3f pos;
@@ -28,6 +29,7 @@ public class CameraPreset {
2829
*/
2930
private Float radius;
3031
private CameraAudioListener listener;
32+
@Builder.Default
3133
private OptionalBoolean playEffect = OptionalBoolean.empty();
3234
/**
3335
* @since v729
@@ -36,6 +38,7 @@ public class CameraPreset {
3638
/**
3739
* @since v729
3840
*/
41+
@Builder.Default
3942
private OptionalBoolean snapToTarget = OptionalBoolean.empty();
4043
/**
4144
* @since v729
@@ -52,9 +55,11 @@ public class CameraPreset {
5255
/**
5356
* @since v748
5457
*/
58+
@Builder.Default
5559
private OptionalBoolean continueTargeting = OptionalBoolean.empty();
5660
/**
5761
* @since v748
5862
*/
63+
@Builder.Default
5964
private OptionalBoolean alignTargetAndCameraForward = OptionalBoolean.empty();
6065
}

bedrock-codec/src/main/java/org/cloudburstmc/protocol/bedrock/data/camera/CameraSetInstruction.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.cloudburstmc.protocol.bedrock.data.camera;
22

33
import lombok.AllArgsConstructor;
4+
import lombok.Builder;
45
import lombok.Data;
56
import lombok.NoArgsConstructor;
67
import org.cloudburstmc.math.vector.Vector2f;
@@ -9,6 +10,7 @@
910
import org.cloudburstmc.protocol.common.util.OptionalBoolean;
1011

1112
@Data
13+
@Builder
1214
@AllArgsConstructor
1315
@NoArgsConstructor
1416
public class CameraSetInstruction {
@@ -25,6 +27,7 @@ public class CameraSetInstruction {
2527
* @since v748
2628
*/
2729
private Vector3f entityOffset;
30+
@Builder.Default
2831
private OptionalBoolean defaultPreset = OptionalBoolean.empty();
2932

3033
@Data

0 commit comments

Comments
 (0)