Remove datafixers, forward compat to 1.13 is RIP anyway

This commit is contained in:
Vincent Lee committed 2019-01-23 19:08:40 -06:00
1 parent e093eedba3
commit e47734e534
5 files changed
-345

No files matched your search

@@ -19,10 +19,8 @@ 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;
@@ -80,10 +78,6 @@ 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.AttachedWills;
import vazkii.botania.common.fixers.CraftyCrateTE;
import vazkii.botania.common.fixers.FlattenItems;
import vazkii.botania.common.fixers.FlattenNBT;
import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin;
import vazkii.botania.common.integration.thaumcraft.TCAspects;
import vazkii.botania.common.lexicon.LexiconData;
@@ -110,8 +104,6 @@ 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,11 +124,6 @@ public class Botania {
ModEntities.init();
ModBrews.init();
ModMultiblocks.init();
fixer = FMLCommonHandler.instance().getDataFixer().init(LibMisc.MOD_ID, LibMisc.DATA_VERSION);
fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenItems());
fixer.registerFix(FixTypes.ITEM_INSTANCE, new FlattenNBT());
fixer.registerFix(FixTypes.ITEM_INSTANCE, new AttachedWills());
fixer.registerFix(FixTypes.BLOCK_ENTITY, new CraftyCrateTE());
if(Botania.gardenOfGlassLoaded)
new WorldTypeSkyblock();
@@ -1,36 +0,0 @@
package vazkii.botania.common.fixers;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.armor.terrasteel.ItemTerrasteelHelm;
import java.util.Locale;
// Renames the pre-1.13 will tags inside Terrasteel Helmets (of revealing)
public class AttachedWills implements IFixableData {
@Override
public int getFixVersion() {
return 1;
}
@Override
public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
String terraHelm = ModItems.terrasteelHelm.getRegistryName().toString();
String terraHelmReveal = ModItems.terrasteelHelmRevealing.getRegistryName().toString();
if((terraHelm.equals(compound.getString("id")) || terraHelmReveal.equals(compound.getString("id")))
&& compound.hasKey("tag")) {
NBTTagCompound tag = compound.getCompoundTag("tag");
for(int i = 0; i < 6; i++) {
String oldKey = ItemTerrasteelHelm.TAG_ANCIENT_WILL + i;
if(tag.hasKey(oldKey)) {
tag.removeTag(oldKey);
tag.setBoolean(ItemTerrasteelHelm.TAG_ANCIENT_WILL + "_" + IAncientWillContainer.AncientWillType.values()[i].name().toLowerCase(Locale.ROOT), true);
}
}
}
return compound;
}
}
@@ -1,22 +0,0 @@
package vazkii.botania.common.fixers;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.common.block.tile.TileCraftCrate;
// Shifts pattern tag in Crafty Crate TE NBT up one to account for CratePattern.NONE
public class CraftyCrateTE implements IFixableData {
@Override
public int getFixVersion() {
return 1;
}
@Override
public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
if(TileEntity.getKey(TileCraftCrate.class).toString().equals(compound.getString("id"))) {
compound.setInteger(TileCraftCrate.TAG_PATTERN, compound.getInteger(TileCraftCrate.TAG_PATTERN) + 1);
}
return compound;
}
}
@@ -1,231 +0,0 @@
package vazkii.botania.common.fixers;
import net.minecraft.init.Items;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.api.state.enums.CratePattern;
import vazkii.botania.common.block.BlockAltar;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemBaubleCosmetic;
import vazkii.botania.common.lib.LibBlockNames;
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;
// TODO add support for migrating subtiles to add a domain
// Flattens meta variants by splitting out to new ID's
public class FlattenItems implements IFixableData {
// old id to (meta -> new id)
private static final Map<String, IntFunction<String>> LOOKUP = new HashMap<>();
static {
LOOKUP.put("botania:manaresource", i -> {
if(i == 10) {
// support ancient prismarine from 1.7
return Items.PRISMARINE_SHARD.getRegistryName().toString();
} else {
return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length];
}
});
LOOKUP.put("botania:vial", i -> {
if(i == 1) {
return ModItems.flask.getRegistryName().toString();
} else {
return ModItems.vial.getRegistryName().toString();
}
});
LOOKUP.put("botania:quartz", i -> LibMisc.MOD_ID + ":" + LibItemNames.QUARTZ_NAMES[i % LibItemNames.QUARTZ_NAMES.length]);
LOOKUP.put("botania:thornchakram", i -> {
if(i == 1) {
return ModItems.flareChakram.getRegistryName().toString();
} else {
return ModItems.thornChakram.getRegistryName().toString();
}
});
LOOKUP.put("botania:grasshorn", i -> {
switch (i) {
case 0:
default:
return ModItems.grassHorn.getRegistryName().toString();
case 1: return ModItems.leavesHorn.getRegistryName().toString();
case 2: return ModItems.snowHorn.getRegistryName().toString();
}
});
LOOKUP.put("botania:lens", i -> LibMisc.MOD_ID + ":" + LibItemNames.LENS_NAMES[i % LibItemNames.LENS_NAMES.length]);
LOOKUP.put("botania:dye", i -> {
EnumDyeColor color = EnumDyeColor.byMetadata(i);
return ModItems.dyes.get(color).getRegistryName().toString();
});
LOOKUP.put("botania:petal", i -> {
EnumDyeColor color = EnumDyeColor.byMetadata(i);
return ModItems.petals.get(color).getRegistryName().toString();
});
LOOKUP.put("botania:virus", i -> {
if (i == 1) {
return ModItems.nullVirus.getRegistryName().toString();
} else {
return ModItems.necroVirus.getRegistryName().toString();
}
});
LOOKUP.put("botania:grassseeds", i -> {
switch(i) {
default:
case 0: return ModItems.grassSeeds.getRegistryName().toString();
case 1: return ModItems.podzolSeeds.getRegistryName().toString();
case 2: return ModItems.mycelSeeds.getRegistryName().toString();
case 3: return ModItems.drySeeds.getRegistryName().toString();
case 4: return ModItems.goldenSeeds.getRegistryName().toString();
case 5: return ModItems.vividSeeds.getRegistryName().toString();
case 6: return ModItems.scorchedSeeds.getRegistryName().toString();
case 7: return ModItems.infusedSeeds.getRegistryName().toString();
case 8: return ModItems.mutatedSeeds.getRegistryName().toString();
}
});
LOOKUP.put("botania:sparkupgrade", i -> {
switch(i) {
default:
case 0: return ModItems.sparkUpgradeDispersive.getRegistryName().toString();
case 1: return ModItems.sparkUpgradeDominant.getRegistryName().toString();
case 2: return ModItems.sparkUpgradeRecessive.getRegistryName().toString();
case 3: return ModItems.sparkUpgradeIsolated.getRegistryName().toString();
}
});
LOOKUP.put("botania:ancientwill", i -> {
IAncientWillContainer.AncientWillType[] vals = IAncientWillContainer.AncientWillType.values();
return LibMisc.MOD_ID + ":" + LibItemNames.ANCIENT_WILL + "_" + vals[i & vals.length].name().toLowerCase(Locale.ROOT);
});
LOOKUP.put("botania:craftpattern", i -> {
// +1 since there was no NONE meta variant
CratePattern[] vals = CratePattern.values();
return LibMisc.MOD_ID + ":" + LibItemNames.CRAFT_PATTERN + "_" + vals[(i + 1) % vals.length].name().toLowerCase(Locale.ROOT);
});
LOOKUP.put("botania:rune", i -> LibMisc.MOD_ID + ":" + LibItemNames.RUNE_NAMES[i % LibItemNames.RUNE_NAMES.length]);
LOOKUP.put("botania:cosmetic", i -> {
ItemBaubleCosmetic.Variant[] vals = ItemBaubleCosmetic.Variant.values();
return LibMisc.MOD_ID + ":" + LibItemNames.COSMETIC + "_" + vals[i % vals.length].name().toLowerCase(Locale.ROOT);
});
LOOKUP.put("botania:corporeaspark", i -> {
if(i == 1) {
return ModItems.corporeaSparkMaster.getRegistryName().toString();
} else {
return ModItems.corporeaSpark.getRegistryName().toString();
}
});
LOOKUP.put("botania:blacklotus", i -> {
if(i == 1) {
return ModItems.blackerLotus.getRegistryName().toString();
} else {
return ModItems.blackLotus.getRegistryName().toString();
}
});
// ItemBlocks
LOOKUP.put("botania:altgrass", i -> {
switch (i) {
default:
case 0: return ModBlocks.dryGrass.getRegistryName().toString();
case 1: return ModBlocks.goldenGrass.getRegistryName().toString();
case 2: return ModBlocks.vividGrass.getRegistryName().toString();
case 3: return ModBlocks.scorchedGrass.getRegistryName().toString();
case 4: return ModBlocks.infusedGrass.getRegistryName().toString();
case 5: return ModBlocks.mutatedGrass.getRegistryName().toString();
}
});
LOOKUP.put("botania:storage", i -> {
switch (i) {
default:
case 0: return ModBlocks.manasteelBlock.getRegistryName().toString();
case 1: return ModBlocks.terrasteelBlock.getRegistryName().toString();
case 2: return ModBlocks.elementiumBlock.getRegistryName().toString();
case 3: return ModBlocks.manaDiamondBlock.getRegistryName().toString();
case 4: return ModBlocks.dragonstoneBlock.getRegistryName().toString();
}
});
LOOKUP.put("botania:custombrick", i -> {
int new_variant = 0;
// azulejos 1-12 in metas 4-15
if (i >= 4) {
new_variant = i - 3;
} else {
// azulejos 0, 13, 14, 15 in metas 0-3
switch (i) {
default:
case 0: new_variant = 0; break;
case 1: new_variant = 13; break;
case 2: new_variant = 14; break;
case 3: new_variant = 15; break;
}
}
return LibMisc.MOD_ID + ":" + LibBlockNames.AZULEJO_PREFIX + new_variant;
});
LOOKUP.put("botania:pool", i -> {
switch (i) {
default:
case 0: return ModBlocks.manaPool.getRegistryName().toString();
case 1: return ModBlocks.creativePool.getRegistryName().toString();
case 2: return ModBlocks.dilutedPool.getRegistryName().toString();
case 3: return ModBlocks.fabulousPool.getRegistryName().toString();
}
});
LOOKUP.put("botania:pylon", i -> {
switch (i) {
default:
case 0: return ModBlocks.manaPylon.getRegistryName().toString();
case 1: return ModBlocks.naturaPylon.getRegistryName().toString();
case 2: return ModBlocks.gaiaPylon.getRegistryName().toString();
}
});
LOOKUP.put("botania:platform", i -> {
switch (i) {
default:
case 0: return ModBlocks.abstrusePlatform.getRegistryName().toString();
case 1: return ModBlocks.spectralPlatform.getRegistryName().toString();
case 2: return ModBlocks.infrangiblePlatform.getRegistryName().toString();
}
});
LOOKUP.put("botania:altar", i -> LibMisc.MOD_ID + ":" + LibBlockNames.APOTHECARY_PREFIX + BlockAltar.Variant.values()[i % 10].name().toLowerCase(Locale.ROOT));
LOOKUP.put("botania:opencrate", i -> {
if(i == 1) {
return ModBlocks.craftCrate.getRegistryName().toString();
} else {
return ModBlocks.openCrate.getRegistryName().toString();
}
});
LOOKUP.put("botania:spreader", i -> {
switch(i) {
default:
case 0: return ModBlocks.manaSpreader.getRegistryName().toString();
case 1: return ModBlocks.redstoneSpreader.getRegistryName().toString();
case 2: return ModBlocks.elvenSpreader.getRegistryName().toString();
case 3: return ModBlocks.gaiaSpreader.getRegistryName().toString();
}
});
LOOKUP.put("botania:petalblock", i -> LibMisc.MOD_ID + ":" + EnumDyeColor.byMetadata(i).getName() + LibBlockNames.PETAL_BLOCK_SUFFIX);
}
@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;
}
}
@@ -1,43 +0,0 @@
package vazkii.botania.common.fixers;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.datafix.IFixableData;
import vazkii.botania.common.item.ItemBottledMana;
import vazkii.botania.common.item.ItemTemperanceStone;
import vazkii.botania.common.item.ModItems;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiConsumer;
// Flattens meta variants by moving things to NBT
public class FlattenNBT implements IFixableData {
// id to consumer<meta, tag>, fixes tag in place
private static final Map<String, BiConsumer<Integer, NBTTagCompound>> LOOKUP = new HashMap<>();
static {
LOOKUP.put(ModItems.manaBottle.getRegistryName().toString(), (swigsTaken, tag) -> tag.setInteger(ItemBottledMana.TAG_SWIGS_LEFT, ItemBottledMana.SWIGS - swigsTaken));
LOOKUP.put(ModItems.temperanceStone.getRegistryName().toString(), (meta, tag) -> tag.setBoolean(ItemTemperanceStone.TAG_ACTIVE, meta == 1));
LOOKUP.put(ModItems.blackHoleTalisman.getRegistryName().toString(), (meta, tag) -> tag.setBoolean(ItemTemperanceStone.TAG_ACTIVE, meta == 1));
}
@Override
public int getFixVersion() {
return 1;
}
@Override
public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
String id = compound.getString("id");
if(LOOKUP.containsKey(id)) {
int meta = compound.getShort("Damage");
NBTTagCompound tag = compound.getCompoundTag("tag");
LOOKUP.get(id).accept(meta, tag);
compound.setTag("tag", tag); // needed if the stack had no NBT before
compound.removeTag("Damage");
}
return compound;
}
}