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

Changing model loading (WIP)

Browse source
This commit is contained in:
Aleksey 2021-05-22 19:14:52 +03:00
parent 4d2e3d7be6
commit 53c9525c2d
33 changed files with 435 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/betterend/client/models/BlockModelProvider.java
View file

@ -13,9 +13,9 @@ import ru.betterend.BetterEnd;
import static net.minecraft.client.resources.model.ModelBakery.MISSING_MODEL_LOCATION;
public interface BlockModelProvider extends ModelProvider {
default @Nullable UnbakedModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
default @Nullable BlockModel getBlockModel(ResourceLocation resourceLocation, BlockState blockState) {
Optional<String> pattern = Patterns.createBlockSimple(resourceLocation.getPath());
return pattern.map(BlockModel::fromString).orElse(null);
return ModelsHelper.fromPattern(pattern);
}
default UnbakedModel getModelVariant(ResourceLocation resourceLocation, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) {

7
src/main/java/ru/betterend/client/models/ModelProvider.java
View file

@ -9,11 +9,6 @@ public interface ModelProvider {
Optional<String> getModelString(String name);
default BlockModel getModel(ResourceLocation resourceLocation) {
return createItemModel(resourceLocation.getPath());
}
static BlockModel createItemModel(String name) {
Optional<String> pattern = Patterns.createItemGenerated("item/" + name);
return pattern.map(BlockModel::fromString).orElse(null);
return ModelsHelper.createItemModel(resourceLocation.getPath());
}
}

16
src/main/java/ru/betterend/client/models/ModelsHelper.java
View file

@ -23,14 +23,24 @@ import java.util.function.Function;
@Environment(EnvType.CLIENT)
public class ModelsHelper {
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
public static BlockModel fromPattern(Optional<String> pattern) {
return pattern.map(BlockModel::fromString).orElse(null);
}
public static BlockModel createItemModel(String name) {
Optional<String> pattern = Patterns.createItemGenerated("item/" + name);
return fromPattern(pattern);
}
public static BlockModel createBlockItem(ResourceLocation resourceLocation) {
Optional<String> pattern = Patterns.createJson(Patterns.ITEM_BLOCK, resourceLocation.getPath());
return pattern.map(BlockModel::fromString).orElse(null);
return fromPattern(pattern);
}
public static BlockModel createBlockEmpty(ResourceLocation resourceLocation) {
Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_EMPTY, resourceLocation.getPath());
return pattern.map(BlockModel::fromString).orElse(null);
return fromPattern(pattern);
}
public static MultiVariant createMultiVariant(ResourceLocation resourceLocation, Transformation transform, boolean uvLock) {
@ -116,7 +126,7 @@ public class ModelsHelper {
return this;
}
public void save() {
public void add() {
modelParts.add(this);
}
}