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

Change loading models (WIP)

Browse source
This commit is contained in:
Aleksey 2021-05-14 16:46:26 +03:00
parent 1e6451e375
commit 6447ec6026
56 changed files with 196 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,11 +10,11 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Rarity;
import ru.betterend.BetterEnd;
import ru.betterend.interfaces.BreakableItem;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
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 EquipmentSlotProvider, BreakableItem, ModelProvider {
private final ResourceLocation wingTexture;
private final Item repairItem;

2
src/main/java/ru/betterend/item/DrinkItem.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.item.UseAnim;
import net.minecraft.world.level.Level;
public class DrinkItem extends PatternedItem {
public class DrinkItem extends ModelProviderItem {
public DrinkItem(Properties settings) {
super(settings);
}

2
src/main/java/ru/betterend/item/EnchantedPetalItem.java
View file

@ -5,7 +5,7 @@ import net.minecraft.world.item.Rarity;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndItems;
public class EnchantedPetalItem extends PatternedItem {
public class EnchantedPetalItem extends ModelProviderItem {
public EnchantedPetalItem() {
super(EndItems.makeItemSettings().rarity(Rarity.RARE).stacksTo(16));
}

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

@ -13,10 +13,10 @@ 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.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndArmorItem extends ArmorItem implements Patterned {
public class EndArmorItem extends ArmorItem implements ModelProvider {
public EndArmorItem(ArmorMaterial material, EquipmentSlot slot, Item.Properties settings) {
super(material, slot, settings);

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

@ -2,11 +2,11 @@ package ru.betterend.item;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.level.material.Fluids;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndItems;
public class EndBucketItem extends BucketItem implements Patterned {
public class EndBucketItem extends BucketItem implements ModelProvider {
public EndBucketItem() {
super(Fluids.WATER, EndItems.makeItemSettings().stacksTo(1));
}

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

@ -2,10 +2,10 @@ package ru.betterend.item;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.SpawnEggItem;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndSpawnEggItem extends SpawnEggItem implements Patterned {
public class EndSpawnEggItem extends SpawnEggItem implements ModelProvider {
public EndSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Properties settings) {
super(type, primaryColor, secondaryColor, settings);
}

2
src/main/java/ru/betterend/item/EternalCrystalItem.java
View file

@ -3,7 +3,7 @@ package ru.betterend.item;
import net.minecraft.world.item.Rarity;
import ru.betterend.registry.EndItems;
public class EternalCrystalItem extends PatternedItem {
public class EternalCrystalItem extends ModelProviderItem {
public EternalCrystalItem() {
super(EndItems.makeItemSettings().stacksTo(16).rarity(Rarity.EPIC));
}

2
src/main/java/ru/betterend/item/GuideBookItem.java
View file

@ -18,7 +18,7 @@ import ru.betterend.registry.EndItems;
import ru.betterend.util.LangUtil;
import vazkii.patchouli.api.PatchouliAPI;
public class GuideBookItem extends PatternedItem {
public class GuideBookItem extends ModelProviderItem {
public final static ResourceLocation BOOK_ID = BetterEnd.makeID("guidebook");
public static final Item GUIDE_BOOK = EndItems.registerItem(BOOK_ID, new GuideBookItem());

23
src/main/java/ru/betterend/item/ModelProviderDiscItem.java Normal file
View file

@ -0,0 +1,23 @@
package ru.betterend.item;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.RecordItem;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class ModelProviderDiscItem extends RecordItem implements ModelProvider {
public ModelProviderDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {
super(comparatorOutput, sound, settings);
}
@Override
public String getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);
}
@Override
public BlockModel getModel() {
return null;
}
}

22
src/main/java/ru/betterend/item/ModelProviderItem.java Normal file
View file

@ -0,0 +1,22 @@
package ru.betterend.item;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.world.item.Item;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class ModelProviderItem extends Item implements ModelProvider {
public ModelProviderItem(Properties settings) {
super(settings);
}
@Override
public String getModelString(String name) {
return Patterns.createItemGenerated(name);
}
@Override
public BlockModel getModel() {
return null;
}
}

17
src/main/java/ru/betterend/item/PatternedDiscItem.java
View file

@ -1,17 +0,0 @@
package ru.betterend.item;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.world.item.RecordItem;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class PatternedDiscItem extends RecordItem implements Patterned {
public PatternedDiscItem(int comparatorOutput, SoundEvent sound, Properties settings) {
super(comparatorOutput, sound, settings);
}
@Override
public String getModelString(String name) {
return Patterns.createJson(Patterns.ITEM_GENERATED, name);
}
}

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

@ -1,16 +0,0 @@
package ru.betterend.item;
import net.minecraft.world.item.Item;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.Patterns;
public class PatternedItem extends Item implements Patterned {
public PatternedItem(Properties settings) {
super(settings);
}
@Override
public String getModelString(String name) {
return Patterns.createItemGenerated(name);
}
}

4
src/main/java/ru/betterend/item/tool/EndAxeItem.java
View file

@ -9,10 +9,10 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Tier;
import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndAxeItem extends AxeItem implements DynamicAttributeTool, Patterned {
public class EndAxeItem extends AxeItem implements DynamicAttributeTool, ModelProvider {
public EndAxeItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}

4
src/main/java/ru/betterend/item/tool/EndHammerItem.java
View file

@ -26,11 +26,11 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndTags;
public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, Patterned {
public class EndHammerItem extends DiggerItem implements DynamicAttributeTool, ModelProvider {
public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = Mth.createInsecureUUID(ThreadLocalRandom.current());
private final Multimap<Attribute, AttributeModifier> attributeModifiers;

4
src/main/java/ru/betterend/item/tool/EndHoeItem.java
View file

@ -2,10 +2,10 @@ package ru.betterend.item.tool;
import net.minecraft.world.item.HoeItem;
import net.minecraft.world.item.Tier;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndHoeItem extends HoeItem implements Patterned {
public class EndHoeItem extends HoeItem implements ModelProvider {
public EndHoeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}

4
src/main/java/ru/betterend/item/tool/EndPickaxeItem.java
View file

@ -12,10 +12,10 @@ import net.minecraft.world.item.PickaxeItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, Patterned {
public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, ModelProvider {
public EndPickaxeItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}

4
src/main/java/ru/betterend/item/tool/EndShovelItem.java
View file

@ -11,10 +11,10 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ShovelItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.level.block.state.BlockState;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndShovelItem extends ShovelItem implements DynamicAttributeTool, Patterned {
public class EndShovelItem extends ShovelItem implements DynamicAttributeTool, ModelProvider {
public EndShovelItem(Tier material, float attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}

4
src/main/java/ru/betterend/item/tool/EndSwordItem.java
View file

@ -3,10 +3,10 @@ package ru.betterend.item.tool;
import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.Tier;
import ru.betterend.patterns.Patterned;
import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns;
public class EndSwordItem extends SwordItem implements DynamicAttributeTool, Patterned {
public class EndSwordItem extends SwordItem implements DynamicAttributeTool, ModelProvider {
public EndSwordItem(Tier material, int attackDamage, float attackSpeed, Properties settings) {
super(material, attackDamage, attackSpeed, settings);
}