diff --git a/gradle.properties b/gradle.properties
index 7f690e3e3..4365e33d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,24 +3,19 @@ version=0.0.0-SNAPSHOT
 artifact_group=appeng
 artifact_basename=appliedenergistics2-fabric
 
-kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # Check these on https://modmuss50.me/fabric.html
 
-minecraft_version=1.16.2
-yarn_mappings=1.16.2+build.6
-loader_version=0.9.2+build.206
+minecraft_version=1.16.3
+yarn_mappings=1.16.3+build.11
+loader_version=0.9.3+build.207
 
 #Fabric api
-fabric_version=0.20.1+build.401-1.16
+fabric_version=0.21.0+build.407-1.16
 
-loom_version=0.4-SNAPSHOT
-
-# Kotlin
-kotlin_version=1.3.61
-fabric_kotlin_version=1.3.61+build.1
+loom_version=0.5-SNAPSHOT
 
 # Dependencies
 libblockattributes_version=0.8.0
diff --git a/settings.gradle b/settings.gradle
index 38976671c..a5fd80b1e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,6 @@ pluginManagement {
 
     plugins {
         id "fabric-loom" version loom_version
-        id "org.jetbrains.kotlin.jvm" version kotlin_version
     }
 
 }
diff --git a/src/main/java/appeng/block/networking/CableBusBlock.java b/src/main/java/appeng/block/networking/CableBusBlock.java
index d0eb4ff26..fe889fcec 100644
--- a/src/main/java/appeng/block/networking/CableBusBlock.java
+++ b/src/main/java/appeng/block/networking/CableBusBlock.java
@@ -86,7 +86,7 @@ public class CableBusBlock extends AEBaseTileBlock<CableBusBlockEntity> implemen
 
     public CableBusBlock() {
         super(defaultProps(AEMaterials.GLASS).nonOpaque().dropsNothing().dynamicBounds()
-                .lightLevel(state -> state.get(LIGHT_LEVEL)));
+                .luminance(state -> state.get(LIGHT_LEVEL)));
         setDefaultState(getDefaultState().with(LIGHT_LEVEL, 0));
     }
 
diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
index 02cefc91a..fe2812c32 100644
--- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
+++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java
@@ -38,11 +38,11 @@ import appeng.helpers.Splotch;
  */
 class PaintSplotchesBakedModel implements BakedModel, FabricBakedModel {
 
-    private static final SpriteIdentifier TEXTURE_PAINT1 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_PAINT1 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/paint1"));
-    private static final SpriteIdentifier TEXTURE_PAINT2 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_PAINT2 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/paint2"));
-    private static final SpriteIdentifier TEXTURE_PAINT3 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_PAINT3 = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/paint3"));
 
     private final Sprite[] textures;
diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
index 081a5a3f7..a6887d8f5 100644
--- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
+++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java
@@ -36,18 +36,18 @@ import appeng.core.AppEng;
 
 class QnbFormedBakedModel implements BakedModel, FabricBakedModel {
 
-    private static final SpriteIdentifier TEXTURE_LINK = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_LINK = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/quantum_link"));
-    private static final SpriteIdentifier TEXTURE_RING = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_RING = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/quantum_ring"));
-    private static final SpriteIdentifier TEXTURE_RING_LIGHT = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_RING_LIGHT = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/quantum_ring_light"));
     private static final SpriteIdentifier TEXTURE_RING_LIGHT_CORNER = new SpriteIdentifier(
-            SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "block/quantum_ring_light_corner"));
-    private static final SpriteIdentifier TEXTURE_CABLE_GLASS = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+            SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, new Identifier(AppEng.MOD_ID, "block/quantum_ring_light_corner"));
+    private static final SpriteIdentifier TEXTURE_CABLE_GLASS = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "part/cable/glass/transparent"));
     private static final SpriteIdentifier TEXTURE_COVERED_CABLE = new SpriteIdentifier(
-            SpriteAtlasTexture.BLOCK_ATLAS_TEX, new Identifier(AppEng.MOD_ID, "part/cable/covered/transparent"));
+            SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, new Identifier(AppEng.MOD_ID, "part/cable/covered/transparent"));
 
     private static final float DEFAULT_RENDER_MIN = 2.0f;
     private static final float DEFAULT_RENDER_MAX = 14.0f;
