forked from FabricMC/fabric
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extend Data Attachment API to ProtoChunk (FabricMC#3548)
* allow data-attachment on ProtoChunks - moved interfaceInjection from WorldChunk to Chunk - dataAttachment saving on ProtoChunks in ChunkSerializer - copy attachment from ProtoChunk to WorldChunk on creation. - make WrapperProtoChunk wrap attachment calls to WorldChunk * add test for data-attachment on ProtoChunks, and extend testmod. * code style and license headers * fix typos in javadoc * extend testmod to test setting attachment during worldgen. * code formatting * fix testmod: don't crash when feature isn't placed (i.e. on GameTest server) * add warning when adding persistent attachment to chunk with status EMPTY. * update javadoc * update javadoc to reference ServerLivingEntityEvents#MOB_CONVERSION
- Loading branch information
Showing
17 changed files
with
312 additions
and
43 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
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
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
40 changes: 40 additions & 0 deletions
40
...attachment-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WorldChunkMixin.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,40 @@ | ||
| /* | ||
| * Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.fabricmc.fabric.mixin.attachment; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import net.minecraft.server.world.ServerWorld; | ||
| import net.minecraft.world.chunk.ProtoChunk; | ||
| import net.minecraft.world.chunk.WorldChunk; | ||
|
|
||
| import net.fabricmc.fabric.api.attachment.v1.AttachmentTarget; | ||
| import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl; | ||
|
|
||
| @Mixin(WorldChunk.class) | ||
| public class WorldChunkMixin { | ||
| @Inject( | ||
| method = "<init>(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/ProtoChunk;Lnet/minecraft/world/chunk/WorldChunk$EntityLoader;)V", | ||
| at = @At("TAIL") | ||
| ) | ||
| public void transferProtoChunkAttachement(ServerWorld world, ProtoChunk protoChunk, WorldChunk.EntityLoader entityLoader, CallbackInfo ci) { | ||
| AttachmentTargetImpl.transfer(protoChunk, (AttachmentTarget) this, false); | ||
| } | ||
| } |
75 changes: 75 additions & 0 deletions
75
...ent-api-v1/src/main/java/net/fabricmc/fabric/mixin/attachment/WrapperProtoChunkMixin.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,75 @@ | ||
| /* | ||
| * Copyright (c) 2016, 2017, 2018, 2019 FabricMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.fabricmc.fabric.mixin.attachment; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import org.jetbrains.annotations.Nullable; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
|
|
||
| import net.minecraft.nbt.NbtCompound; | ||
| import net.minecraft.world.chunk.WorldChunk; | ||
| import net.minecraft.world.chunk.WrapperProtoChunk; | ||
|
|
||
| import net.fabricmc.fabric.api.attachment.v1.AttachmentType; | ||
| import net.fabricmc.fabric.impl.attachment.AttachmentTargetImpl; | ||
|
|
||
| @Mixin(WrapperProtoChunk.class) | ||
| public class WrapperProtoChunkMixin implements AttachmentTargetImpl { | ||
| @Shadow | ||
| @Final | ||
| private WorldChunk wrapped; | ||
|
|
||
| @Override | ||
| @Nullable | ||
| public <T> T getAttached(AttachmentType<T> type) { | ||
| return this.wrapped.getAttached(type); | ||
| } | ||
|
|
||
| @Override | ||
| @Nullable | ||
| public <T> T setAttached(AttachmentType<T> type, @Nullable T value) { | ||
| return this.wrapped.setAttached(type, value); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean hasAttached(AttachmentType<?> type) { | ||
| return this.wrapped.hasAttached(type); | ||
| } | ||
|
|
||
| @Override | ||
| public void fabric_writeAttachmentsToNbt(NbtCompound nbt) { | ||
| ((AttachmentTargetImpl) this.wrapped).fabric_writeAttachmentsToNbt(nbt); | ||
| } | ||
|
|
||
| @Override | ||
| public void fabric_readAttachmentsFromNbt(NbtCompound nbt) { | ||
| ((AttachmentTargetImpl) this.wrapped).fabric_readAttachmentsFromNbt(nbt); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean fabric_hasPersistentAttachments() { | ||
| return ((AttachmentTargetImpl) this.wrapped).fabric_hasPersistentAttachments(); | ||
| } | ||
|
|
||
| @Override | ||
| public Map<AttachmentType<?>, ?> fabric_getAttachments() { | ||
| return ((AttachmentTargetImpl) this.wrapped).fabric_getAttachments(); | ||
| } | ||
| } |
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
Oops, something went wrong.