diff --git a/src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java b/src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java
index 5eb50c55b..2b0609c50 100644
--- a/src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java
+++ b/src/main/java/appeng/block/crafting/CraftingMonitorBlockRendering.java
@@ -1,28 +1,32 @@
 package appeng.block.crafting;
 
-import net.minecraft.client.renderer.RenderType;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
 import appeng.bootstrap.BlockRenderingCustomizer;
 import appeng.bootstrap.IBlockRendering;
 import appeng.bootstrap.IItemRendering;
 import appeng.client.render.crafting.MonitorBakedModel;
 import appeng.client.render.model.AutoRotatingBakedModel;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.model.BakedModel;
+import net.minecraft.util.Identifier;
 
 public class CraftingMonitorBlockRendering extends BlockRenderingCustomizer {
 
     @Override
-    @OnlyIn(Dist.CLIENT)
+    @Environment(EnvType.CLIENT)
     public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
-        rendering.renderType(RenderType.getCutout());
-        rendering.modelCustomizer((path, model) -> {
-            // The formed model handles rotations itself, the unformed one does not
-            if (model instanceof MonitorBakedModel) {
-                return model;
-            }
-            return new AutoRotatingBakedModel(model);
-        });
+        rendering.renderType(RenderLayer.getCutout());
+        rendering.modelCustomizer(CraftingMonitorBlockRendering::customizeModel);
+    }
+
+    @Environment(EnvType.CLIENT)
+    private static BakedModel customizeModel(Identifier path, BakedModel model) {
+        // The formed model handles rotations itself, the unformed one does not
+        if (model instanceof MonitorBakedModel) {
+            return model;
+        }
+        return new AutoRotatingBakedModel(model);
     }
 
 }
diff --git a/src/main/java/appeng/client/render/tesr/ChargerTESR.java b/src/main/java/appeng/client/render/tesr/ChargerTESR.java
index 0bb65eac0..eb269a2f7 100644
--- a/src/main/java/appeng/client/render/tesr/ChargerTESR.java
+++ b/src/main/java/appeng/client/render/tesr/ChargerTESR.java
@@ -5,26 +5,27 @@ import java.util.function.Function;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
 
-import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
+import net.minecraft.client.render.block.entity.BlockEntityRenderer;
+import net.minecraft.client.render.model.json.Transformation;
+import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.vector.TransformationMatrix;
-import net.minecraft.util.math.vector.Vector3f;
 
 import appeng.client.render.renderable.ItemRenderable;
-import appeng.tile.misc.ChargerTileEntity;
+import appeng.tile.misc.ChargerBlockEntity;
 
 public final class ChargerTESR {
 
     private ChargerTESR() {
     }
 
-    public static Function<TileEntityRendererDispatcher, TileEntityRenderer<ChargerTileEntity>> FACTORY = dispatcher -> new ModularTESR<>(
+    public static Function<BlockEntityRenderDispatcher, BlockEntityRenderer<ChargerBlockEntity>> FACTORY = dispatcher -> new ModularTESR<>(
             dispatcher, new ItemRenderable<>(ChargerTESR::getRenderedItem));
 
-    private static Pair<ItemStack, TransformationMatrix> getRenderedItem(ChargerTileEntity tile) {
-        TransformationMatrix transform = new TransformationMatrix(new Vector3f(0.5f, 0.375f, 0.5f), null, null, null);
-        return new ImmutablePair<>(tile.getInternalInventory().getStackInSlot(0), transform);
+    private static Pair<ItemStack, Transformation> getRenderedItem(ChargerBlockEntity tile) {
+        Transformation transform = new Transformation(new Vector3f(), new Vector3f(0.5f, 0.375f, 0.5f),
+                new Vector3f(1f, 1f, 1f));
+        return new ImmutablePair<>(tile.getInternalInventory().getInvStack(0), transform);
     }
 
 }