diff --git a/src/main/java/appeng/client/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
index 6f4218d00..4440af35d 100644
--- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java
+++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java
@@ -104,7 +104,7 @@ class CableBuilder {
                 throw new IllegalStateException("Cable type " + cableType + " does not support connections.");
         }
 
-        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
                 new Identifier(AppEng.MOD_ID, textureFolder + color.name().toLowerCase(Locale.ROOT)));
     }
 
diff --git a/src/main/java/appeng/client/render/cablebus/CableCoreType.java b/src/main/java/appeng/client/render/cablebus/CableCoreType.java
index 01928e150..35851d920 100644
--- a/src/main/java/appeng/client/render/cablebus/CableCoreType.java
+++ b/src/main/java/appeng/client/render/cablebus/CableCoreType.java
@@ -74,7 +74,7 @@ public enum CableCoreType {
     }
 
     public SpriteIdentifier getTexture(AEColor color) {
-        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
                 new Identifier(AppEng.MOD_ID, this.textureFolder + "/" + color.name().toLowerCase(Locale.ROOT)));
     }
 
diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
index 89c9e0f92..a6af96a06 100644
--- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
+++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
@@ -18,7 +18,7 @@ import appeng.core.AppEng;
 
 public class P2PTunnelFrequencyModel implements BasicUnbakedModel {
 
-    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "part/p2p_tunnel_frequency"));
 
     @Nullable
diff --git a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
index 84b21627d..829f8d107 100644
--- a/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
+++ b/src/main/java/appeng/client/render/cablebus/SmartCableTextures.java
@@ -47,7 +47,7 @@ public class SmartCableTextures {
                     new Identifier(AppEng.MOD_ID, "part/cable/smart/channels_12"), //
                     new Identifier(AppEng.MOD_ID, "part/cable/smart/channels_13"), //
                     new Identifier(AppEng.MOD_ID, "part/cable/smart/channels_14")//
-            }).map(e -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, e)).toArray(SpriteIdentifier[]::new);
+            }).map(e -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, e)).toArray(SpriteIdentifier[]::new);
 
     // Textures used to display channels on smart cables. There's two sets of 5
     // textures each, and
diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
index 41e33c4ab..d7b5a4d2d 100644
--- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
+++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java
@@ -115,7 +115,7 @@ public class CraftingCubeModel implements BasicUnbakedModel {
     }
 
     private static SpriteIdentifier texture(String name) {
-        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
                 new Identifier(AppEng.MOD_ID, "block/crafting/" + name));
     }
 }
diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java
index c72451a72..b0d4e5565 100644
--- a/src/main/java/appeng/client/render/model/BiometricCardModel.java
+++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java
@@ -25,7 +25,7 @@ import appeng.core.AppEng;
 public class BiometricCardModel implements BasicUnbakedModel {
 
     public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/biometric_card_base");
-    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "item/biometric_card_hash"));
 
     @Override
diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java
index d69540399..36567d7cf 100644
--- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java
+++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java
@@ -26,11 +26,11 @@ public class ColorApplicatorModel implements BasicUnbakedModel {
 
     private static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/color_applicator_colored");
 
-    private static final SpriteIdentifier TEXTURE_DARK = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_DARK = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_dark"));
-    private static final SpriteIdentifier TEXTURE_MEDIUM = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_MEDIUM = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_medium"));
-    private static final SpriteIdentifier TEXTURE_BRIGHT = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_BRIGHT = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "item/color_applicator_tip_bright"));
 
     @Override
diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java
index ceec383fa..5a9df8f94 100644
--- a/src/main/java/appeng/client/render/model/GlassBakedModel.java
+++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java
@@ -62,13 +62,13 @@ class GlassBakedModel implements BakedModel, FabricBakedModel {
     private static final byte[][][] OFFSETS = generateOffsets();
 
     // Alternating textures based on position
-    static final SpriteIdentifier TEXTURE_A = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    static final SpriteIdentifier TEXTURE_A = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier("appliedenergistics2:block/glass/quartz_glass_a"));
-    static final SpriteIdentifier TEXTURE_B = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    static final SpriteIdentifier TEXTURE_B = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier("appliedenergistics2:block/glass/quartz_glass_b"));
-    static final SpriteIdentifier TEXTURE_C = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    static final SpriteIdentifier TEXTURE_C = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier("appliedenergistics2:block/glass/quartz_glass_c"));
-    static final SpriteIdentifier TEXTURE_D = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    static final SpriteIdentifier TEXTURE_D = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier("appliedenergistics2:block/glass/quartz_glass_d"));
 
     // Frame texture
@@ -81,7 +81,7 @@ class GlassBakedModel implements BakedModel, FabricBakedModel {
     private static SpriteIdentifier[] generateTexturesFrame() {
         return IntStream.range(1, 16).mapToObj(Integer::toBinaryString).map(s -> Strings.padStart(s, 4, '0'))
                 .map(s -> new Identifier("appliedenergistics2:block/glass/quartz_glass_frame" + s))
-                .map(rl -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, rl))
+                .map(rl -> new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, rl))
                 .toArray(SpriteIdentifier[]::new);
     }
 
diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java
index 0591a0a14..e46ce9110 100644
--- a/src/main/java/appeng/client/render/model/MemoryCardModel.java
+++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java
@@ -25,7 +25,7 @@ import appeng.core.AppEng;
 public class MemoryCardModel implements BasicUnbakedModel {
 
     public static final Identifier MODEL_BASE = new Identifier(AppEng.MOD_ID, "item/memory_card_base");
-    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "item/memory_card_hash"));
 
     @Override
diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
index 95580ee0b..deeb2f797 100644
--- a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
+++ b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
@@ -59,7 +59,7 @@ public class SpatialPylonModel implements BasicUnbakedModel {
     }
 
     private static SpriteIdentifier getTexturePath(SpatialPylonTextureType type) {
-        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+        return new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
                 new Identifier(AppEng.MOD_ID, "block/spatial_pylon/" + type.name().toLowerCase(Locale.ROOT)));
     }
 
diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java
index ce592c6df..47a61f5cc 100644
--- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java
+++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java
@@ -38,7 +38,7 @@ public final class InscriberTESR extends BlockEntityRenderer<InscriberBlockEntit
 
     private static final float ITEM_RENDER_SCALE = 1.0f / 1.2f;
 
-    private static final SpriteIdentifier TEXTURE_INSIDE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX,
+    private static final SpriteIdentifier TEXTURE_INSIDE = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE,
             new Identifier(AppEng.MOD_ID, "block/inscriber_inside"));
 
     public static final ImmutableList<SpriteIdentifier> SPRITES = ImmutableList.of(TEXTURE_INSIDE);
diff --git a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
index e7f926023..4b9211a3c 100644
--- a/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
+++ b/src/main/java/appeng/entity/TinyTNTPrimedRenderer.java
@@ -74,6 +74,6 @@ public class TinyTNTPrimedRenderer extends EntityRenderer<TinyTNTPrimedEntity> {
 
     @Override
     public Identifier getTexture(final TinyTNTPrimedEntity entity) {
-        return SpriteAtlasTexture.BLOCK_ATLAS_TEX;
+        return SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE;
     }
 }
diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
index 99c2ae59f..93b3d78a8 100644
--- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
+++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java
@@ -111,7 +111,7 @@ abstract class RecipeTransferHandler<T extends ScreenHandler & IContainerCraftin
                     if (i < flatIngredients.size()) {
                         ItemStack displayedIngredient = first.getItemStack();
                         if (displayedIngredient != null) {
-                            flatIngredients.set(i, Ingredient.method_26964(Stream.of(displayedIngredient)));
+                            flatIngredients.set(i, Ingredient.ofStacks(Stream.of(displayedIngredient)));
                         }
                     }
                 }
