Ported model dependency changes from Fabric 1.16.

Made IChestLid sided.

src/main/java/appeng/client/render/cablebus/CableBusModel.java

@@ -19,33 +19,30 @@
 package appeng.client.render.cablebus;
 
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
+import java.util.stream.Stream;
 
 import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.util.Pair;
 
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.IModelTransform;
-import net.minecraft.client.renderer.model.IUnbakedModel;
 import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.renderer.model.ModelBakery;
 import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelConfiguration;
-import net.minecraftforge.client.model.geometry.IModelGeometry;
 
 import appeng.api.util.AEColor;
+import appeng.client.render.BasicUnbakedModel;
 import appeng.core.AELog;
 import appeng.core.features.registries.PartModels;
 
 /**
  * The built-in model for the cable bus block.
  */
-public class CableBusModel implements IModelGeometry<CableBusModel> {
+public class CableBusModel implements BasicUnbakedModel<CableBusModel> {
 
     private final PartModels partModels;
 
@@ -53,6 +50,17 @@ public class CableBusModel implements IModelGeometry<CableBusModel> {
         this.partModels = partModels;
     }
 
+    @Override
+    public Collection<ResourceLocation> getModelDependencies() {
+        partModels.setInitialized(true);
+        return partModels.getModels();
+    }
+
+    @Override
+    public Stream<RenderMaterial> getAdditionalTextures() {
+        return CableBuilder.getTextures().stream();
+    }
+
     @Override
     public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery,
             Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
@@ -70,12 +78,6 @@ public class CableBusModel implements IModelGeometry<CableBusModel> {
         return new CableBusBakedModel(cableBuilder, facadeBuilder, partModels, particleTexture);
     }
 
-    @Override
-    public Collection<RenderMaterial> getTextures(IModelConfiguration owner,
-            Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
-        return Collections.unmodifiableList(CableBuilder.getTextures());
-    }
-
     private Map<ResourceLocation, IBakedModel> loadPartModels(ModelBakery bakery,
             Function<RenderMaterial, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn) {
         ImmutableMap.Builder<ResourceLocation, IBakedModel> result = ImmutableMap.builder();

src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java

@@ -1,15 +1,10 @@
 package appeng.client.render.cablebus;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Set;
 import java.util.function.Function;
-
-import com.mojang.datafixers.util.Pair;
+import java.util.stream.Stream;
 
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.IModelTransform;
-import net.minecraft.client.renderer.model.IUnbakedModel;
 import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.renderer.model.ModelBakery;
 import net.minecraft.client.renderer.model.RenderMaterial;
@@ -17,11 +12,11 @@ import net.minecraft.client.renderer.texture.AtlasTexture;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.IModelConfiguration;
-import net.minecraftforge.client.model.geometry.IModelGeometry;
 
+import appeng.client.render.BasicUnbakedModel;
 import appeng.core.AppEng;
 
-public class P2PTunnelFrequencyModel implements IModelGeometry<P2PTunnelFrequencyModel> {
+public class P2PTunnelFrequencyModel implements BasicUnbakedModel<P2PTunnelFrequencyModel> {
     private static final RenderMaterial TEXTURE = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
             new ResourceLocation(AppEng.MOD_ID, "part/p2p_tunnel_frequency"));
 
@@ -38,9 +33,8 @@ public class P2PTunnelFrequencyModel implements IModelGeometry<P2PTunnelFrequenc
     }
 
     @Override
-    public Collection<RenderMaterial> getTextures(IModelConfiguration owner,
-            Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
-        return Collections.singleton(TEXTURE);
+    public Stream<RenderMaterial> getAdditionalTextures() {
+        return Stream.of(TEXTURE);
     }
 
 }