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

Merge branch 'master' into experimental

Browse source
This commit is contained in:
Aleksey 2021-05-16 12:13:28 +03:00
commit f2e2132bb0
94 changed files with 1078 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,18 +2,14 @@ package ru.betterend.item;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.*;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.BreakableItem;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
import ru.betterend.interfaces.MultiModelItem;
import ru.betterend.registry.EndItems;
import java.util.UUID;

75
src/main/java/ru/betterend/item/CrystaliteArmor.java Normal file
View file

@ -0,0 +1,75 @@
package ru.betterend.item;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Style;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.network.chat.TranslatableComponent;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import ru.betterend.effects.EndStatusEffects;
import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.registry.EndItems;
public class CrystaliteArmor extends EndArmorItem {
protected final static TranslatableComponent CHEST_DESC;
protected final static TranslatableComponent BOOTS_DESC;
public CrystaliteArmor(EquipmentSlot equipmentSlot, Properties settings) {
super(EndArmorMaterial.CRYSTALITE, equipmentSlot, settings);
}
public static boolean hasFullSet(LivingEntity owner) {
for (ItemStack armorStack : owner.getArmorSlots()) {
if (!(armorStack.getItem() instanceof CrystaliteArmor)) {
return false;
}
}
return true;
}
public static void applySetEffect(LivingEntity owner) {
owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_HEALTH_REGEN));
}
@Environment(EnvType.CLIENT)
public static void registerTooltips() {
ItemTooltipCallback.EVENT.register((stack, context, lines) -> {
if (stack.getItem() instanceof CrystaliteArmor) {
boolean hasSet = false;
Player owner = Minecraft.getInstance().player;
if (owner != null) {
hasSet = hasFullSet(owner);
}
TranslatableComponent setDesc = new TranslatableComponent("tooltip.armor.crystalite_set");
setDesc.setStyle(Style.EMPTY.applyFormats(hasSet ? ChatFormatting.BLUE : ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC));
lines.add(TextComponent.EMPTY);
lines.add(setDesc);
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 {
Style descStyle = Style.EMPTY.applyFormats(ChatFormatting.DARK_AQUA, ChatFormatting.ITALIC);
CHEST_DESC = new TranslatableComponent("tooltip.armor.crystalite_chest");
CHEST_DESC.setStyle(descStyle);
BOOTS_DESC = new TranslatableComponent("tooltip.armor.crystalite_boots");
BOOTS_DESC.setStyle(descStyle);
}
}

21
src/main/java/ru/betterend/item/CrystaliteBoots.java Normal file
View file

@ -0,0 +1,21 @@
package ru.betterend.item;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Rarity;
import ru.betterend.effects.EndStatusEffects;
import ru.betterend.interfaces.MobEffectApplier;
import ru.betterend.registry.EndItems;
public class CrystaliteBoots extends CrystaliteArmor implements MobEffectApplier {
public CrystaliteBoots() {
super(EquipmentSlot.FEET, EndItems.makeItemSettings().rarity(Rarity.RARE));
}
@Override
public void applyEffect(LivingEntity owner) {
owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_MOVE_SPEED));
}
}

21
src/main/java/ru/betterend/item/CrystaliteChestplate.java Normal file
View file

@ -0,0 +1,21 @@
package ru.betterend.item;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.Rarity;
import ru.betterend.effects.EndStatusEffects;
import ru.betterend.interfaces.MobEffectApplier;
import ru.betterend.registry.EndItems;
public class CrystaliteChestplate extends CrystaliteArmor implements MobEffectApplier {
public CrystaliteChestplate() {
super(EquipmentSlot.CHEST, EndItems.makeItemSettings().rarity(Rarity.RARE));
}
@Override
public void applyEffect(LivingEntity owner) {
owner.addEffect(new MobEffectInstance(EndStatusEffects.CRYSTALITE_DIG_SPEED));
}
}

18
src/main/java/ru/betterend/item/CrystaliteHelmet.java Normal file
View file

@ -0,0 +1,18 @@
package ru.betterend.item;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.item.Rarity;
import ru.betterend.registry.EndAttributes;
import ru.betterend.registry.EndItems;
import java.util.UUID;
public class CrystaliteHelmet extends CrystaliteArmor {
public CrystaliteHelmet() {
super(EquipmentSlot.HEAD, EndItems.makeItemSettings().rarity(Rarity.RARE));
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[EquipmentSlot.HEAD.getIndex()];
addAttributeModifier(EndAttributes.BLINDNESS_RESISTANCE, new AttributeModifier(uuid, "Helmet blindness resistance", 1.0, AttributeModifier.Operation.ADDITION));
}
}

18
src/main/java/ru/betterend/item/CrystaliteLeggings.java Normal file
View file

@ -0,0 +1,18 @@
package ru.betterend.item;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.Rarity;
import ru.betterend.registry.EndItems;
import java.util.UUID;
public class CrystaliteLeggings extends CrystaliteArmor {
public CrystaliteLeggings() {
super(EquipmentSlot.LEGS, EndItems.makeItemSettings().rarity(Rarity.RARE));
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[EquipmentSlot.LEGS.getIndex()];
addAttributeModifier(Attributes.MAX_HEALTH, new AttributeModifier(uuid, "Armor health boost", 4.0, AttributeModifier.Operation.ADDITION));
}
}

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

@ -1,25 +1,19 @@
package ru.betterend.item;
import java.util.UUID;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterial;
import net.minecraft.world.item.Item;
import ru.betterend.mixin.common.ArmorItemAccessor;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class EndArmorItem extends ArmorItem implements ModelProvider {
import java.util.UUID;
public class EndArmorItem extends ArmorItem implements Patterned {
protected static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] {
UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"),
@ -54,7 +48,7 @@ public class EndArmorItem extends ArmorItem implements ModelProvider {
}
@Override
public String getModelString(String name) {
public String getModelPattern(String name) {
return Patterns.createItemGenerated(name);
}
}

10
src/main/java/ru/betterend/item/EndAttribute.java Normal file
View file

@ -0,0 +1,10 @@
package ru.betterend.item;
import net.minecraft.world.entity.ai.attributes.Attribute;
public class EndAttribute extends Attribute {
public EndAttribute(String description, double value) {
super(description, value);
}
}

13
src/main/java/ru/betterend/item/EndBucketItem.java
View file

@ -1,18 +1,19 @@
package ru.betterend.item;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.FishBucketItem;
import net.minecraft.world.level.material.Fluids;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndItems;
public class EndBucketItem extends BucketItem implements ModelProvider {
public EndBucketItem() {
super(Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));
public class EndBucketItem extends FishBucketItem implements Patterned {
public EndBucketItem(EntityType<?> type) {
super(type, Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));
}
@Override
public String getModelString(String name) {
public String getModelPattern(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);
}
}