diff --git a/src/main/java/appeng/integration/modules/waila/part/Tracer.java b/src/main/java/appeng/integration/modules/waila/part/Tracer.java
index 6222287af..32747b7b5 100644
--- a/src/main/java/appeng/integration/modules/waila/part/Tracer.java
+++ b/src/main/java/appeng/integration/modules/waila/part/Tracer.java
@@ -47,6 +47,6 @@ public final class Tracer {
         BlockState blockState = world.getBlockState(pos);
 
         LookDirection playerRay = Platform.getPlayerRay(player);
-        return blockState.getCollisionShape(world, pos).rayTrace(playerRay.getA(), playerRay.getB(), pos);
+        return blockState.getCollisionShape(world, pos).raycast(playerRay.getA(), playerRay.getB(), pos);
     }
 }
diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
index 0be2721f4..ad7c06bdb 100644
--- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
+++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java
@@ -54,7 +54,7 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 import appeng.api.config.Actionable;
@@ -219,7 +219,7 @@ public class EntropyManipulatorItem extends AEBasePoweredItem implements IBlockT
     // considered for onItemUse
     @Override
     public TypedActionResult<ItemStack> use(final World w, final PlayerEntity p, final Hand hand) {
-        final BlockHitResult target = rayTrace(w, p, RayTraceContext.FluidHandling.ANY);
+        final BlockHitResult target = raycast(w, p, RaycastContext.FluidHandling.ANY);
 
         if (target.getType() != HitResult.Type.BLOCK) {
             BlockPos pos = target.getBlockPos();
diff --git a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java
index f3749163e..7dff4e561 100644
--- a/src/main/java/appeng/items/tools/powered/MatterCannonItem.java
+++ b/src/main/java/appeng/items/tools/powered/MatterCannonItem.java
@@ -48,7 +48,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.item.FixedItemInv;
@@ -200,7 +200,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
                 final float f1 = 0.3F;
 
                 final Box boundingBox = entity1.getBoundingBox().expand(f1, f1, f1);
-                final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null);
+                final Vec3d intersection = boundingBox.raycast(Vec3d, Vec3d1).orElse(null);
 
                 if (intersection != null) {
                     final double nd = Vec3d.squaredDistanceTo(intersection);
@@ -214,9 +214,9 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
             }
         }
 
-        RayTraceContext rayTraceContext = new RayTraceContext(Vec3d, Vec3d1, RayTraceContext.ShapeType.COLLIDER,
-                RayTraceContext.FluidHandling.NONE, p);
-        HitResult pos = w.rayTrace(rayTraceContext);
+        RaycastContext rayTraceContext = new RaycastContext(Vec3d, Vec3d1, RaycastContext.ShapeType.COLLIDER,
+                RaycastContext.FluidHandling.NONE, p);
+        HitResult pos = w.raycast(rayTraceContext);
 
         final Vec3d vec = new Vec3d(d0, d1, d2);
         if (entity != null && pos.getType() != HitResult.Type.MISS && pos.getPos().squaredDistanceTo(vec) > closest) {
@@ -307,7 +307,7 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
                         final float f1 = 0.3F;
 
                         final Box boundingBox = entity1.getBoundingBox().expand(f1, f1, f1);
-                        final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null);
+                        final Vec3d intersection = boundingBox.raycast(Vec3d, Vec3d1).orElse(null);
 
                         if (intersection != null) {
                             final double nd = Vec3d.squaredDistanceTo(intersection);
@@ -322,10 +322,10 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
                 }
             }
 
-            RayTraceContext rayTraceContext = new RayTraceContext(Vec3d, Vec3d1, RayTraceContext.ShapeType.COLLIDER,
-                    RayTraceContext.FluidHandling.NONE, p);
+            RaycastContext rayTraceContext = new RaycastContext(Vec3d, Vec3d1, RaycastContext.ShapeType.COLLIDER,
+                    RaycastContext.FluidHandling.NONE, p);
             final Vec3d vec = new Vec3d(d0, d1, d2);
