diff --git a/common/build.gradle b/common/build.gradle index 85ea3d18..dfacb2c5 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -23,6 +23,7 @@ task sourcesJar(type: Jar, dependsOn: classes) { publishing { publications { mavenCommon(MavenPublication) { + artifactId = rootProject.archivesBaseName artifact(file("${project.buildDir}/libs/${project.archivesBaseName}-${project.version}.jar")) { builtBy build } diff --git a/fabric/build.gradle b/fabric/build.gradle index 523ca587..48e4e110 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -63,7 +63,7 @@ remapJar { publishing { publications { mavenFabric(MavenPublication) { - artifactId = rootProject.archives_base_name + "-fabric" + artifactId = rootProject.archivesBaseName + "-fabric" artifact(remapJar.archivePath) { builtBy build classifier null diff --git a/forge/build.gradle b/forge/build.gradle index 49a7ddfe..a09ce537 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -64,7 +64,7 @@ remapJar { publishing { publications { mavenForge(MavenPublication) { - artifactId = rootProject.archives_base_name + "-forge" + artifactId = rootProject.archivesBaseName + "-forge" artifact(remapJar.archivePath) { builtBy build classifier null diff --git a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MixinBlockEntityExtension.java b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MixinBlockEntityExtension.java index fea8725e..c24dacbb 100644 --- a/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MixinBlockEntityExtension.java +++ b/forge/src/main/java/me/shedaniel/architectury/mixin/forge/MixinBlockEntityExtension.java @@ -21,6 +21,9 @@ package me.shedaniel.architectury.mixin.forge; import me.shedaniel.architectury.extensions.BlockEntityExtension; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.Connection; +import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.extensions.IForgeTileEntity; import org.jetbrains.annotations.NotNull; @@ -36,4 +39,9 @@ public interface MixinBlockEntityExtension extends IForgeTileEntity { default void handleUpdateTag(BlockState state, CompoundTag tag) { loadClientData(state, tag); } + + @Override + default void onDataPacket(Connection connection, ClientboundBlockEntityDataPacket packet) { + loadClientData(((BlockEntity) this).getBlockState(), packet.getTag()); + } }