Simplify book model

VazkiiMods · Aug 24, 2024 · 7e1ccf5 · 7e1ccf5
1 parent f0df654
commit 7e1ccf5
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 58 deletions.
diff --git a/Fabric/src/main/java/vazkii/patchouli/fabric/client/FabricClientInitializer.java b/Fabric/src/main/java/vazkii/patchouli/fabric/client/FabricClientInitializer.java
@@ -62,9 +62,7 @@ public void onInitializeClient() {
 								PatchouliItems.BOOK_ID.equals(ctx.topLevelId().id()) // checks namespace and path
 								&& ctx.topLevelId().getVariant().equals("inventory")
 								&& oldModel != null) {
-							return new BookModel(oldModel, ctx.loader(), (model) -> {
-								return Minecraft.getInstance().getModelManager().getModel(model);
-							});
+							return new BookModel(oldModel, (model) -> Minecraft.getInstance().getModelManager().getModel(model));
 						}
 						return oldModel;
 					}

diff --git a/NeoForge/src/main/java/vazkii/patchouli/neoforge/client/NeoForgeClientInitializer.java b/NeoForge/src/main/java/vazkii/patchouli/neoforge/client/NeoForgeClientInitializer.java
@@ -151,9 +151,6 @@ public static void onInitializeClient(FMLClientSetupEvent evt) {
 	@SubscribeEvent
 	public static void replaceBookModel(ModelEvent.ModifyBakingResult evt) {
 		ModelResourceLocation key = ModelResourceLocation.inventory(PatchouliItems.BOOK_ID);
-		evt.getModels().computeIfPresent(key, (k, oldModel) -> new BookModel(oldModel, evt.getModelBakery(), (model) -> {
-			ModelResourceLocation modelPath = ModelResourceLocation.standalone(model);
-			return Minecraft.getInstance().getModelManager().getModel(modelPath);
-		}));
+		evt.getModels().computeIfPresent(key, (k, oldModel) -> new BookModel(oldModel, (model) -> Minecraft.getInstance().getModelManager().getModel(ModelResourceLocation.standalone(model))));
 	}
 }
diff --git a/Xplat/src/main/java/vazkii/patchouli/client/base/BookModel.java b/Xplat/src/main/java/vazkii/patchouli/client/base/BookModel.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.block.model.BlockModel;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
 import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -16,7 +15,6 @@
 
 import vazkii.patchouli.common.book.Book;
 import vazkii.patchouli.common.item.ItemModBook;
-import vazkii.patchouli.mixin.client.AccessorModelBakery;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -29,42 +27,10 @@ public class BookModel implements BakedModel {
 	private final BakedModel original;
 	private final ItemOverrides itemHandler;
 
-	public BookModel(BakedModel original, ModelBakery loader, Function<ResourceLocation, BakedModel> modelGetter) {
+	public BookModel(BakedModel original, Function<ResourceLocation, BakedModel> modelGetter) {
 		this.original = original;
-		BlockModel missing = (BlockModel) ((AccessorModelBakery) loader).invokeGetModel(ModelBakery.MISSING_MODEL_LOCATION);
-
-		this.itemHandler = new ItemOverrides(new ModelBaker() {
-			// soft implement IModelBakerExtension
-			public Function<Material, TextureAtlasSprite> getModelTextureGetter() {
-				return null;
-			}
-
-			// soft implement IModelBakerExtension
-			public BakedModel bake(ResourceLocation location, ModelState state, Function<Material, TextureAtlasSprite> sprites) {
-				return null;
-			}
-
-			// soft implement IModelBakerExtension
-			public BakedModel bakeUncached(UnbakedModel model, ModelState state, Function<Material, TextureAtlasSprite> sprites) {
-				return null;
-			}
-
-			// soft implement IModelBakerExtension
-			public UnbakedModel getTopLevelModel(ModelResourceLocation location) {
-				return null;
-			}
 
-			@Override
-			public UnbakedModel getModel(ResourceLocation resourceLocation) {
-				return null;
-			}
-
-			@Nullable
-			@Override
-			public BakedModel bake(ResourceLocation resourceLocation, ModelState modelState) {
-				return null;
-			}
-		}, missing, Collections.emptyList()) {
+		this.itemHandler = new ItemOverrides(DummyModelBaker.INSTANCE, null, Collections.emptyList()) {
 			@Override
 			public BakedModel resolve(@NotNull BakedModel original, @NotNull ItemStack stack,
 					@Nullable ClientLevel world, @Nullable LivingEntity entity, int seed) {
@@ -119,4 +85,38 @@ public TextureAtlasSprite getParticleIcon() {
 	public ItemTransforms getTransforms() {
 		return original.getTransforms();
 	}
+
+	private static class DummyModelBaker implements ModelBaker {
+		static ModelBaker INSTANCE = new DummyModelBaker();
+		// soft implement IModelBakerExtension
+		public Function<Material, TextureAtlasSprite> getModelTextureGetter() {
+			return null;
+		}
+
+		// soft implement IModelBakerExtension
+		public BakedModel bake(ResourceLocation location, ModelState state, Function<Material, TextureAtlasSprite> sprites) {
+			return null;
+		}
+
+		// soft implement IModelBakerExtension
+		public BakedModel bakeUncached(UnbakedModel model, ModelState state, Function<Material, TextureAtlasSprite> sprites) {
+			return null;
+		}
+
+		// soft implement IModelBakerExtension
+		public UnbakedModel getTopLevelModel(ModelResourceLocation location) {
+			return null;
+		}
+
+		@Override
+		public UnbakedModel getModel(ResourceLocation resourceLocation) {
+			return null;
+		}
+
+		@Nullable
+		@Override
+		public BakedModel bake(ResourceLocation resourceLocation, ModelState modelState) {
+			return null;
+		}
+	}
 }
diff --git a/Xplat/src/main/java/vazkii/patchouli/mixin/client/AccessorModelBakery.java b/Xplat/src/main/java/vazkii/patchouli/mixin/client/AccessorModelBakery.java
diff --git a/Xplat/src/main/resources/patchouli_xplat.mixins.json b/Xplat/src/main/resources/patchouli_xplat.mixins.json
@@ -10,7 +10,6 @@
   "client": [
     "client.AccessorClientAdvancements",
     "client.AccessorKeyMapping",
-    "client.AccessorModelBakery",
     "client.AccessorMultiBufferSource",
     "client.AccessorScreen",
     "client.MixinClientAdvancements",