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

Fixed most compiletime errors

Browse source
This commit is contained in:
Frank 2023-04-29 11:48:56 +02:00
parent e232184b68
commit a974fab707
58 changed files with 449 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,6 @@ import org.betterx.betterend.registry.EndItems;
import net.minecraft.client.renderer.item.ItemProperties;
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.*;
@ -33,7 +32,7 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Bett
) {
super(
material,
EquipmentSlot.CHEST,
Type.CHESTPLATE,
fireproof ? EndItems
.makeEndItemSettings()
.durability(durability)
@ -43,7 +42,7 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Bett
this.wingTexture = BetterEnd.makeID("textures/entity/" + name + ".png");
this.repairItem = repairItem;
this.movementFactor = movementFactor;
this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.15);
this.defense = (int) ((double) material.getDefenseForType(Type.CHESTPLATE) / 1.15);
this.toughness = material.getToughness() / 1.15F;
addAttributeModifier(
Attributes.ARMOR,

5
src/main/java/org/betterx/betterend/item/CrystaliteArmor.java
View file

@ -9,7 +9,6 @@ import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.MutableComponent;
import net.minecraft.network.chat.Style;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
@ -18,8 +17,8 @@ public class CrystaliteArmor extends BaseArmorItem {
public final static MutableComponent CHEST_DESC;
public final static MutableComponent BOOTS_DESC;
public CrystaliteArmor(EquipmentSlot equipmentSlot, Properties settings) {
super(EndArmorMaterial.CRYSTALITE, equipmentSlot, settings);
public CrystaliteArmor(Type type, Properties settings) {
super(EndArmorMaterial.CRYSTALITE, type, settings);
}
public static boolean hasFullSet(LivingEntity owner) {

3
src/main/java/org/betterx/betterend/item/CrystaliteBoots.java
View file

@ -6,7 +6,6 @@ import org.betterx.betterend.registry.EndItems;
import net.minecraft.network.chat.Component;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -22,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
public class CrystaliteBoots extends CrystaliteArmor implements MobEffectApplier {
public CrystaliteBoots() {
super(EquipmentSlot.FEET, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
super(Type.BOOTS, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
}
@Override

3
src/main/java/org/betterx/betterend/item/CrystaliteChestplate.java
View file

@ -6,7 +6,6 @@ import org.betterx.betterend.registry.EndItems;
import net.minecraft.network.chat.Component;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
@ -22,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
public class CrystaliteChestplate extends CrystaliteArmor implements MobEffectApplier {
public CrystaliteChestplate() {
super(EquipmentSlot.CHEST, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
super(Type.CHESTPLATE, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
}
@Override

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

@ -7,7 +7,6 @@ import org.betterx.betterend.registry.EndItems;
import net.minecraft.client.renderer.item.ItemProperties;
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.ElytraItem;
@ -25,10 +24,10 @@ public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem,
private final float toughness;
public CrystaliteElytra(int durability, double movementFactor) {
super(EquipmentSlot.CHEST, EndItems.makeEndItemSettings().durability(durability).rarity(Rarity.EPIC));
super(Type.CHESTPLATE, 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.25);
this.defense = (int) ((double) material.getDefenseForType(Type.CHESTPLATE) / 1.25);
this.toughness = material.getToughness() / 1.25F;
addAttributeModifier(
Attributes.ARMOR,

2
src/main/java/org/betterx/betterend/item/CrystaliteHelmet.java
View file

@ -12,7 +12,7 @@ import java.util.UUID;
public class CrystaliteHelmet extends CrystaliteArmor {
public CrystaliteHelmet() {
super(EquipmentSlot.HEAD, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
super(Type.HELMET, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[EquipmentSlot.HEAD.getIndex()];
addAttributeModifier(
EndAttributes.BLINDNESS_RESISTANCE,

2
src/main/java/org/betterx/betterend/item/CrystaliteLeggings.java
View file

@ -12,7 +12,7 @@ import java.util.UUID;
public class CrystaliteLeggings extends CrystaliteArmor {
public CrystaliteLeggings() {
super(EquipmentSlot.LEGS, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
super(Type.LEGGINGS, EndItems.makeEndItemSettings().rarity(Rarity.RARE));
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[EquipmentSlot.LEGS.getIndex()];
addAttributeModifier(
Attributes.MAX_HEALTH,

8
src/main/java/org/betterx/betterend/item/EndArmorItem.java
View file

@ -25,10 +25,10 @@ public class EndArmorItem extends ArmorItem implements ItemModelProvider {
protected final Multimap<Attribute, AttributeModifier> defaultModifiers;
public EndArmorItem(ArmorMaterial material, EquipmentSlot equipmentSlot, Properties settings) {
super(material, equipmentSlot, settings);
public EndArmorItem(ArmorMaterial material, Type type, Properties settings) {
super(material, type, settings);
this.defaultModifiers = HashMultimap.create();
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[equipmentSlot.getIndex()];
UUID uuid = ARMOR_MODIFIER_UUID_PER_SLOT[type.getSlot().getIndex()];
addAttributeModifier(
Attributes.ARMOR,
new AttributeModifier(uuid, "Armor modifier", getDefense(), AttributeModifier.Operation.ADDITION)
@ -52,7 +52,7 @@ public class EndArmorItem extends ArmorItem implements ItemModelProvider {
@Override
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot equipmentSlot) {
return equipmentSlot == slot ? defaultModifiers : super.getDefaultAttributeModifiers(equipmentSlot);
return equipmentSlot == type.getSlot() ? defaultModifiers : super.getDefaultAttributeModifiers(equipmentSlot);
}
protected void addAttributeModifier(Attribute attribute, AttributeModifier modifier) {

10
src/main/java/org/betterx/betterend/item/material/EndArmorMaterial.java
View file

@ -6,7 +6,7 @@ import org.betterx.betterend.registry.EndItems;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.util.LazyLoadedValue;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterial;
import net.minecraft.world.item.crafting.Ingredient;
@ -56,13 +56,13 @@ public enum EndArmorMaterial implements ArmorMaterial {
}
@Override
public int getDurabilityForSlot(EquipmentSlot slot) {
return BASE_DURABILITY[slot.getIndex()] * this.durabilityMultiplier;
public int getDurabilityForType(ArmorItem.Type type) {
return BASE_DURABILITY[type.getSlot().getIndex()] * this.durabilityMultiplier;
}
@Override
public int getDefenseForSlot(EquipmentSlot slot) {
return this.protectionAmounts[slot.getIndex()];
public int getDefenseForType(ArmorItem.Type type) {
return this.protectionAmounts[type.getSlot().getIndex()];
}
@Override