Remapping Smelting Recipes

Author: valoeghese

build.gradle

@@ -61,7 +61,7 @@ dependencies {
 	}
 
 	// for config api
-	compile "tk.valoeghese:ZoesteriaConfig:1.3.2"
+	compile "tk.valoeghese:ZoesteriaConfig:1.3.4"
 
 	modImplementation "com.github.minecraft-cursed-legacy:cursed-fabric-loader:${project.loader_version}"
 }

gradle.properties

@@ -6,6 +6,6 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=8f014a3
 
 # Mod Properties
-	mod_version = 0.6.1
+	mod_version = 0.6.2
 	maven_group = io.github.minecraftcursedlegacy.api
 	archives_base_name = cursed-legacy-api

src/main/java/io/github/minecraftcursedlegacy/impl/registry/ItemTypeRegistry.java

@@ -1,9 +1,19 @@
 package io.github.minecraftcursedlegacy.impl.registry;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.IntFunction;
 
+import io.github.minecraftcursedlegacy.accessor.AccessorPlaceableTileItem;
+import io.github.minecraftcursedlegacy.accessor.AccessorRecipeRegistry;
+import io.github.minecraftcursedlegacy.accessor.AccessorShapedRecipe;
+import io.github.minecraftcursedlegacy.accessor.AccessorShapelessRecipe;
+import io.github.minecraftcursedlegacy.accessor.AccessorTileItem;
+import io.github.minecraftcursedlegacy.api.registry.Id;
+import io.github.minecraftcursedlegacy.api.registry.Registry;
+import io.github.minecraftcursedlegacy.impl.client.AtlasMapper;
 import net.minecraft.item.ItemInstance;
 import net.minecraft.item.ItemType;
 import net.minecraft.item.PlaceableTileItem;
@@ -12,18 +22,10 @@
 import net.minecraft.recipe.RecipeRegistry;
 import net.minecraft.recipe.ShapedRecipe;
 import net.minecraft.recipe.ShapelessRecipe;
+import net.minecraft.recipe.SmeltingRecipeRegistry;
 import net.minecraft.tile.Tile;
 import net.minecraft.util.io.CompoundTag;
 