-            HitResult pos = w.rayTrace(rayTraceContext);
+            HitResult pos = w.raycast(rayTraceContext);
             if (entity != null && pos.getType() != HitResult.Type.MISS
                     && pos.getPos().squaredDistanceTo(vec) > closest) {
                 pos = new EntityHitResult(entity, entityIntersection);
diff --git a/src/main/java/appeng/mixins/spatial/BiomesMixin.java b/src/main/java/appeng/mixins/spatial/BiomesMixin.java
index 61698c93d..16d667e81 100644
--- a/src/main/java/appeng/mixins/spatial/BiomesMixin.java
+++ b/src/main/java/appeng/mixins/spatial/BiomesMixin.java
@@ -12,8 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import net.minecraft.util.registry.BuiltinRegistries;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biomes;
-
+import net.minecraft.world.biome.BiomeKeys;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 
 import appeng.spatial.SpatialStorageBiome;
@@ -23,7 +22,7 @@ import appeng.spatial.SpatialStorageDimensionIds;
  * This only needs to be here because the server-side will create a dynamic
  * registry manager long before our mod is initialized.
  */
-@Mixin(Biomes.class)
+@Mixin(BiomeKeys.class)
 public class BiomesMixin {
 
     @Unique
diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java
index e18ca9e32..3666ecc15 100644
--- a/src/main/java/appeng/parts/PartPlacement.java
+++ b/src/main/java/appeng/parts/PartPlacement.java
@@ -38,7 +38,7 @@ import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 import appeng.api.definitions.IBlockDefinition;
@@ -76,9 +76,9 @@ public class PartPlacement {
 
         // FIXME: This was changed alot.
         final LookDirection dir = Platform.getPlayerRay(player);
-        RayTraceContext rtc = new RayTraceContext(dir.getA(), dir.getB(), RayTraceContext.ShapeType.OUTLINE,
-                RayTraceContext.FluidHandling.NONE, player);
-        final BlockHitResult mop = world.rayTrace(rtc);
+        RaycastContext rtc = new RaycastContext(dir.getA(), dir.getB(), RaycastContext.ShapeType.OUTLINE,
+                RaycastContext.FluidHandling.NONE, player);
+        final BlockHitResult mop = world.raycast(rtc);
         ItemPlacementContext useContext = new ItemPlacementContext(new ItemUsageContext(player, hand, mop));
 
         BlockEntity tile = world.getBlockEntity(pos);
diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java
index 56cf31d46..3355d477a 100644
--- a/src/main/java/appeng/parts/automation/FormationPlanePart.java
+++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java
@@ -392,12 +392,12 @@ public class FormationPlanePart extends AbstractFormationPlanePart<IAEItemStack>
 
         @Override
         public BlockPos getBlockPos() {
-            return this.method_30344().getBlockPos();
+            return this.getHitResult().getBlockPos();
         }
 
         @Override
         public boolean canPlace() {
-            return this.getWorld().getBlockState(this.method_30344().getBlockPos()).canReplace(this);
+            return this.getWorld().getBlockState(this.getHitResult().getBlockPos()).canReplace(this);
         }
 
         @Override
diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/main/java/appeng/parts/automation/PlaneModel.java
index e21c15601..b00d2952d 100644
--- a/src/main/java/appeng/parts/automation/PlaneModel.java
+++ b/src/main/java/appeng/parts/automation/PlaneModel.java
@@ -43,9 +43,9 @@ public class PlaneModel implements BasicUnbakedModel {
     private final SpriteIdentifier backTexture;
 
     public PlaneModel(Identifier frontTexture, Identifier sidesTexture, Identifier backTexture) {
-        this.frontTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, frontTexture);
-        this.sidesTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, sidesTexture);
-        this.backTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEX, backTexture);
+        this.frontTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, frontTexture);
+        this.sidesTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, sidesTexture);
+        this.backTexture = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, backTexture);
     }
 
     @Nullable
