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

Change models loading (WIP)

Browse source
This commit is contained in:
Aleksey 2021-05-16 12:19:18 +03:00
parent f2e2132bb0
commit f5c91c3aad
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/blocks/basis/FeatureSaplingBlock.java
View file

@ -28,11 +28,11 @@ import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraft.world.phys.shapes.VoxelShape;
import ru.betterend.client.render.ERenderLayer; import ru.betterend.client.render.ERenderLayer;
import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.interfaces.IRenderTypeable;
import ru.betterend.patterns.BlockPatterned; import ru.betterend.patterns.BlockModelProvider;
import ru.betterend.patterns.Patterns; import ru.betterend.patterns.Patterns;
import ru.betterend.registry.EndTags; import ru.betterend.registry.EndTags;
public abstract class FeatureSaplingBlock extends SaplingBlock implements IRenderTypeable, BlockPatterned { public abstract class FeatureSaplingBlock extends SaplingBlock implements IRenderTypeable, BlockModelProvider {
private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12); private static final VoxelShape SHAPE = Block.box(4, 0, 4, 12, 14, 12);
public FeatureSaplingBlock() { public FeatureSaplingBlock() {

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

@ -8,12 +8,12 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterial; import net.minecraft.world.item.ArmorMaterial;
import ru.betterend.patterns.Patterned; import ru.betterend.patterns.ModelProvider;
import ru.betterend.patterns.Patterns; import ru.betterend.patterns.Patterns;
import java.util.UUID; import java.util.UUID;
public class EndArmorItem extends ArmorItem implements Patterned { public class EndArmorItem extends ArmorItem implements ModelProvider {
protected static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] { protected static final UUID[] ARMOR_MODIFIER_UUID_PER_SLOT = new UUID[] {
UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"), UUID.fromString("845DB27C-C624-495F-8C9F-6020A9A58B6B"),
@ -48,7 +48,7 @@ public class EndArmorItem extends ArmorItem implements Patterned {
} }
@Override @Override
public String getModelPattern(String name) { public String getModelString(String name) {
return Patterns.createItemGenerated(name); return Patterns.createItemGenerated(name);
} }
} }

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

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

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

@ -132,11 +132,11 @@ public class EndItems {
public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F); public final static Item UMBRELLA_CLUSTER_JUICE = registerDrink("umbrella_cluster_juice", 5, 0.7F);
public static Item registerDisc(String name, int power, SoundEvent sound) { public static Item registerDisc(String name, int power, SoundEvent sound) {
return registerItem(BetterEnd.makeID(name), new PatternedDiscItem(power, sound, makeItemSettings())); return registerItem(BetterEnd.makeID(name), new ModelProviderDiscItem(power, sound, makeItemSettings()));
} }
public static Item registerItem(String name) { public static Item registerItem(String name) {
return registerItem(BetterEnd.makeID(name), new PatternedItem(makeItemSettings())); return registerItem(BetterEnd.makeID(name), new ModelProviderItem(makeItemSettings()));
} }
public static Item registerItem(String name, Item item) { public static Item registerItem(String name, Item item) {
@ -222,7 +222,7 @@ public class EndItems {
} }
public static Item registerFood(String name, FoodProperties foodComponent) { public static Item registerFood(String name, FoodProperties foodComponent) {
return registerItem(name, new PatternedItem(makeItemSettings().food(foodComponent))); return registerItem(name, new ModelProviderItem(makeItemSettings().food(foodComponent)));
} }
public static Item registerDrink(String name) { public static Item registerDrink(String name) {