Flatten ancient wills

This commit is contained in:
Vincent Lee committed 2017-12-20 19:52:06 -06:00
1 parent 6efe7026a6
commit e71274317b
26 files changed
+280 -220

No files matched your search

@@ -17,9 +17,17 @@ import net.minecraft.item.ItemStack;
* crafted onto it.
*/
public interface IAncientWillContainer {
enum AncientWillType {
AHRIM,
DHAROK,
GUTHAN,
TORAG,
VERAC,
KARIL
}
public void addAncientWill(ItemStack stack, int will);
public void addAncientWill(ItemStack stack, AncientWillType will);
public boolean hasAncientWill(ItemStack stack, int will);
public boolean hasAncientWill(ItemStack stack, AncientWillType will);
}
@@ -86,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.AttachedWills;
import vazkii.botania.common.fixers.FlattenItems;
import vazkii.botania.common.fixers.FlattenNBT;
import vazkii.botania.common.lexicon.LexiconData;
@@ -141,6 +142,7 @@ public class Botania {
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());
if(Botania.gardenOfGlassLoaded)
new WorldTypeSkyblock();
@@ -241,7 +241,12 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.cacophonium);
addItem(ModItems.recordGaia1);
addItem(ModItems.recordGaia2);
addItem(ModItems.ancientWill);
addItem(ModItems.ancientWillAhrim);
addItem(ModItems.ancientWillDharok);
addItem(ModItems.ancientWillGuthan);
addItem(ModItems.ancientWillTorag);
addItem(ModItems.ancientWillVerac);
addItem(ModItems.ancientWillKaril);
addItem(ModItems.pinkinator);
addItem(ModItems.gaiaHead);
if(ConfigHandler.relicsEnabled) {
@@ -16,6 +16,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.registries.IForgeRegistryEntry;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.common.item.ItemAncientWill;
import vazkii.botania.common.item.ModItems;
import javax.annotation.Nonnull;
@@ -35,7 +36,7 @@ public class AncientWillRecipe extends IForgeRegistryEntry.Impl<IRecipe> impleme
for(int i = 0; i < var1.getSizeInventory(); i++) {
ItemStack stack = var1.getStackInSlot(i);
if(!stack.isEmpty()) {
if(stack.getItem() == ModItems.ancientWill && !foundWill)
if(stack.getItem() instanceof ItemAncientWill && !foundWill)
foundWill = true;
else if(!foundItem) {
if(stack.getItem() instanceof IAncientWillContainer)
@@ -52,14 +53,14 @@ public class AncientWillRecipe extends IForgeRegistryEntry.Impl<IRecipe> impleme
@Override
public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) {
ItemStack item = ItemStack.EMPTY;
int will = -1;
IAncientWillContainer.AncientWillType will = null;
for(int i = 0; i < var1.getSizeInventory(); i++) {
ItemStack stack = var1.getStackInSlot(i);
if(!stack.isEmpty()) {
if(stack.getItem() instanceof IAncientWillContainer && item.isEmpty())
item = stack;
else will = stack.getItemDamage();
else will = ((ItemAncientWill) stack.getItem()).type; // we already verified this is a will in matches()
}
}
@@ -0,0 +1,36 @@
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;
}
}
@@ -4,12 +4,14 @@ 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.common.item.ModItems;
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;
@@ -92,6 +94,10 @@ public class FlattenItems implements IFixableData {
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);
});
}
@Override
@@ -12,57 +12,33 @@ package vazkii.botania.common.item;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.Locale;
public class ItemAncientWill extends ItemMod {
public final IAncientWillContainer.AncientWillType type;
private static final int SUBTYPES = 6;
public ItemAncientWill() {
super(LibItemNames.ANCIENT_WILL);
setHasSubtypes(true);
public ItemAncientWill(IAncientWillContainer.AncientWillType variant) {
super(LibItemNames.ANCIENT_WILL + "_" + variant.name().toLowerCase(Locale.ROOT));
this.type = variant;
setMaxStackSize(1);
}
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(this, 1, i));
}
}
@SideOnly(Side.CLIENT)
@Override
public void addInformation(ItemStack stack, World world, List<String> list, ITooltipFlag flag) {
addStringToTooltip(I18n.format("botaniamisc.craftToAddWill"), list);
addStringToTooltip(I18n.format("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), list);
addStringToTooltip(I18n.format("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".shortDesc"), list);
}
public void addStringToTooltip(String s, List<String> tooltip) {
tooltip.add(s.replaceAll("&", "\u00a7"));
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, 6, LibItemNames.ANCIENT_WILL);
}
}
@@ -23,6 +23,7 @@ import net.minecraftforge.registries.IForgeRegistry;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IFloatingFlower;
import vazkii.botania.api.mana.spark.SparkUpgradeType;
import vazkii.botania.api.item.IAncientWillContainer;
import vazkii.botania.common.item.brew.ItemBrewFlask;
import vazkii.botania.common.item.brew.ItemBrewVial;
import vazkii.botania.common.item.brew.ItemIncenseStick;
@@ -287,7 +288,12 @@ public final class ModItems {
public static final Item flareChakram = new ItemThornChakram(LibItemNames.FLARE_CHAKRAM);
public static final Item overgrowthSeed = new ItemOvergrowthSeed();
public static final Item craftPattern = new ItemCraftPattern();
public static final Item ancientWill = new ItemAncientWill();
public static final Item ancientWillAhrim = new ItemAncientWill(IAncientWillContainer.AncientWillType.AHRIM);
public static final Item ancientWillDharok = new ItemAncientWill(IAncientWillContainer.AncientWillType.DHAROK);
public static final Item ancientWillGuthan = new ItemAncientWill(IAncientWillContainer.AncientWillType.GUTHAN);
public static final Item ancientWillTorag = new ItemAncientWill(IAncientWillContainer.AncientWillType.TORAG);
public static final Item ancientWillVerac = new ItemAncientWill(IAncientWillContainer.AncientWillType.VERAC);
public static final Item ancientWillKaril = new ItemAncientWill(IAncientWillContainer.AncientWillType.KARIL);
public static final Item corporeaSpark = new ItemCorporeaSpark();
public static final Item livingwoodBow = new ItemLivingwoodBow();
public static final Item crystalBow = new ItemCrystalBow();
@@ -511,7 +517,12 @@ public final class ModItems {
r.register(flareChakram);
r.register(overgrowthSeed);
r.register(craftPattern);
r.register(ancientWill);
r.register(ancientWillAhrim);
r.register(ancientWillDharok);
r.register(ancientWillGuthan);
r.register(ancientWillTorag);
r.register(ancientWillVerac);
r.register(ancientWillKaril);
r.register(corporeaSpark);
r.register(livingwoodBow);
r.register(crystalBow);
@@ -39,10 +39,11 @@ import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Locale;
public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDiscountArmor, IAncientWillContainer, IManaGivingItem {
private static final String TAG_ANCIENT_WILL = "AncientWill";
public static final String TAG_ANCIENT_WILL = "AncientWill";
public ItemTerrasteelHelm() {
this(LibItemNames.TERRASTEEL_HELM);
@@ -70,31 +71,31 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
}
@Override
public void addAncientWill(ItemStack stack, int will) {
ItemNBTHelper.setBoolean(stack, TAG_ANCIENT_WILL + will, true);
public void addAncientWill(ItemStack stack, AncientWillType will) {
ItemNBTHelper.setBoolean(stack, TAG_ANCIENT_WILL + "_" + will.name().toLowerCase(Locale.ROOT), true);
}
@Override
public boolean hasAncientWill(ItemStack stack, int will) {
public boolean hasAncientWill(ItemStack stack, AncientWillType will) {
return hasAncientWill_(stack, will);
}
public static boolean hasAncientWill_(ItemStack stack, int will) {
return ItemNBTHelper.getBoolean(stack, TAG_ANCIENT_WILL + will, false);
private static boolean hasAncientWill_(ItemStack stack, AncientWillType will) {
return ItemNBTHelper.getBoolean(stack, TAG_ANCIENT_WILL + "_" + will.name().toLowerCase(Locale.ROOT), false);
}
@Override
@SideOnly(Side.CLIENT)
public void addArmorSetDescription(ItemStack stack, List<String> list) {
super.addArmorSetDescription(stack, list);
for(int i = 0; i < 6; i++)
if(hasAncientWill(stack, i))
addStringToTooltip(I18n.format("botania.armorset.will" + i + ".desc"), list);
for(AncientWillType type : AncientWillType.values())
if(hasAncientWill(stack, type))
addStringToTooltip(I18n.format("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc"), list);
}
public static boolean hasAnyWill(ItemStack stack) {
for(int i = 0; i < 6; i++)
if(hasAncientWill_(stack, i))
private static boolean hasAnyWill(ItemStack stack) {
for(AncientWillType type : AncientWillType.values())
if(hasAncientWill_(stack, type))
return true;
return false;
@@ -128,24 +129,17 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding();
ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD);
if(crit && !stack.isEmpty() && stack.getItem() instanceof ItemTerrasteelHelm) {
boolean ahrim = hasAncientWill(stack, 0);
boolean dharok = hasAncientWill(stack, 1);
boolean guthan = hasAncientWill(stack, 2);
boolean torag = hasAncientWill(stack, 3);
boolean verac = hasAncientWill(stack, 4);
boolean karil = hasAncientWill(stack, 5);
if(ahrim)
if(hasAncientWill(stack, AncientWillType.AHRIM))
event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 20, 1));
if(dharok)
if(hasAncientWill(stack, AncientWillType.DHAROK))
event.setAmount(event.getAmount() * (1F + (1F - player.getHealth() / player.getMaxHealth()) * 0.5F));
if(guthan)
if(hasAncientWill(stack, AncientWillType.GUTHAN))
player.heal(event.getAmount() * 0.25F);
if(torag)
if(hasAncientWill(stack, AncientWillType.TORAG))
event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 60, 1));
if(verac)
if(hasAncientWill(stack, AncientWillType.VERAC))
event.getSource().setDamageBypassesArmor();
if(karil)
if(hasAncientWill(stack, AncientWillType.KARIL))
event.getEntityLiving().addPotionEffect(new PotionEffect(MobEffects.WITHER, 60, 1));
}
}
@@ -126,7 +126,7 @@ public final class LibItemNames {
public static final String FLARE_CHAKRAM = "flare_chakram";
public static final String OVERGROWTH_SEED = "overgrowthSeed";
public static final String CRAFT_PATTERN = "craftPattern";
public static final String ANCIENT_WILL = "ancientWill";
public static final String ANCIENT_WILL = "ancient_will";
public static final String CORPOREA_SPARK = "corporeaSpark";
public static final String LIVINGWOOD_BOW = "livingwoodBow";
public static final String CRYSTAL_BOW = "crystalBow";