diff --git a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
index 4840d1ad8..e0cfb1503 100644
--- a/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
+++ b/src/main/java/appeng/spatial/SpatialStorageChunkGenerator.java
@@ -84,7 +84,7 @@ public class SpatialStorageChunkGenerator extends ChunkGenerator {
     }
 
     private static FixedBiomeSource createBiomeSource(Registry<Biome> biomeRegistry) {
-        return new FixedBiomeSource(biomeRegistry.method_31140(SpatialStorageDimensionIds.BIOME_KEY));
+        return new FixedBiomeSource(biomeRegistry.getOrThrow(SpatialStorageDimensionIds.BIOME_KEY));
     }
 
     public Registry<Biome> getBiomeRegistry() {
diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
index 5a766b505..eb28a10d5 100644
--- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
+++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java
@@ -145,7 +145,7 @@ public class MolecularAssemblerRenderer extends BlockEntityRenderer<MolecularAss
      * model from occluding our particles.
      */
     private static RenderLayer createRenderType() {
-        RenderPhase.Texture mipmapBlockAtlasTexture = new RenderPhase.Texture(SpriteAtlasTexture.BLOCK_ATLAS_TEX, false,
+        RenderPhase.Texture mipmapBlockAtlasTexture = new RenderPhase.Texture(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, false,
                 true);
         RenderPhase.Lightmap disableLightmap = new RenderPhase.Lightmap(false);
         RenderLayer.MultiPhaseParameters glState = RenderLayer.MultiPhaseParameters.builder()
diff --git a/src/main/java/appeng/tile/misc/InscriberRecipes.java b/src/main/java/appeng/tile/misc/InscriberRecipes.java
index 56cb3db43..aa4142df9 100644
--- a/src/main/java/appeng/tile/misc/InscriberRecipes.java
+++ b/src/main/java/appeng/tile/misc/InscriberRecipes.java
@@ -80,7 +80,7 @@ public final class InscriberRecipes {
             name += " " + tag.getString(MaterialItem.TAG_INSCRIBE_NAME);
         }
 
-        final Ingredient startingItem = Ingredient.method_26964(Stream.of(input.copy()));
+        final Ingredient startingItem = Ingredient.ofStacks(Stream.of(input.copy()));
         final ItemStack renamedItem = input.copy();
 
         if (!name.isEmpty()) {
@@ -92,8 +92,8 @@ public final class InscriberRecipes {
         final InscriberProcessType type = InscriberProcessType.INSCRIBE;
 
         return new InscriberRecipe(NAMEPLATE_RECIPE_ID, "", startingItem, renamedItem,
-                plateA.isEmpty() ? Ingredient.EMPTY : Ingredient.method_26964(Stream.of(plateA)),
-                plateB.isEmpty() ? Ingredient.EMPTY : Ingredient.method_26964(Stream.of(plateB)), type);
+                plateA.isEmpty() ? Ingredient.EMPTY : Ingredient.ofStacks(Stream.of(plateA)),
+                plateB.isEmpty() ? Ingredient.EMPTY : Ingredient.ofStacks(Stream.of(plateB)), type);
     }
 
     /**
diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java
index db73efec4..31e9df6b9 100644
--- a/src/main/java/appeng/util/Platform.java
+++ b/src/main/java/appeng/util/Platform.java
@@ -61,7 +61,7 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.registry.Registry;
-import net.minecraft.world.RayTraceContext;
+import net.minecraft.world.RaycastContext;
 import net.minecraft.world.World;
 
 import alexiil.mc.lib.attributes.fluid.volume.FluidVolume;
@@ -715,7 +715,7 @@ public class Platform {
                     f1 = 0.3F;
                     // FIXME: Three different bounding boxes available, should double-check
                     final Box boundingBox = entity1.getBoundingBox().expand(f1, f1, f1);
-                    final Vec3d rtResult = boundingBox.rayTrace(vec3, vec31).orElse(null);
+                    final Vec3d rtResult = boundingBox.raycast(vec3, vec31).orElse(null);
 
                     if (rtResult != null) {
                         final double nd = vec3.squaredDistanceTo(rtResult);
@@ -735,8 +735,8 @@ public class Platform {
         if (hitBlocks) {
             vec = new Vec3d(d0, d1, d2);
             // FIXME: passing p as entity here might be incorrect
-            pos = w.rayTrace(new RayTraceContext(vec3, vec31, RayTraceContext.ShapeType.COLLIDER,
-                    RayTraceContext.FluidHandling.ANY, p));
+            pos = w.raycast(new RaycastContext(vec3, vec31, RaycastContext.ShapeType.COLLIDER,
+                    RaycastContext.FluidHandling.ANY, p));
         }
 
         if (entity != null && pos != null && pos.getPos().squaredDistanceTo(vec) > closest) {