MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tooltips fix

Browse source
This commit is contained in:
paulevsGitch 2021-05-18 05:17:28 +03:00
parent 6c09c80849
commit 7f40d46ac2
7 changed files with 61 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/client/BetterEndClient.java
View file

@ -8,7 +8,6 @@ import ru.betterend.BetterEnd;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.interfaces.MultiModelItem; import ru.betterend.interfaces.MultiModelItem;
import ru.betterend.item.CrystaliteArmor;
import ru.betterend.registry.EndBlockEntityRenders; import ru.betterend.registry.EndBlockEntityRenders;
import ru.betterend.registry.EndEntitiesRenders; import ru.betterend.registry.EndEntitiesRenders;
import ru.betterend.registry.EndModelProviders; import ru.betterend.registry.EndModelProviders;
@ -26,7 +25,6 @@ public class BetterEndClient implements ClientModInitializer {
EndEntitiesRenders.register(); EndEntitiesRenders.register();
EndModelProviders.register(); EndModelProviders.register();
MultiModelItem.register(); MultiModelItem.register();
//CrystaliteArmor.registerTooltips();
ClientOptions.init(); ClientOptions.init();
if (BetterEnd.isDevEnvironment()) { if (BetterEnd.isDevEnvironment()) {

10
src/main/java/ru/betterend/item/ArmoredElytra.java
View file

@ -1,5 +1,7 @@
package ru.betterend.item; package ru.betterend.item;
import java.util.UUID;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry; import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
@ -7,13 +9,15 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.*; import net.minecraft.world.item.ArmorMaterial;
import net.minecraft.world.item.ElytraItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.interfaces.MultiModelItem; import ru.betterend.interfaces.MultiModelItem;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
import java.util.UUID;
public class ArmoredElytra extends EndArmorItem implements MultiModelItem { public class ArmoredElytra extends EndArmorItem implements MultiModelItem {
private static final UUID ARMOR_MODIFIER_UUID_CHEST = ARMOR_MODIFIER_UUID_PER_SLOT[2]; private static final UUID ARMOR_MODIFIER_UUID_CHEST = ARMOR_MODIFIER_UUID_PER_SLOT[2];

53
src/main/java/ru/betterend/item/CrystaliteArmor.java
View file

@ -1,10 +1,14 @@
package ru.betterend.item; package ru.betterend.item;
import java.util.List;
import org.jetbrains.annotations.Nullable;
import net.fabricmc.api.EnvType; import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment; import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style; import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.network.chat.TranslatableComponent;
@ -13,6 +17,8 @@ import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import ru.betterend.effects.EndStatusEffects; import ru.betterend.effects.EndStatusEffects;
import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
@ -39,31 +45,30 @@ public class CrystaliteArmor extends EndArmorItem {
owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_HEALTH_REGEN)); owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_HEALTH_REGEN));
} }
/*@Environment(EnvType.CLIENT) @Override
public static void registerTooltips() { @Environment(EnvType.CLIENT)
ItemTooltipCallback.EVENT.register((stack, context, lines) -> { public void appendHoverText(ItemStack stack, @Nullable Level level, List<Component> lines, TooltipFlag tooltip) {
if (stack.getItem() instanceof CrystaliteArmor) { super.appendHoverText(stack, level, lines, tooltip);
boolean hasSet = false;
Player owner = Minecraft.getInstance().player;
if (owner != null) {
hasSet = hasFullSet(owner);
}
TranslatableComponent setDesc = new TranslatableComponent("tooltip.armor.crystalite_set"); boolean hasSet = false;
setDesc.setStyle(Style.EMPTY.applyFormats(hasSet ? ChatFormatting.BLUE : ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC)); Player owner = Minecraft.getInstance().player;
lines.add(TextComponent.EMPTY); if (owner != null) {
lines.add(setDesc); hasSet = hasFullSet(owner);
}
if (stack.getItem() == EndItems.CRYSTALITE_CHESTPLATE) { TranslatableComponent setDesc = new TranslatableComponent("tooltip.armor.crystalite_set");
lines.add(1, TextComponent.EMPTY); setDesc.setStyle(Style.EMPTY.applyFormats(hasSet ? ChatFormatting.BLUE : ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC));
lines.add(2, CHEST_DESC); lines.add(TextComponent.EMPTY);
} else if (stack.getItem() == EndItems.CRYSTALITE_BOOTS) { lines.add(setDesc);
lines.add(1, TextComponent.EMPTY);
lines.add(2, BOOTS_DESC); if (stack.getItem() == EndItems.CRYSTALITE_CHESTPLATE) {
} lines.add(1, TextComponent.EMPTY);
} lines.add(2, CHEST_DESC);
}); } else if (stack.getItem() == EndItems.CRYSTALITE_BOOTS) {
}*/ lines.add(1, TextComponent.EMPTY);
lines.add(2, BOOTS_DESC);
}
}
static { static {
Style descStyle = Style.EMPTY.applyFormats(ChatFormatting.DARK_AQUA, ChatFormatting.ITALIC); Style descStyle = Style.EMPTY.applyFormats(ChatFormatting.DARK_AQUA, ChatFormatting.ITALIC);

4
src/main/java/ru/betterend/item/CrystaliteHelmet.java
View file

@ -1,13 +1,13 @@
package ru.betterend.item; package ru.betterend.item;
import java.util.UUID;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
import ru.betterend.registry.EndAttributes; import ru.betterend.registry.EndAttributes;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
import java.util.UUID;
public class CrystaliteHelmet extends CrystaliteArmor { public class CrystaliteHelmet extends CrystaliteArmor {
public CrystaliteHelmet() { public CrystaliteHelmet() {

4
src/main/java/ru/betterend/item/CrystaliteLeggings.java
View file

@ -1,13 +1,13 @@
package ru.betterend.item; package ru.betterend.item;
import java.util.UUID;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.Rarity; import net.minecraft.world.item.Rarity;
import ru.betterend.registry.EndItems; import ru.betterend.registry.EndItems;
import java.util.UUID;
public class CrystaliteLeggings extends CrystaliteArmor { public class CrystaliteLeggings extends CrystaliteArmor {
public CrystaliteLeggings() { public CrystaliteLeggings() {

5
src/main/java/ru/betterend/item/EndArmorItem.java
View file

@ -1,7 +1,10 @@
package ru.betterend.item; package ru.betterend.item;
import java.util.UUID;
import com.google.common.collect.HashMultimap; import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attribute; import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
@ -11,8 +14,6 @@ import net.minecraft.world.item.ArmorMaterial;
import ru.betterend.patterns.Patterned; import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns; import ru.betterend.patterns.Patterns;
import java.util.UUID;
public class EndArmorItem extends ArmorItem implements Patterned { public class EndArmorItem extends ArmorItem implements Patterned {
protected static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] { protected static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] {

27
src/main/java/ru/betterend/mixin/common/LivingEntityMixin.java
View file

@ -1,12 +1,27 @@
package ru.betterend.mixin.common; package ru.betterend.mixin.common;
import java.util.Collection;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundEvent;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.effect.MobEffect; import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects; import net.minecraft.world.effect.MobEffects;
import net.minecraft.world.entity.*; import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.MoverType;
import net.minecraft.world.entity.ai.attributes.AttributeMap; import net.minecraft.world.entity.ai.attributes.AttributeMap;
import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier; import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@ -17,21 +32,11 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.At.Shift;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import ru.betterend.interfaces.MobEffectApplier; import ru.betterend.interfaces.MobEffectApplier;
import ru.betterend.item.ArmoredElytra; import ru.betterend.item.ArmoredElytra;
import ru.betterend.item.CrystaliteArmor; import ru.betterend.item.CrystaliteArmor;
import ru.betterend.registry.EndAttributes; import ru.betterend.registry.EndAttributes;
import java.util.Collection;
@Mixin(LivingEntity.class) @Mixin(LivingEntity.class)
public abstract class LivingEntityMixin extends Entity { public abstract class LivingEntityMixin extends Entity {