icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.13.2 used CM postfix for NBTs

Browse Source 
just to avoid potential name collisions in case Mojang decides suddenly to add that tag and name it the same.
This commit is contained in:
gnembon authored and GitHub committed 2019-06-05 22:46:33 -03:00
1 parent e409ae4108
commit 80c3494f23
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/mixins/PistonBlockEntity_movableTEMixin.java
+4 -4
View File
@@ -118,12 +118,12 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple
@Inject(method = "fromTag", at = @At(value = "TAIL"))
private void onFromTag(CompoundTag compoundTag_1, CallbackInfo ci)
{
if (CarpetSettings.b_movableTileEntities && compoundTag_1.containsKey("carriedTileEntity", 10))
if (CarpetSettings.b_movableTileEntities && compoundTag_1.containsKey("carriedTileEntityCM", 10))
{
if (this.pushedBlock.getBlock() instanceof BlockEntityProvider)
this.carriedBlockEntity = ((BlockEntityProvider) (this.pushedBlock.getBlock())).createBlockEntity(this.world);
if (carriedBlockEntity != null) //Can actually be null, as BlockPistonMoving.createNewTileEntity(...) returns null
this.carriedBlockEntity.fromTag(compoundTag_1.getCompound("carriedTileEntity"));
this.carriedBlockEntity.fromTag(compoundTag_1.getCompound("carriedTileEntityCM"));
}
}
@@ -132,8 +132,8 @@ public abstract class PistonBlockEntity_movableTEMixin extends BlockEntity imple
{
if (CarpetSettings.b_movableTileEntities && this.carriedBlockEntity != null)
{
//Leave name "carriedTileEntity" instead of "carriedBlockEntity" for upgrade compatibility with 1.12 movable TE
compoundTag_1.put("carriedTileEntity", this.carriedBlockEntity.toTag(new CompoundTag()));
//Leave name "carriedTileEntityCM" instead of "carriedBlockEntityCM" for upgrade compatibility with 1.13.2 movable TE
compoundTag_1.put("carriedTileEntityCM", this.carriedBlockEntity.toTag(new CompoundTag()));
}
}
}