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

Armored Elytra textures and fixes

Browse source
This commit is contained in:
Aleksey 2021-05-03 23:06:13 +03:00
parent a21d50e00a
commit 61b5890299
7 changed files with 38 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
package ru.betterend.item;
import net.fabricmc.fabric.api.item.v1.EquipmentSlotProvider;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.EquipmentSlot;
@ -14,15 +15,17 @@ import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndItems;
public class ArmoredElytra extends ElytraItem implements EquipmentSlotProvider, BreakableItem, Patterned {
public class ArmoredElytra extends ElytraItem implements BreakableItem {
private final ResourceLocation wingTexture;
private final Item repairItem;
private final double movementFactor;
public ArmoredElytra(String name, Item repairItem, int durability, double movementFactor, boolean fireproof) {
super(fireproof ? EndItems.makeItemSettings().durability(durability).rarity(Rarity.RARE).fireResistant() :
EndItems.makeItemSettings().durability(durability).rarity(Rarity.RARE));
super(fireproof ? EndItems.makeItemSettings().equipmentSlot(stack -> EquipmentSlot.CHEST)
.durability(durability).rarity(Rarity.RARE).fireResistant() :
EndItems.makeItemSettings().equipmentSlot(stack -> EquipmentSlot.CHEST)
.durability(durability).rarity(Rarity.RARE));
this.wingTexture = BetterEnd.makeID("textures/entity/" + name + ".png");
this.repairItem = repairItem;
this.movementFactor = movementFactor;
@ -46,14 +49,4 @@ public class ArmoredElytra extends ElytraItem implements EquipmentSlotProvider,
FabricModelPredicateProviderRegistry.register(this, new ResourceLocation("broken"),
(itemStack, clientLevel, livingEntity) -> ElytraItem.isFlyEnabled(itemStack) ? 0.0F : 1.0F);
}
@Override
public String getModelPattern(String name) {
return Patterns.createItemGenerated(name);
}
@Override
public EquipmentSlot getPreferredEquipmentSlot(ItemStack stack) {
return EquipmentSlot.CHEST;
}
}

45
src/main/java/ru/betterend/registry/EndItems.java
View file

@ -1,9 +1,7 @@
package ru.betterend.registry;
import java.util.List;
import com.google.common.collect.Lists;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
import net.minecraft.core.BlockSource;
import net.minecraft.core.Direction;
@ -19,41 +17,20 @@ import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.MobSpawnType;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.food.Foods;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Item.Properties;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.ShovelItem;
import net.minecraft.world.item.SpawnEggItem;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.TieredItem;
import net.minecraft.world.item.Tiers;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.DispenserBlock;
import ru.betterend.BetterEnd;
import ru.betterend.config.Configs;
import ru.betterend.interfaces.BreakableItem;
import ru.betterend.item.ArmoredElytra;
import ru.betterend.item.DrinkItem;
import ru.betterend.item.EnchantedPetalItem;
import ru.betterend.item.EndArmorItem;
import ru.betterend.item.EndBucketItem;
import ru.betterend.item.EndSpawnEggItem;
import ru.betterend.item.EternalCrystalItem;
import ru.betterend.item.PatternedDiscItem;
import ru.betterend.item.PatternedItem;
import ru.betterend.item.*;
import ru.betterend.item.material.EndArmorMaterial;
import ru.betterend.item.material.EndToolMaterial;
import ru.betterend.item.tool.EndAxeItem;
import ru.betterend.item.tool.EndHammerItem;
import ru.betterend.item.tool.EndHoeItem;
import ru.betterend.item.tool.EndPickaxeItem;
import ru.betterend.item.tool.EndShovelItem;
import ru.betterend.item.tool.EndSwordItem;
import ru.betterend.item.tool.*;
import ru.betterend.tab.CreativeTabs;
import ru.betterend.util.TagHelper;
import java.util.List;
public class EndItems {
private static final List<Item> MOD_BLOCKS = Lists.newArrayList();
private static final List<Item> MOD_ITEMS = Lists.newArrayList();
@ -245,12 +222,14 @@ public class EndItems {
return registerDrink(name, builder.build());
}
public static Properties makeItemSettings() {
return new Item.Properties().tab(CreativeTabs.TAB_ITEMS);
public static FabricItemSettings makeItemSettings() {
FabricItemSettings properties = new FabricItemSettings();
return (FabricItemSettings) properties.tab(CreativeTabs.TAB_ITEMS);
}
public static Properties makeBlockItemSettings() {
return new Item.Properties().tab(CreativeTabs.TAB_BLOCKS);
public static FabricItemSettings makeBlockItemSettings() {
FabricItemSettings properties = new FabricItemSettings();
return (FabricItemSettings) properties.tab(CreativeTabs.TAB_BLOCKS);
}
public static void register() {}