diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 423e9e357..d964f604c 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -19,8 +19,10 @@ import net.minecraft.entity.boss.EntityWither; import net.minecraft.entity.item.EntityEnderCrystal; import net.minecraft.entity.item.EntityItemFrame; import net.minecraft.entity.item.EntityPainting; +import net.minecraft.util.datafix.FixTypes; import net.minecraft.util.text.translation.I18n; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ModFixs; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.Mod; @@ -84,6 +86,7 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; +import vazkii.botania.common.fixers.FlattenItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; @@ -110,6 +113,8 @@ public class Botania { @SidedProxy(serverSide = LibMisc.PROXY_SERVER, clientSide = LibMisc.PROXY_CLIENT) public static IProxy proxy; + private static ModFixs fixer; + public static final Logger LOGGER = LogManager.getLogger(LibMisc.MOD_ID); @EventHandler @@ -132,6 +137,8 @@ public class Botania { ModMultiblocks.init(); ModBanners.init(); + fixer = FMLCommonHandler.instance().getDataFixer().init(LibMisc.MOD_ID, LibMisc.DATA_VERSION); + fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenItems()); if(Botania.gardenOfGlassLoaded) new WorldTypeSkyblock(); diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java new file mode 100644 index 000000000..7cb2ab834 --- /dev/null +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -0,0 +1,45 @@ +package vazkii.botania.common.fixers; + +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.datafix.IFixableData; +import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; + +import javax.annotation.Nonnull; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.function.IntFunction; + +public class FlattenItems implements IFixableData { + // old id to (meta -> new id) + private static final Map> LOOKUP = new HashMap<>(); + + static { + LOOKUP.put(LibMisc.MOD_ID + ":manaresource", i -> { + if (i == 10) { + // support ancient prismarine from 1. + return "minecraft:prismarine_shard"; + } else { + return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i].toLowerCase(Locale.ROOT); + } + }); + } + + @Override + public int getFixVersion() { + return 1; + } + + @Nonnull + @Override + public NBTTagCompound fixTagCompound(@Nonnull NBTTagCompound compound) { + String id = compound.getString("id"); + if(LOOKUP.containsKey(id)) { + int meta = compound.getShort("Damage"); + compound.setString("id", LOOKUP.get(id).apply(meta)); + compound.removeTag("Damage"); + } + return compound; + } +} diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 445979799..dd98b73a9 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -18,6 +18,7 @@ public final class LibMisc { public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:baubles;after:thaumcraft"; + public static final int DATA_VERSION = 1; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID;