Skip to content

Commit

Permalink
Add Optinal in Switch
Browse files Browse the repository at this point in the history
  • Loading branch information
@Newspicel
Newspicel committed Jan 7, 2023
1 parent 2331523 commit f726531
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 37 deletions.
83 changes: 47 additions & 36 deletions scripts/packet_generate_text.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ def generate_bitfield(self, field_name: str, field_data: list, infos: dict) -> d
class_docs += [f" * @param {field_var_name} {field_name} ({docs_str})"]
class_other_imports = ["import io.layercraft.packetlib.types.Bitfield"]


return {
"fields": class_fields,
"serialize": class_serialize,
Expand Down Expand Up @@ -598,11 +597,13 @@ def generate_option_container(self, parent_field_name: str, container: list, inf
if field_sub_type_name == "array":
print("Not supported yet")
elif field_sub_type_name == "switch":
#return_value = self.generate_switch(field_name, field_type, infos)
print(field_type)
return_value = self.generate_switch(field_name, field_type, infos)
self.add_to_clazz_field(return_value, clazz)
pass
else:
print(field_sub_type_name)
#raise Exception("Not supported")
# raise Exception("Not supported")
else:
raise Exception("Not supported")

Expand Down Expand Up @@ -685,12 +686,12 @@ def generate_switch(self, field_name: str, switch: dict, infos: dict) -> dict:
kotlin_type_fix = kotlin_type
boolean_field_var_name = ("has" + field_var_name[0].upper() + field_var_name[1:])

#Get last field
# Get last field
if len(clazz["fields"]) >= 1 and boolean_field_var_name not in clazz["fields"][-1] or len(clazz["fields"]) == 0:
build_other_switch = {
"compareTo": "../" + compare_to_field,
"fields": {x: "bool" for x in fields.keys()},
}
}

return_value = self.generate_switch(boolean_field_var_name, build_other_switch, infos)
self.add_to_clazz_field(return_value, clazz)
Expand All @@ -701,8 +702,7 @@ def generate_switch(self, field_name: str, switch: dict, infos: dict) -> dict:

other_switch = True
other_switch_value = field_value
if field_value[0] == "container" or field_value[0] == "array" :
print(field_value)
if field_value[0] == "container" or field_value[0] == "array":
for field_container in field_value[1]:
inside = False
for it in other_switch_value_dict:
Expand All @@ -717,8 +717,19 @@ def generate_switch(self, field_name: str, switch: dict, infos: dict) -> dict:
if x["value"] == field_container:
x["keys"] += [field]
elif field_value[0] == "option":
pass
#raise Exception(field_value)
for field_container in field_value[1][1]:
inside = False
for it in other_switch_value_dict:
if it["value"] == field_container:
inside = True
break

if inside is False:
other_switch_value_dict += [{"value": field_container, "keys": [field]}]
else:
for x in other_switch_value_dict:
if x["value"] == field_container:
x["keys"] += [field]
else:
raise Exception(field_value)

Expand All @@ -742,45 +753,45 @@ def generate_switch(self, field_name: str, switch: dict, infos: dict) -> dict:
elif other_switch_value_type == "array":
print("Not supported yet")
elif other_switch_value_type == "option":
#print(other_switch_value_dict)
for field in other_switch_value_dict:
field_info = field['value']
field_keys = field['keys']
#print(field_info)
if type(field_info) is str or field_info == "{'countType': 'varint'}":
continue
other_switch_value_type = other_switch_value[1][0]
if other_switch_value_type == "container":
for field in other_switch_value_dict:
field_info = field['value']
field_keys = field['keys']
if type(field_info) is str or field_info == "{'countType': 'varint'}":
continue

if type(field_info) is list:
for field_sub in field_info:
field_name = field_sub['name']
field_type = [
"option",
field_sub['type']
]

build_other_switch = {
"compareTo": switch["compareTo"],
"fields": {x: field_type for x in field_keys}
}

return_value = self.generate_switch(field_name, build_other_switch, infos)
self.add_to_clazz_field(return_value, clazz)

if type(field_info) is list:
for field_sub in field_info:
field_name = field_sub['name']
else:
field_name = field_info['name']
field_type = [
"option",
field_sub['type']
field_info['type']
]

build_other_switch = {
"compareTo": compare_to_field,
"compareTo": switch["compareTo"],
"fields": {x: field_type for x in field_keys}
}

return_value = self.generate_switch(field_name, build_other_switch, infos)
self.add_to_clazz_field(return_value, clazz)
else:
field_name = field_info['name']
field_type = [
"option",
field_info['type']
]

build_other_switch = {
"compareTo": compare_to_field,
"fields": {x: field_type for x in field_keys}
}

return_value = self.generate_switch(field_name, build_other_switch, infos)
self.add_to_clazz_field(return_value, clazz)
else:
#print(other_switch_value_type)
raise Exception("Not supported")
return clazz

Expand Down
22 changes: 21 additions & 1 deletion src/main/kotlin/io/layercraft/packetlib/packets/v1_19_2/play/clientbound/PlayerInfoPacket.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,16 @@ data class PlayerInfoPacket(
3 -> if (hasDisplayName!!) arrayInput.readString() else null
else -> null
}
val hasTimestamp = when (action) {
0 -> arrayInput.readBoolean()
else -> null
}
val timestamp = when (action) {
0 -> if (hasTimestamp!!) arrayInput.readLong() else null
else -> null
}

return@readVarIntArray PlayerInfoPacketData(uuid, name, gamemode, ping, hasDisplayName, displayName)
return@readVarIntArray PlayerInfoPacketData(uuid, name, gamemode, ping, hasDisplayName, displayName, hasTimestamp, timestamp)
}

return PlayerInfoPacket(action, data)
Expand Down Expand Up @@ -82,6 +90,14 @@ data class PlayerInfoPacket(
3 -> if (arrayValue.hasDisplayName!!) arrayOutput.writeString(arrayValue.displayName!!)
else -> {}
}
when (value.action) {
0 -> arrayOutput.writeBoolean(arrayValue.hasTimestamp!!)
else -> {}
}
when (value.action) {
0 -> if (arrayValue.hasTimestamp!!) arrayOutput.writeLong(arrayValue.timestamp!!)
else -> {}
}
}
}
}
Expand All @@ -96,6 +112,8 @@ data class PlayerInfoPacket(
* @param ping ping
* @param hasDisplayName hasDisplayName
* @param displayName displayName
* @param hasTimestamp hasTimestamp
* @param timestamp timestamp
*/
data class PlayerInfoPacketData(
val uuid: UUID,
Expand All @@ -104,4 +122,6 @@ data class PlayerInfoPacketData(
val ping: Int?, // varint
val hasDisplayName: Boolean?,
val displayName: String?,
val hasTimestamp: Boolean?,
val timestamp: Long?,
)

0 comments on commit f726531

Please sign in to comment.