Worldgen, Compass (temp)

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

@@ -19,16 +19,15 @@
 package appeng.client.render.cablebus;
 
 import appeng.api.util.AEColor;
+import appeng.client.render.BasicUnbakedModel;
 import appeng.core.AELog;
 import appeng.core.features.registries.PartModels;
 import com.google.common.collect.ImmutableMap;
-import com.mojang.datafixers.util.Pair;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelBakeSettings;
 import net.minecraft.client.render.model.ModelLoader;
-import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
@@ -36,16 +35,14 @@ import net.minecraft.util.Identifier;
 import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
  * The built-in model for the cable bus block.
  */
 @Environment(EnvType.CLIENT)
-public class CableBusModel implements UnbakedModel {
+public class CableBusModel implements BasicUnbakedModel {
 
     private final PartModels partModels;
 
@@ -59,6 +56,11 @@ public class CableBusModel implements UnbakedModel {
         return partModels.getModels();
     }
 
+    @Override
+    public Stream<SpriteIdentifier> getAdditionalTextures() {
+        return CableBuilder.getTextures().stream();
+    }
+
     @Nullable
     @Override
     public BakedModel bake(ModelLoader loader, Function<SpriteIdentifier, Sprite> textureGetter, ModelBakeSettings rotationContainer, Identifier modelId) {
@@ -75,15 +77,6 @@ public class CableBusModel implements UnbakedModel {
         return new CableBusBakedModel(cableBuilder, facadeBuilder, partModels, particleTexture);
     }
 
-    @Override
-    public Collection<SpriteIdentifier> getTextureDependencies(Function<Identifier, UnbakedModel> unbakedModelGetter, Set<Pair<String, String>> unresolvedTextureReferences) {
-        return Stream.concat(
-                getModelDependencies().stream()
-                        .map(unbakedModelGetter)
-                        .flatMap(ubm -> ubm.getTextureDependencies(unbakedModelGetter, unresolvedTextureReferences).stream()),
-                CableBuilder.getTextures().stream()
-        ).collect(Collectors.toList());
-    }
 
     private Map<Identifier, BakedModel> loadPartModels(ModelLoader loader,
                                                        ModelBakeSettings rotationContainer) {