diff --git a/gradle.properties b/gradle.properties index b7292a8abb8..1cc48c4d114 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,8 +11,8 @@ artifact_basename=appliedenergistics2-forge minecraft_release=1.19 minecraft_version=1.19.2 minecraft_version_range=[1.19.2,1.19.3) -forge_version=43.1.25 -forge_version_range=[43.1.24,44.0.0) +forge_version=43.1.55 +forge_version_range=[43.1.55,44.0.0) ######################################################### # Provided APIs # diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java index 9ebaeaf3792..59836424100 100644 --- a/src/main/java/appeng/block/networking/CableBusBlock.java +++ b/src/main/java/appeng/block/networking/CableBusBlock.java @@ -432,20 +432,15 @@ public boolean addDestroyEffects(BlockState state, Level level, BlockPos pos, */ public static ThreadLocal RENDERING_FACADE_DIRECTION = new ThreadLocal<>(); - // TODO: fix ugliness when forge finally merges #9066 - // @Override + @Override public BlockState getAppearance(BlockState state, BlockAndTintGetter renderView, BlockPos pos, Direction side, @Nullable BlockState sourceState, @Nullable BlockPos sourcePos) { - // Just for access to the model data from the BE's level (waiting for #9066 to get it from renderView directly) - var be = renderView.getBlockEntity(pos); - if (be == null) { - return state; - } ModelData modelData; - var modelDataManager = be.getLevel().getModelDataManager(); + var modelDataManager = renderView.getModelDataManager(); if (modelDataManager == null) { // We're on the server, use BE directly - modelData = be.getModelData(); + BlockEntity be = renderView.getBlockEntity(pos); + modelData = be != null ? be.getModelData() : ModelData.EMPTY; } else { modelData = Objects.requireNonNullElse(modelDataManager.getAt(pos), ModelData.EMPTY); } @@ -468,14 +463,4 @@ public BlockState getAppearance(BlockState state, BlockAndTintGetter renderView, } return state; } - - // Just for query until #9066 is merged - public static BlockState getAppearanceTemp(BlockState state, BlockAndTintGetter renderView, BlockPos pos, - Direction side, @Nullable BlockState sourceState, @Nullable BlockPos sourcePos) { - if (state.getBlock() instanceof CableBusBlock cableBus) { - return cableBus.getAppearance(state, renderView, pos, side, sourceState, sourcePos); - } else { - return state; - } - } } diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index a606472dbaf..17fc3b3e8ec 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -50,7 +50,6 @@ import appeng.api.parts.PartHelper; import appeng.api.util.AEAxisAlignedBB; -import appeng.block.networking.CableBusBlock; import appeng.parts.misc.CableAnchorPart; import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper; import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker; @@ -288,7 +287,7 @@ public Mesh getFacadeMesh(CableBusRenderState renderState, Supplier