Finish porting Model Loading, FRAPI, and Indigo (#4043)

FabricMC · Aug 21, 2024 · 236902d · 236902d
1 parent 1bb677a
commit 236902d
Show file tree

Hide file tree

Showing 37 changed files with 380 additions and 653 deletions.
diff --git a/...1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/BlockStateResolver.java b/...1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/BlockStateResolver.java
@@ -20,9 +20,7 @@
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
-import net.minecraft.util.Identifier;
 
 /**
  * Block state resolvers are responsible for mapping each {@link BlockState} of a block to an {@link UnbakedModel}.
@@ -69,18 +67,5 @@ interface Context {
 		 * @param model the unbaked model for this block state
 		 */
 		void setModel(BlockState state, UnbakedModel model);
-
-		/**
-		 * Loads a model using an {@link Identifier}, or gets it if it was already loaded.
-		 *
-		 * @param id the model identifier
-		 * @return the unbaked model, or a missing model if it is not present
-		 */
-		UnbakedModel getOrLoadModel(Identifier id);
-
-		/**
-		 * The current model loader instance, which changes between resource reloads.
-		 */
-		ModelLoader loader();
 	}
 }
diff --git a/...c/client/java/net/fabricmc/fabric/api/client/model/loading/v1/DelegatingUnbakedModel.java b/...c/client/java/net/fabricmc/fabric/api/client/model/loading/v1/DelegatingUnbakedModel.java
@@ -16,8 +16,6 @@
 
 package net.fabricmc.fabric.api.client.model.loading.v1;
 
-import java.util.Collection;
-import java.util.List;
 import java.util.function.Function;
 
 import org.jetbrains.annotations.Nullable;
@@ -37,7 +35,6 @@
  */
 public final class DelegatingUnbakedModel implements UnbakedModel {
 	private final Identifier delegate;
-	private final List<Identifier> dependencies;
 
 	/**
 	 * Constructs a new delegating model.
@@ -46,23 +43,11 @@ public final class DelegatingUnbakedModel implements UnbakedModel {
 	 */
 	public DelegatingUnbakedModel(Identifier delegate) {
 		this.delegate = delegate;
-		this.dependencies = List.of(delegate);
-	}
-
-	/*@Override
-	public Collection<Identifier> getModelDependencies() {
-		return dependencies;
 	}
 
-	@Override
-	public void setParents(Function<Identifier, UnbakedModel> modelLoader) {
-		modelLoader.apply(delegate).setParents(modelLoader);
-	}*/
-
-	// TODO 24w44a
 	@Override
 	public void method_62326(class_10103 arg, class_10102 arg2) {
-
+		arg.method_62642(delegate);
 	}
 
 	@Override

diff --git a/...1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelLoadingPlugin.java b/...1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelLoadingPlugin.java
@@ -47,7 +47,7 @@ static void register(ModelLoadingPlugin plugin) {
 	 * Called towards the beginning of the model loading process, every time resource are (re)loaded.
 	 * Use the context object to extend model loading as desired.
 	 */
-	void onInitializeModelLoader(Context pluginContext);
+	void initialize(Context pluginContext);
 
 	@ApiStatus.NonExtendable
 	interface Context {

diff --git a/...api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelModifier.java b/...api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelModifier.java
@@ -25,7 +25,6 @@
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.Baker;
 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.ModelIdentifier;
@@ -109,19 +108,6 @@ interface Context {
 			 */
 			@UnknownNullability("#resourceId() != null")
 			ModelIdentifier topLevelId();
-
-			/**
-			 * Loads a model using an {@link Identifier}, or gets it if it was already loaded.
-			 *
-			 * @param id the model identifier
-			 * @return the unbaked model, or a missing model if it is not present
-			 */
-			UnbakedModel getOrLoadModel(Identifier id);
-
-			/**
-			 * The current model loader instance, which changes between resource reloads.
-			 */
-			ModelLoader loader();
 		}
 	}
 
@@ -177,11 +163,6 @@ interface Context {
 			 * {@linkplain Baker#bake load baked models}.
 			 */
 			Baker baker();
-
-			/**
-			 * The current model loader instance, which changes between resource reloads.
-			 */
-			ModelLoader loader();
 		}
 	}
 
@@ -250,11 +231,6 @@ interface Context {
 			 * {@linkplain Baker#bake load baked models}.
 			 */
 			Baker baker();
-
-			/**
-			 * The current model loader instance, which changes between resource reloads.
-			 */
-			ModelLoader loader();
 		}
 	}
 

diff --git a/...api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelResolver.java b/...api-v1/src/client/java/net/fabricmc/fabric/api/client/model/loading/v1/ModelResolver.java
@@ -19,7 +19,6 @@
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
-import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.render.model.UnbakedModel;
 import net.minecraft.util.Identifier;
 
@@ -61,18 +60,5 @@ interface Context {
 		 * The identifier of the model to be loaded.
 		 */
 		Identifier id();
-
-		/**
-		 * Loads a model using an {@link Identifier}, or gets it if it was already loaded.
-		 *
-		 * @param id the model identifier
-		 * @return the unbaked model, or a missing model if it is not present
-		 */
-		UnbakedModel getOrLoadModel(Identifier id);
-
-		/**
-		 * The current model loader instance, which changes between resource reloads.
-		 */
-		ModelLoader loader();
 	}
 }
diff --git a/...nt/java/net/fabricmc/fabric/api/client/model/loading/v1/PreparableModelLoadingPlugin.java b/...nt/java/net/fabricmc/fabric/api/client/model/loading/v1/PreparableModelLoadingPlugin.java
@@ -48,7 +48,7 @@ static <T> void register(DataLoader<T> loader, PreparableModelLoadingPlugin<T> p
 	 * @param data The data loaded by the {@link DataLoader}.
 	 * @param pluginContext The context that can be used to extend model loading.
 	 */
-	void onInitializeModelLoader(T data, ModelLoadingPlugin.Context pluginContext);
+	void initialize(T data, ModelLoadingPlugin.Context pluginContext);
 
 	@FunctionalInterface
 	interface DataLoader<T> {

diff --git a/...pi-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/ModelLoaderHooks.java b/...pi-v1/src/client/java/net/fabricmc/fabric/impl/client/model/loading/ModelLoaderHooks.java
@@ -16,16 +16,6 @@
 
 package net.fabricmc.fabric.impl.client.model.loading;
 
-import net.minecraft.client.render.model.UnbakedModel;
-import net.minecraft.client.util.ModelIdentifier;
-import net.minecraft.util.Identifier;
-
 public interface ModelLoaderHooks {
 	ModelLoadingEventDispatcher fabric_getDispatcher();
-
-	UnbakedModel fabric_getMissingModel();
-
-	UnbakedModel fabric_getOrLoadModel(Identifier id);
-
-	void fabric_add(ModelIdentifier id, UnbakedModel model);
 }