lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added more to the upgrades

Browse source 
Added a lot of the regular upgrades, as well as added the recipe for the Binding Reagent. The rituals used for upgrading/removing upgrades for the Living Armour were also added, as well as the Ellipsoid ritual. Complete for BM 3.0.2
This commit is contained in:
WayofTime 2020-12-07 09:09:50 -05:00
parent 953bac9298
commit 7b938c28b4
14 changed files with 766 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java
View file

@ -162,6 +162,7 @@ public class GeneratorLanguage extends LanguageProvider
add("ritual.bloodmagic.crystalHarvestRitual", "Crack of the Fractured Crystal");
add("ritual.bloodmagic.forsakenSoulRitual", "Gathering of the Forsaken Souls");
add("ritual.bloodmagic.crystalSplitRitual", "Resonance of the Faceted Crystal");
add("ritual.bloodmagic.ellipsoidRitual", "Focus of the Ellipsoid");
add("ritual.bloodmagic.cobblestoneRitual", "Le Vulcanos Frigius");
add("ritual.bloodmagic.placerRitual", "The Filler");
@ -301,27 +302,27 @@ public class GeneratorLanguage extends LanguageProvider
add("living_upgrade.bloodmagic.arrow_protect", "Pin Cushion");
add("living_upgrade.bloodmagic.speed", "Quick Feet");
add("living_upgrade.bloodmagic.digging", "Dwarven Might");
add("living_upgrade.bloodmagic.poisonResist", "Poison Resistance");
add("living_upgrade.bloodmagic.fireResist", "Gift of Ignis");
add("living_upgrade.bloodmagic.poison_resist", "Poison Resistance");
add("living_upgrade.bloodmagic.fire_resist", "Gift of Ignis");
add("living_upgrade.bloodmagic.self_sacrifice", "Tough Palms");
add("living_upgrade.bloodmagic.knockback", "Body Builder");
add("living_upgrade.bloodmagic.physicalProtect", "Tough");
add("living_upgrade.bloodmagic.knockback_resist", "Body Builder");
add("living_upgrade.bloodmagic.physical_protect", "Tough");
add("living_upgrade.bloodmagic.health", "Healthy");
add("living_upgrade.bloodmagic.meleeDamage", "Fierce Strike");
add("living_upgrade.bloodmagic.arrowShot", "Trick Shot");
add("living_upgrade.bloodmagic.stepAssist", "Step Assist");
add("living_upgrade.bloodmagic.grimReaper", "Grim Reaper's Sprint");
add("living_upgrade.bloodmagic.solarPowered", "Solar Powered");
add("living_upgrade.bloodmagic.melee_damage", "Fierce Strike");
add("living_upgrade.bloodmagic.arrow_shot", "Trick Shot");
add("living_upgrade.bloodmagic.step_assist", "Step Assist");
add("living_upgrade.bloodmagic.grim_reaper", "Grim Reaper's Sprint");
add("living_upgrade.bloodmagic.solar_powered", "Solar Powered");
add("living_upgrade.bloodmagic.thaumRunicShielding", "Runic Shielding");
add("living_upgrade.bloodmagic.revealing", "Revealing");
add("living_upgrade.bloodmagic.experienced", "Experienced");
add("living_upgrade.bloodmagic.jump", "Strong Legs");
add("living_upgrade.bloodmagic.fallProtect", "Soft Fall");
add("living_upgrade.bloodmagic.graveDigger", "Grave Digger");
add("living_upgrade.bloodmagic.fall_protect", "Soft Fall");
add("living_upgrade.bloodmagic.grave_digger", "Grave Digger");
add("living_upgrade.bloodmagic.sprint_attack", "Charging Strike");
add("living_upgrade.bloodmagic.criticalStrike", "True Strike");
add("living_upgrade.bloodmagic.critical_strike", "True Strike");
add("living_upgrade.bloodmagic.elytra", "Elytra");
add("living_upgrade.bloodmagic.nightSight", "Nocturnal Prowess");
add("living_upgrade.bloodmagic.night_sight", "Nocturnal Prowess");
add("living_upgrade.bloodmagic.repair", "Repairing");
add("living_upgrade.bloodmagic.slowness", "Limp Leg");

27
src/main/java/wayoftime/bloodmagic/common/item/ItemLivingArmor.java
View file

@ -2,6 +2,7 @@ package wayoftime.bloodmagic.common.item;
import java.util.List;
import java.util.UUID;
import java.util.function.Consumer;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@ -53,6 +54,32 @@ public class ItemLivingArmor extends ArmorItem implements ILivingContainer, Expa
}
}
@Override
public boolean getIsRepairable(ItemStack toRepair, ItemStack repair)
{
return repair.getItem() == BloodMagicItems.REAGENT_BINDING.get() || super.getIsRepairable(toRepair, repair);
}
// @Override
// public void setDamage(ItemStack stack, int damage)
// {
// this.damageItem(stack, amount, entity, onBroken)
// if (this.slot != EquipmentSlotType.CHEST)
// {
// return;
// }
// if (damage >= this.getMaxDamage(stack))
// {
// super.setDamage(stack, this.getMaxDamage(stack) - 1);
// }
// }
@Override
public <T extends LivingEntity> int damageItem(ItemStack stack, int amount, T entity, Consumer<T> onBroken)
{
return Math.min((stack.getMaxDamage() - 1) - stack.getDamage() - amount, 0);
}
@Override
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlotType slot, ItemStack stack)
{

1
src/main/java/wayoftime/bloodmagic/common/recipe/TartaricForgeRecipeProvider.java
View file

@ -42,6 +42,7 @@ public class TartaricForgeRecipeProvider implements ISubRecipeProvider
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_FAST_MINER.get()), 128, 20, Ingredient.fromItems(Items.IRON_PICKAXE), Ingredient.fromItems(Items.IRON_AXE), Ingredient.fromItems(Items.IRON_SHOVEL), Ingredient.fromTag(Tags.Items.GUNPOWDER)).build(consumer, BloodMagic.rl(basePath + "reagent_fastminer"));
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BLOOD_LIGHT.get()), 300, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromItems(Items.TORCH), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE)).build(consumer, BloodMagic.rl(basePath + "reagent_blood_light"));
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_SIGHT.get()), 64, 0, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromTag(Tags.Items.GLASS), Ingredient.fromItems(BloodMagicItems.DIVINATION_SIGIL.get())).build(consumer, BloodMagic.rl(basePath + "reagent_sight"));
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicItems.REAGENT_BINDING.get()), 400, 10, Ingredient.fromTag(Tags.Items.DUSTS_GLOWSTONE), Ingredient.fromTag(Tags.Items.DUSTS_REDSTONE), Ingredient.fromTag(Tags.Items.GUNPOWDER), Ingredient.fromTag(Tags.Items.NUGGETS_GOLD)).build(consumer, BloodMagic.rl(basePath + "reagent_binding"));
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRUCIBLE.get()), 400, 100, Ingredient.fromItems(Items.CAULDRON), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GEMS_DIAMOND)).build(consumer, BloodMagic.rl(basePath + "demon_crucible"));
TartaricForgeRecipeBuilder.tartaricForge(new ItemStack(BloodMagicBlocks.DEMON_CRYSTALLIZER.get()), 500, 100, Ingredient.fromItems(BloodMagicBlocks.SOUL_FORGE.get()), Ingredient.fromTag(Tags.Items.STONE), Ingredient.fromTag(Tags.Items.GEMS_LAPIS), Ingredient.fromTag(Tags.Items.GLASS)).build(consumer, BloodMagic.rl(basePath + "demon_crystallizer"));