From 6efe7026a608a69bae078906043ee45b56e609d2 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 20 Dec 2017 15:50:03 -0600 Subject: [PATCH] 'flatten' bottled mana, add fixer for moving things to NBT --- .../java/vazkii/botania/common/Botania.java | 2 + .../botania/common/fixers/FlattenItems.java | 4 +- .../botania/common/fixers/FlattenNBT.java | 42 +++++++++++++++++++ .../botania/common/item/ItemBottledMana.java | 33 +++++++++------ .../common/item/ItemTemperanceStone.java | 2 +- .../botania/models/item/manabottle.json | 38 +++++++++++++++++ .../botania/models/item/manabottle0.json | 6 --- 7 files changed, 106 insertions(+), 21 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/fixers/FlattenNBT.java create mode 100644 src/main/resources/assets/botania/models/item/manabottle.json delete mode 100644 src/main/resources/assets/botania/models/item/manabottle0.json diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index d964f604c..fb687b77f 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -87,6 +87,7 @@ 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.fixers.FlattenNBT; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.GuiHandler; @@ -139,6 +140,7 @@ public class Botania { ModBanners.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()); 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 index f631b19d0..6ce0a1cb6 100644 --- a/src/main/java/vazkii/botania/common/fixers/FlattenItems.java +++ b/src/main/java/vazkii/botania/common/fixers/FlattenItems.java @@ -1,5 +1,6 @@ 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; @@ -12,6 +13,7 @@ import java.util.HashMap; import java.util.Map; import java.util.function.IntFunction; +// 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> LOOKUP = new HashMap<>(); @@ -20,7 +22,7 @@ public class FlattenItems implements IFixableData { LOOKUP.put("botania:manaresource", i -> { if(i == 10) { // support ancient prismarine from 1.7 - return "minecraft:prismarine_shard"; + return Items.PRISMARINE_SHARD.getRegistryName().toString(); } else { return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length]; } diff --git a/src/main/java/vazkii/botania/common/fixers/FlattenNBT.java b/src/main/java/vazkii/botania/common/fixers/FlattenNBT.java new file mode 100644 index 000000000..4f3e4dd65 --- /dev/null +++ b/src/main/java/vazkii/botania/common/fixers/FlattenNBT.java @@ -0,0 +1,42 @@ +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, fixes tag in place + private static final Map> LOOKUP = new HashMap<>(); + + static { + LOOKUP.put(ModItems.manaBottle.getRegistryName().toString(), (swigsTaken, tag) -> tag.setInteger(ItemBottledMana.TAG_SWIGS_LEFT, ItemBottledMana.SWIGS - swigsTaken)); + 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; + } +} diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index f66ce3ee9..370bf5dfd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -28,6 +28,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -40,19 +41,21 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; import java.util.List; import java.util.Random; public class ItemBottledMana extends ItemMod { - + public static final int SWIGS = 6; + public static final String TAG_SWIGS_LEFT = "swigsLeft"; private static final String TAG_SEED = "randomSeed"; public ItemBottledMana() { super(LibItemNames.MANA_BOTTLE); setMaxStackSize(1); - setMaxDamage(6); + addPropertyOverride(new ResourceLocation(LibMisc.MOD_ID, "swigs_taken"), (stack, world, entity) -> SWIGS - getSwigsLeft(stack)); } public void effect(ItemStack stack, EntityLivingBase living, int id) { @@ -225,14 +228,16 @@ public class ItemBottledMana extends ItemMod { @Nonnull @Override - public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World world, EntityLivingBase living) { - randomEffect(living, par1ItemStack); - par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1); - randomSeed(par1ItemStack); - - if(par1ItemStack.getItemDamage() == 6) + public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { + randomEffect(living, stack); + int left = getSwigsLeft(stack); + if(left <= 1) { return new ItemStack(Items.GLASS_BOTTLE); - return par1ItemStack; + } else { + setSwigsLeft(stack, left - 1); + randomSeed(stack); + return stack; + } } @Override @@ -246,10 +251,12 @@ public class ItemBottledMana extends ItemMod { return EnumAction.DRINK; } - @SideOnly(Side.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerItemAppendMeta(this, 6, LibItemNames.MANA_BOTTLE); + private int getSwigsLeft(ItemStack stack) { + return ItemNBTHelper.getInt(stack, TAG_SWIGS_LEFT, SWIGS); + } + + private void setSwigsLeft(ItemStack stack, int swigs) { + ItemNBTHelper.setInt(stack, TAG_SWIGS_LEFT, swigs); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 274f3fa11..19f5d77db 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -33,7 +33,7 @@ import javax.annotation.Nonnull; import java.util.List; public class ItemTemperanceStone extends ItemMod { - private static final String TAG_ACTIVE = "active"; + public static final String TAG_ACTIVE = "active"; public ItemTemperanceStone() { super(LibItemNames.TEMPERANCE_STONE); diff --git a/src/main/resources/assets/botania/models/item/manabottle.json b/src/main/resources/assets/botania/models/item/manabottle.json new file mode 100644 index 000000000..21285e149 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle.json @@ -0,0 +1,38 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/bottle_mana_0" + }, + "overrides": [ + { + "predicate": { + "botania:swigs_taken": 1 + }, + "model": "botania:item/manabottle1" + }, + { + "predicate": { + "botania:swigs_taken": 2 + }, + "model": "botania:item/manabottle2" + }, + { + "predicate": { + "botania:swigs_taken": 3 + }, + "model": "botania:item/manabottle3" + }, + { + "predicate": { + "botania:swigs_taken": 4 + }, + "model": "botania:item/manabottle4" + }, + { + "predicate": { + "botania:swigs_taken": 5 + }, + "model": "botania:item/manabottle5" + } + ] +} diff --git a/src/main/resources/assets/botania/models/item/manabottle0.json b/src/main/resources/assets/botania/models/item/manabottle0.json deleted file mode 100644 index b667b0314..000000000 --- a/src/main/resources/assets/botania/models/item/manabottle0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/bottle_mana_0" - } -} \ No newline at end of file