mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
'flatten' bottled mana, add fixer for moving things to NBT
This commit is contained in:
1 parent
386f76e5bf
commit
6efe7026a6
7 files changed
+106
-21
No files matched your search
@@ -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();
|
||||
|
||||
@@ -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<String, IntFunction<String>> 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];
|
||||
}
|
||||
|
||||
@@ -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<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.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;
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user