mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 03:39:17 +00:00
Fix attribute modifiers
This commit is contained in:
1 parent
f7785a0a54
commit
23f3213daf
10 files changed
+42
-48
No files matched your search
@@ -46,20 +46,22 @@ public class ItemBlockSpecialFlower extends BlockItem {
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
@Override
|
||||
public void addInformation(@Nonnull ItemStack stack, World world, @Nonnull List<ITextComponent> tooltip, @Nonnull ITooltipFlag flag) {
|
||||
if (GENERATING.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.generating").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
} else if (FUNCTIONAL.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.functional").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
} else if (MISC.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.misc").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
}
|
||||
|
||||
// Prevent crash when tooltips queried before configs load
|
||||
if (Botania.finishedLoading && ConfigHandler.CLIENT.referencesEnabled.get()) {
|
||||
String key = getTranslationKey() + ".reference";
|
||||
IFormattableTextComponent lore = new TranslationTextComponent(key);
|
||||
if (!lore.getString().equals(key)) {
|
||||
tooltip.add(lore.func_240701_a_(TextFormatting.ITALIC, TextFormatting.GRAY));
|
||||
if (Botania.finishedLoading) {
|
||||
if (GENERATING.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.generating").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
} else if (FUNCTIONAL.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.functional").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
} else if (MISC.func_230235_a_(this)) {
|
||||
tooltip.add(new TranslationTextComponent("botania.flowerType.misc").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE));
|
||||
}
|
||||
|
||||
if (ConfigHandler.CLIENT.referencesEnabled.get()) {
|
||||
String key = getTranslationKey() + ".reference";
|
||||
IFormattableTextComponent lore = new TranslationTextComponent(key);
|
||||
if (!lore.getString().equals(key)) {
|
||||
tooltip.add(lore.func_240701_a_(TextFormatting.ITALIC, TextFormatting.GRAY));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.armor.elementium;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -29,6 +30,7 @@ public class ItemElementiumBoots extends ItemElementiumArmor {
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
if (slot == getEquipmentSlot()) {
|
||||
ret = HashMultimap.create(ret);
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.09));
|
||||
}
|
||||
return ret;
|
||||
|
||||
+2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.armor.elementium;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -29,6 +30,7 @@ public class ItemElementiumChest extends ItemElementiumArmor {
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
if (slot == getEquipmentSlot()) {
|
||||
ret = HashMultimap.create(ret);
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.17));
|
||||
}
|
||||
return ret;
|
||||
|
||||
+2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.armor.elementium;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -32,6 +33,7 @@ public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDisc
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
if (slot == getEquipmentSlot()) {
|
||||
ret = HashMultimap.create(ret);
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.11));
|
||||
}
|
||||
return ret;
|
||||
|
||||
+2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.armor.elementium;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -29,6 +30,7 @@ public class ItemElementiumLegs extends ItemElementiumArmor {
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
if (slot == getEquipmentSlot()) {
|
||||
ret = HashMultimap.create(ret);
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.15));
|
||||
}
|
||||
return ret;
|
||||
|
||||
+8
-5
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.armor.terrasteel;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.client.renderer.entity.model.BipedModel;
|
||||
@@ -18,6 +19,7 @@ import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.inventory.EquipmentSlotType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.LazyValue;
|
||||
import net.minecraft.util.registry.Registry;
|
||||
import net.minecraft.util.text.IFormattableTextComponent;
|
||||
import net.minecraft.util.text.ITextComponent;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
@@ -56,15 +58,16 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor {
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot, ItemStack stack) {
|
||||
Multimap<Attribute, AttributeModifier> multimap = super.getAttributeModifiers(slot, stack);
|
||||
UUID uuid = new UUID((getTranslationKey(stack) + slot.toString()).hashCode(), 0);
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
UUID uuid = new UUID(Registry.ITEM.getKey(this).hashCode() + slot.toString().hashCode(), 0);
|
||||
if (slot == getEquipmentSlot()) {
|
||||
ret = HashMultimap.create(ret);
|
||||
int reduction = material.getDamageReductionAmount(slot);
|
||||
multimap.put(Attributes.field_233820_c_,
|
||||
ret.put(Attributes.field_233820_c_,
|
||||
new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) reduction / 20, AttributeModifier.Operation.ADDITION));
|
||||
}
|
||||
return multimap;
|
||||
return ret;
|
||||
}
|
||||
|
||||
private static final LazyValue<ItemStack[]> armorSet = new LazyValue<>(() -> new ItemStack[] {
|
||||
|
||||
@@ -33,7 +33,7 @@ import java.util.function.Consumer;
|
||||
public class ItemEnderDagger extends ItemManasteelSword {
|
||||
|
||||
public ItemEnderDagger(Properties props) {
|
||||
super(BotaniaAPI.instance().getManasteelItemTier(), props);
|
||||
super(BotaniaAPI.instance().getManasteelItemTier(), 3, -1.25F, props);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -61,17 +61,4 @@ public class ItemEnderDagger extends ItemManasteelSword {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlotType equipmentSlot) {
|
||||
Multimap<Attribute, AttributeModifier> multimap = super.getAttributeModifiers(equipmentSlot);
|
||||
|
||||
if (equipmentSlot == EquipmentSlotType.MAINHAND) {
|
||||
multimap.put(Attributes.field_233825_h_,
|
||||
new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.25, AttributeModifier.Operation.ADDITION));
|
||||
}
|
||||
|
||||
return multimap;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,6 +8,8 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.tool;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.ImmutableMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -40,7 +42,7 @@ public class ItemThunderSword extends ItemManasteelSword {
|
||||
private static final String TAG_LIGHTNING_SEED = "lightningSeed";
|
||||
|
||||
public ItemThunderSword(Properties props) {
|
||||
super(BotaniaAPI.instance().getTerrasteelItemTier(), props);
|
||||
super(BotaniaAPI.instance().getTerrasteelItemTier(), 3, -1.5F, props);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -84,18 +86,4 @@ public class ItemThunderSword extends ItemManasteelSword {
|
||||
return super.hitEntity(stack, entity, attacker);
|
||||
}
|
||||
|
||||
@Nonnull
|
||||
@Override
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(EquipmentSlotType equipmentSlot) {
|
||||
Multimap<Attribute, AttributeModifier> multimap = super.getAttributeModifiers(equipmentSlot);
|
||||
|
||||
if (equipmentSlot == EquipmentSlotType.MAINHAND) {
|
||||
multimap.removeAll(Attributes.field_233825_h_);
|
||||
multimap.put(Attributes.field_233825_h_,
|
||||
new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.5, AttributeModifier.Operation.ADDITION));
|
||||
}
|
||||
|
||||
return multimap;
|
||||
}
|
||||
|
||||
}
|
||||
+2
@@ -8,6 +8,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.item.equipment.tool.elementium;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import net.minecraft.entity.ai.attributes.Attribute;
|
||||
@@ -31,6 +32,7 @@ public class ItemElementiumSword extends ItemManasteelSword {
|
||||
public Multimap<Attribute, AttributeModifier> getAttributeModifiers(@Nonnull EquipmentSlotType slot) {
|
||||
Multimap<Attribute, AttributeModifier> ret = super.getAttributeModifiers(slot);
|
||||
if (slot == EquipmentSlotType.MAINHAND) {
|
||||
ret = HashMultimap.create(ret);
|
||||
ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Sword modifier", 0.05));
|
||||
}
|
||||
return ret;
|
||||
|
||||
+5
-1
@@ -33,7 +33,11 @@ public class ItemManasteelSword extends SwordItem implements IManaUsingItem {
|
||||
}
|
||||
|
||||
public ItemManasteelSword(IItemTier mat, Properties props) {
|
||||
super(mat, 3, -2.4F, props);
|
||||
this(mat, 3, -2.4F, props);
|
||||
}
|
||||
|
||||
public ItemManasteelSword(IItemTier mat, int attackDamage, float attackSpeed, Properties props) {
|
||||
super(mat, attackDamage, attackSpeed, props);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user