-import io.github.minecraftcursedlegacy.accessor.AccessorPlaceableTileItem;
-import io.github.minecraftcursedlegacy.accessor.AccessorRecipeRegistry;
-import io.github.minecraftcursedlegacy.accessor.AccessorShapedRecipe;
-import io.github.minecraftcursedlegacy.accessor.AccessorShapelessRecipe;
-import io.github.minecraftcursedlegacy.accessor.AccessorTileItem;
-import io.github.minecraftcursedlegacy.api.registry.Id;
-import io.github.minecraftcursedlegacy.api.registry.Registry;
-import io.github.minecraftcursedlegacy.impl.client.AtlasMapper;
-
 class ItemTypeRegistry extends Registry<ItemType> {
 	ItemTypeRegistry(Id registryName) {
 		super(ItemType.class, registryName, null);
@@ -88,10 +90,11 @@ protected void onRemap(ItemType remappedValue, int newSerialisedId) {
 		((IdSetter) remappedValue).setId(newSerialisedId);
 	}
 
+	@SuppressWarnings("unchecked")
 	@Override
 	protected void postRemap() {
 		// Remap Recipes
-		RegistryRemapper.LOGGER.info("Remapping recipes.");
+		RegistryRemapper.LOGGER.info("Remapping Crafting Recipes.");
 
 		for (Recipe recipe : ((AccessorRecipeRegistry) RecipeRegistry.getInstance()).getRecipes()) {
 			if (recipe instanceof ShapedRecipe) {
@@ -150,8 +153,29 @@ protected void postRemap() {
 			}
 		}
 
+		RegistryRemapper.LOGGER.info("Remapping Smelting Recipes.");
+
+		SmeltingRecipeRegistry smelting = SmeltingRecipeRegistry.getInstance();
+		Map<Integer, ItemInstance> newRecipes = new HashMap<>();
+
+		smelting.getRecipes().forEach((oldInputId, output) -> {
+			int newInputId = this.oldItemTypes[(Integer) oldInputId].id;
+
+			ItemInstance result = (ItemInstance) output;
+			int newResultId = this.oldItemTypes[result.itemId].id;
+
+			// only remap if necessary
+			if (result.itemId != newResultId) {
+				result.itemId = newResultId;
+			}
+
+			newRecipes.put(newInputId, result);
+		});
+
+		((SmeltingRecipeSetter) smelting).setRecipes(newRecipes);
+
 		RegistryRemapper.LOGGER.info("Remapping custom texture atlases.");
-		AtlasMapper.onRegistryRemap(oldItemTypes);
+		AtlasMapper.onRegistryRemap(this.oldItemTypes);
 	}
 
 	@Override

src/main/java/io/github/minecraftcursedlegacy/impl/registry/SmeltingRecipeSetter.java

@@ -0,0 +1,7 @@
+package io.github.minecraftcursedlegacy.impl.registry;
+
+import java.util.Map;
+
+public interface SmeltingRecipeSetter {
+	void setRecipes(Map recipes);
+}

src/main/java/io/github/minecraftcursedlegacy/mixin/MixinSmeltingRecipeRegistry.java

@@ -0,0 +1,20 @@
+package io.github.minecraftcursedlegacy.mixin;
+
+import java.util.Map;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+import io.github.minecraftcursedlegacy.impl.registry.SmeltingRecipeSetter;
+import net.minecraft.recipe.SmeltingRecipeRegistry;
+
+@Mixin(SmeltingRecipeRegistry.class)
+public abstract class MixinSmeltingRecipeRegistry implements SmeltingRecipeSetter {
+	@Shadow
+	private Map recipes;
+
+	@Override
+	public void setRecipes(Map recipes) {
+		this.recipes = recipes;
+	}
+}

src/main/resources/api.mixins.json

@@ -12,6 +12,7 @@
     "MixinOverworldLevelSource",
     "MixinPlaceableTileItem",
     "MixinShapedRecipe",
+    "MixinSmeltingRecipeRegistry",
     "MixinTile",
     "MixinTileItem",
     "MixinTitleScreen"

src/test/java/io/github/minecraftcursedlegacy/test/BasicTile.java

@@ -4,7 +4,14 @@
 import net.minecraft.tile.material.Material;
 
 public class BasicTile extends Tile {
-	protected BasicTile(int i) {
+	protected BasicTile(int i, boolean fullOpaque) {
 		super(i, 69, Material.DIRT);
+		this.fop = fullOpaque;
+	}
+
+	private final boolean fop;
+
+	public boolean isFullOpaque() {
+		return this.fop;
 	}
 }

src/test/java/io/github/minecraftcursedlegacy/test/RegistryTest.java

@@ -8,6 +8,7 @@
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.item.ItemInstance;
 import net.minecraft.item.ItemType;
+import net.minecraft.recipe.SmeltingRecipeRegistry;
 import net.minecraft.tile.Tile;
 
 public class RegistryTest implements ModInitializer {
@@ -17,12 +18,14 @@ public void onInitialize() {
 		item = Registries.ITEM_TYPE.register(new Id("modid:item"),
 				i -> new BasicItem(i).setTexturePosition(5, 0).setName("exampleItem"));
 		tile = Registries.TILE.register(new Id("modid:tile"),
-				i -> new BasicTile(i).setName("exampleBlock"));
+				i -> new BasicTile(i, false).setName("exampleBlock"));
 		tileItem = TileItems.registerTileItem(new Id("modid:tile"), tile);
 
 		Recipes.addShapelessRecipe(new ItemInstance(item, 2), Tile.DIRT, Tile.SAND);
 		Recipes.addShapedRecipe(new ItemInstance(tile), "##", '#', Tile.DIRT);
 
+		SmeltingRecipeRegistry.getInstance().addSmeltingRecipe(item.id, new ItemInstance(tile));
+
 		Translations.addTileTranslation(tile, "Example Block");
 		Translations.addItemTranslation(item, "Example Item");
 	}