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

[Change] Replaced custom Elytra code with fabric version

Browse source
This commit is contained in:
Frank 2022-06-10 14:45:30 +02:00
parent 5622ae316a
commit aec75669ed
10 changed files with 47 additions and 281 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/betterx/betterend/item/ArmoredElytra.java
View file

@ -2,7 +2,7 @@ package org.betterx.betterend.item;
import org.betterx.bclib.items.BaseArmorItem;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.interfaces.FallFlyingItem;
import org.betterx.betterend.interfaces.BetterEndElytra;
import org.betterx.betterend.interfaces.MultiModelItem;
import org.betterx.betterend.registry.EndItems;
@ -14,9 +14,10 @@ import net.minecraft.world.item.*;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.entity.event.v1.FabricElytraItem;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, FallFlyingItem {
public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, BetterEndElytra, FabricElytraItem {
private final ResourceLocation wingTexture;
private final Item repairItem;
private final double movementFactor;
@ -43,8 +44,8 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Fall
this.wingTexture = BetterEnd.makeID("textures/entity/" + name + ".png");
this.repairItem = repairItem;
this.movementFactor = movementFactor;
this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.75);
this.toughness = material.getToughness() / 1.75F;
this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.15);
this.toughness = material.getToughness() / 1.15F;
addAttributeModifier(
Attributes.ARMOR,
new AttributeModifier(

9
src/main/java/org/betterx/betterend/item/CrystaliteElytra.java
View file

@ -1,7 +1,7 @@
package org.betterx.betterend.item;
import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.interfaces.FallFlyingItem;
import org.betterx.betterend.interfaces.BetterEndElytra;
import org.betterx.betterend.interfaces.MultiModelItem;
import org.betterx.betterend.registry.EndItems;
@ -15,9 +15,10 @@ import net.minecraft.world.item.Rarity;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.entity.event.v1.FabricElytraItem;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, FallFlyingItem {
public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, BetterEndElytra, FabricElytraItem {
private final ResourceLocation wingTexture;
private final double movementFactor;
@ -28,8 +29,8 @@ public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem,
super(EquipmentSlot.CHEST, EndItems.makeEndItemSettings().durability(durability).rarity(Rarity.EPIC));
this.wingTexture = BetterEnd.makeID("textures/entity/elytra_crystalite.png");
this.movementFactor = movementFactor;
this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.75);
this.toughness = material.getToughness() / 1.75F;
this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.25);
this.toughness = material.getToughness() / 1.25F;
addAttributeModifier(
Attributes.ARMOR,
new AttributeModifier(