From 659f4db5ceb367a95e98b7dcf0c4d955ea6575e3 Mon Sep 17 00:00:00 2001
From: simibubi <31564874+simibubi@users.noreply.github.com>
Date: Tue, 27 Jun 2023 03:47:44 +0200
Subject: [PATCH] Merge fix-ups

---
 .../com/simibubi/create/foundation/utility/ModelSwapper.java | 2 +-
 .../resources/assets/create/particles/heater_particle.json   | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)
 delete mode 100644 src/main/resources/assets/create/particles/heater_particle.json

diff --git a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java
index e445ccc4b..09069b205 100644
--- a/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java
+++ b/src/main/java/com/simibubi/create/foundation/utility/ModelSwapper.java
@@ -32,7 +32,7 @@ public class ModelSwapper {
 		return customItemModels;
 	}
 
-	public void onModelBake(ModelEvent.BakingCompleted event) {
+	public void onModelBake(ModelEvent.ModifyBakingResult event) {
 		Map<ResourceLocation, BakedModel> modelRegistry = event.getModels();
 		customBlockModels.forEach((block, modelFunc) -> swapModels(modelRegistry, getAllBlockStateModelLocations(block), modelFunc));
 		customItemModels.forEach((item, modelFunc) -> swapModels(modelRegistry, getItemModelLocation(item), modelFunc));
diff --git a/src/main/resources/assets/create/particles/heater_particle.json b/src/main/resources/assets/create/particles/heater_particle.json
deleted file mode 100644
index f3ae8cda7..000000000
--- a/src/main/resources/assets/create/particles/heater_particle.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"textures": [
-		"minecraft:flame"
-	]
-}