-
Notifications
You must be signed in to change notification settings - Fork 42
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
34 changed files
with
491 additions
and
368 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...l-components-base/src/main/java/dev/onyxstudios/cca/internal/base/CcaClientInternals.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Cardinal-Components-API | ||
| * Copyright (C) 2019-2024 OnyxStudios | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE | ||
| * OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| package dev.onyxstudios.cca.internal.base; | ||
|
|
||
| import dev.onyxstudios.cca.api.v3.component.Component; | ||
| import dev.onyxstudios.cca.api.v3.component.sync.AutoSyncedComponent; | ||
| import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; | ||
| import net.minecraft.network.packet.CustomPayload; | ||
|
|
||
| import java.util.Optional; | ||
| import java.util.function.BiFunction; | ||
|
|
||
| public final class CcaClientInternals { | ||
| public static <T extends ComponentUpdatePayload<?>> void registerComponentSync(CustomPayload.Id<T> packetId, BiFunction<T, ClientPlayNetworking.Context, Optional<? extends Component>> getter) { | ||
| ClientPlayNetworking.registerGlobalReceiver(packetId, (payload, ctx) -> { | ||
| try { | ||
| getter.apply(payload, ctx).ifPresent(c -> { | ||
| if (c instanceof AutoSyncedComponent synced) { | ||
| synced.applySyncPacket(payload.buf()); | ||
| } | ||
| }); | ||
| } finally { | ||
| payload.buf().release(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| } |
59 changes: 59 additions & 0 deletions
59
...mponents-base/src/main/java/dev/onyxstudios/cca/internal/base/ComponentUpdatePayload.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Cardinal-Components-API | ||
| * Copyright (C) 2019-2024 OnyxStudios | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE | ||
| * OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| package dev.onyxstudios.cca.internal.base; | ||
|
|
||
| import dev.onyxstudios.cca.api.v3.component.ComponentKey; | ||
| import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; | ||
| import net.minecraft.network.RegistryByteBuf; | ||
| import net.minecraft.network.codec.PacketCodec; | ||
| import net.minecraft.network.packet.CustomPayload; | ||
|
|
||
| public record ComponentUpdatePayload<T>( | ||
| Id<ComponentUpdatePayload<T>> id, | ||
| T targetData, | ||
| ComponentKey<?> componentKey, | ||
| RegistryByteBuf buf | ||
| ) implements CustomPayload { | ||
| public static <T> CustomPayload.Id<ComponentUpdatePayload<T>> id(String path) { | ||
| return CustomPayload.id("cardinal-components:" + path); | ||
| } | ||
|
|
||
| public static <T> void register(Id<ComponentUpdatePayload<T>> id, PacketCodec<? super RegistryByteBuf, T> targetDataCodec) { | ||
| PayloadTypeRegistry.playS2C().register(id, codec(id, targetDataCodec)); | ||
| } | ||
|
|
||
| public static <T> PacketCodec<RegistryByteBuf, ComponentUpdatePayload<T>> codec(Id<ComponentUpdatePayload<T>> id, PacketCodec<? super RegistryByteBuf, T> targetDataCodec) { | ||
| return MorePacketCodecs.tuple( | ||
| PacketCodec.unit(id), ComponentUpdatePayload::id, | ||
| targetDataCodec, ComponentUpdatePayload::targetData, | ||
| ComponentKey.PACKET_CODEC, ComponentUpdatePayload::componentKey, | ||
| MorePacketCodecs.REG_BYTE_BUF, ComponentUpdatePayload::buf, | ||
| ComponentUpdatePayload::new | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public Id<? extends CustomPayload> getId() { | ||
| return id; | ||
| } | ||
| } |
93 changes: 93 additions & 0 deletions
93
...nal-components-base/src/main/java/dev/onyxstudios/cca/internal/base/MorePacketCodecs.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Cardinal-Components-API | ||
| * Copyright (C) 2019-2024 OnyxStudios | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE | ||
| * OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| package dev.onyxstudios.cca.internal.base; | ||
|
|
||
| import com.mojang.datafixers.util.Function4; | ||
| import com.mojang.datafixers.util.Unit; | ||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.buffer.Unpooled; | ||
| import net.minecraft.network.PacketByteBuf; | ||
| import net.minecraft.network.RegistryByteBuf; | ||
| import net.minecraft.network.codec.PacketCodec; | ||
| import net.minecraft.util.math.ChunkPos; | ||
|
|
||
| import java.util.function.Function; | ||
|
|
||
| public final class MorePacketCodecs { | ||
| public static final PacketCodec<ByteBuf, Unit> EMPTY = PacketCodec.unit(Unit.INSTANCE); | ||
|
|
||
| public static final PacketCodec<RegistryByteBuf, RegistryByteBuf> REG_BYTE_BUF = PacketCodec.ofStatic( | ||
| (buf, value) -> { | ||
| buf.writeVarInt(value.readableBytes()); | ||
| buf.writeBytes(value); | ||
| }, | ||
| (buf) -> { | ||
| int readableBytes = buf.readVarInt(); | ||
| ByteBuf copy = Unpooled.buffer(readableBytes, readableBytes); | ||
| buf.readBytes(copy, readableBytes); | ||
| return new RegistryByteBuf(copy, buf.getRegistryManager()); | ||
| } | ||
| ); | ||
|
|
||
| /** | ||
| * A codec for a {@link ChunkPos}. | ||
| * | ||
| * @see PacketByteBuf#readChunkPos() | ||
| * @see PacketByteBuf#writeChunkPos(ChunkPos) | ||
| */ | ||
| public static final PacketCodec<PacketByteBuf, ChunkPos> CHUNKPOS = PacketCodec.ofStatic( | ||
| PacketByteBuf::writeChunkPos, | ||
| PacketByteBuf::readChunkPos | ||
| ); | ||
|
|
||
| /** | ||
| * {@return a codec for encoding three values} | ||
| */ | ||
| public static <B, C, T1, T2, T3, T4> PacketCodec<B, C> tuple( | ||
| PacketCodec<? super B, T1> codec1, | ||
| Function<C, T1> from1, | ||
| PacketCodec<? super B, T2> codec2, | ||
| Function<C, T2> from2, | ||
| PacketCodec<? super B, T3> codec3, | ||
| Function<C, T3> from3, | ||
| PacketCodec<? super B, T4> codec4, | ||
| Function<C, T4> from4, | ||
| Function4<T1, T2, T3, T4, C> to | ||
| ) { | ||
| return PacketCodec.ofStatic( | ||
| (buf, value) -> { | ||
| codec1.encode(buf, from1.apply(value)); | ||
| codec2.encode(buf, from2.apply(value)); | ||
| codec3.encode(buf, from3.apply(value)); | ||
| codec4.encode(buf, from4.apply(value)); | ||
| }, | ||
| (buf) -> { | ||
| T1 object2 = codec1.decode(buf); | ||
| T2 object3 = codec2.decode(buf); | ||
| T3 object4 = codec3.decode(buf); | ||
| T4 object5 = codec4.decode(buf); | ||
| return to.apply(object2, object3, object4, object5); | ||
| } | ||
| ); | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
cardinal-components-block/src/main/java/dev/onyxstudios/cca/internal/BlockEntityAddress.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| /* | ||
| * Cardinal-Components-API | ||
| * Copyright (C) 2019-2024 OnyxStudios | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. | ||
| * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, | ||
| * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE | ||
| * OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
| package dev.onyxstudios.cca.internal; | ||
|
|
||
| import net.minecraft.block.entity.BlockEntityType; | ||
| import net.minecraft.network.RegistryByteBuf; | ||
| import net.minecraft.network.codec.PacketCodec; | ||
| import net.minecraft.network.codec.PacketCodecs; | ||
| import net.minecraft.registry.Registries; | ||
| import net.minecraft.util.math.BlockPos; | ||
|
|
||
| public record BlockEntityAddress( | ||
| BlockEntityType<?> beType, | ||
| BlockPos bePos | ||
| ) { | ||
|
|
||
| public static final PacketCodec<RegistryByteBuf, BlockEntityAddress> CODEC = PacketCodec.tuple( | ||
| PacketCodecs.entryOf(Registries.BLOCK_ENTITY_TYPE), BlockEntityAddress::beType, | ||
| BlockPos.PACKET_CODEC, BlockEntityAddress::bePos, | ||
| BlockEntityAddress::new | ||
| ); | ||
| } |
Oops, something went wrong.