Pumpkin-MC/Extractor
0
0
Fork 0
mirror of https://github.com/Pumpkin-MC/Extractor.git synced 2025-04-02 23:26:40 +00:00
Code Issues Activity

update to 1.21.5

Browse Source
This commit is contained in:
Alexander Medvedev
2025-03-28 17:53:20 +01:00
parent 9db393367a
commit b37b6838f0
3 changed files with 17 additions and 21 deletions
gradle.properties
src/main/kotlin/de/snowii/extractor/extractors
Blocks.ktPackets.kt

8
gradle.properties

@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true
# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.8
minecraft_version=1.21.5
yarn_mappings=1.21.5+build.1
loader_version=0.16.10
kotlin_loader_version=1.13.1+kotlin.2.1.10
kotlin_loader_version=1.13.2+kotlin.2.1.20
# Mod Properties
mod_version=1.0-SNAPSHOT
maven_group=de.snowii
archives_base_name=extractor
fabric_version=0.118.0+1.21.4
fabric_version=0.119.5+1.21.5

2
src/main/kotlin/de/snowii/extractor/extractors/Blocks.kt

@ -70,6 +70,8 @@ class Blocks : Extractor.Extractor {
val stateJson = JsonObject()
stateJson.addProperty("id", Block.getRawIdFromState(state))
stateJson.addProperty("air", state.isAir)
stateJson.addProperty("is_solid", state.isSolid)
stateJson.addProperty("instrument", state.instrument.name)
stateJson.addProperty("is_liquid", state.isLiquid)
stateJson.addProperty("luminance", state.luminance)
stateJson.addProperty("burnable", state.isBurnable)

28
src/main/kotlin/de/snowii/extractor/extractors/Packets.kt

@ -4,12 +4,7 @@ import com.google.gson.JsonArray
import com.google.gson.JsonElement
import com.google.gson.JsonObject
import de.snowii.extractor.Extractor
import io.netty.buffer.ByteBuf
import net.minecraft.network.NetworkPhase
import net.minecraft.network.NetworkState
import net.minecraft.network.PacketByteBuf
import net.minecraft.network.listener.ClientPacketListener
import net.minecraft.network.listener.ServerCrashSafePacketListener
import net.minecraft.network.packet.PacketType
import net.minecraft.network.state.*
import net.minecraft.server.MinecraftServer
@ -24,31 +19,30 @@ class Packets : Extractor.Extractor {
val packetsJson = JsonObject()
val clientBound = arrayOf(
QueryStates.S2C_FACTORY,
LoginStates.S2C_FACTORY,
ConfigurationStates.S2C_FACTORY,
PlayStateFactories.S2C
QueryStates.S2C_FACTORY.buildUnbound(),
LoginStates.S2C_FACTORY.buildUnbound(),
ConfigurationStates.S2C_FACTORY.buildUnbound(),
PlayStateFactories.S2C.buildUnbound()
)
val serverBound = arrayOf(
HandshakeStates.C2S_FACTORY,
QueryStates.C2S_FACTORY,
LoginStates.C2S_FACTORY,
ConfigurationStates.C2S_FACTORY,
PlayStateFactories.C2S
HandshakeStates.C2S_FACTORY.buildUnbound(),
QueryStates.C2S_FACTORY.buildUnbound(),
LoginStates.C2S_FACTORY.buildUnbound(),
ConfigurationStates.C2S_FACTORY.buildUnbound(),
PlayStateFactories.C2S.buildUnbound()
)
val serverBoundJson = serializeServerBound(serverBound)
val clientBoundJson = serializeClientBound(clientBound)
packetsJson.add("serverbound", serverBoundJson)
packetsJson.add("clientbound", clientBoundJson)
return packetsJson
}
private fun serializeServerBound(
packets: Array<NetworkState.Factory<out ServerCrashSafePacketListener, out ByteBuf>>
packets: Array<NetworkState.Unbound>
): JsonObject {
val handshakeArray = JsonArray()
val statusArray = JsonArray()
@ -77,7 +71,7 @@ class Packets : Extractor.Extractor {
}
private fun serializeClientBound(
packets: Array<NetworkState.Factory<out ClientPacketListener, out PacketByteBuf>>
packets: Array<NetworkState.Unbound>
): JsonObject {
val statusArray = JsonArray()
val loginArray = JsonArray()