Try custom slab model. Json patterns.

This commit is contained in:
Aleksey 2020-10-11 20:17:08 +03:00
parent 287c1fce62
commit 59fe3183b0
60 changed files with 1557 additions and 144 deletions

View file

@ -18,6 +18,7 @@ import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
@ -30,13 +31,12 @@ import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.client.util.math.AffineTransformation;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockRenderView;
import ru.betterend.BetterEnd;
public class BaseBlockModel implements UnbakedModel, BakedModel, FabricBakedModel {
@ -70,15 +70,9 @@ public class BaseBlockModel implements UnbakedModel, BakedModel, FabricBakedMode
MeshBuilder builder = renderer.meshBuilder();
QuadEmitter emitter = builder.getEmitter();
Vector3f rotation = AffineTransformation.getLinearTransformationAndTranslationFromAffine(rotationContainer.getRotation().getMatrix()).getSecond();
System.out.println("=====");
System.out.println(rotation);
Direction[] directions = Direction.values();
for (Direction direction : directions) {
Direction rotate = Direction.transform(rotationContainer.getRotation().getMatrix(), direction);
this.rotate(emitter, direction, rotate);
emitter.square(direction, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
switch (sprites.length) {
case 1: {
emitter.spriteBake(0, sprites[0], MutableQuadView.BAKE_LOCK_UV);
@ -160,138 +154,7 @@ public class BaseBlockModel implements UnbakedModel, BakedModel, FabricBakedMode
return this;
}
private void rotate(QuadEmitter emitter, Direction direction, Direction rotation) {
switch (direction) {
case NORTH: {
switch (rotation) {
case DOWN:
case SOUTH: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
case EAST: {
emitter.square(rotation, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f);
break;
}
case WEST: {
emitter.square(rotation, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
case SOUTH: {
switch (rotation) {
case DOWN:
case NORTH: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
case EAST: {
emitter.square(rotation, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f);
break;
}
case WEST: {
emitter.square(rotation, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
case EAST: {
switch (rotation) {
case NORTH: {
emitter.square(rotation, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f);
break;
}
case SOUTH: {
emitter.square(rotation, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f);
break;
}
case DOWN:
case WEST: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
case WEST: {
switch (rotation) {
case NORTH: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
break;
}
case SOUTH: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
break;
}
case DOWN:
case EAST: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
case DOWN: {
switch (rotation) {
case EAST: {
emitter.square(rotation, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f);
break;
}
case WEST: {
emitter.square(rotation, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f);
break;
}
case SOUTH:
case UP: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
case UP: {
switch (rotation) {
case EAST: {
emitter.square(rotation, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f);
break;
}
case WEST: {
emitter.square(rotation, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f);
break;
}
case SOUTH:
case DOWN: {
emitter.square(rotation, 1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
break;
}
default: {
emitter.square(rotation, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
}
}
break;
}
}
}
@Override
@Override
public boolean isVanillaAdapter() {
return false;
}

View file

@ -17,7 +17,9 @@ public class EndModelProvider implements ModelResourceProvider {
private static final Map<Identifier, UnbakedModel> MODELS;
public static final UnbakedModel BASE_BLOCK_MODEL = new BaseBlockModel("block/flavolite");
public static final UnbakedModel FLAVOLITE_BLOCK = new BaseBlockModel("block/flavolite");
public static final UnbakedModel FLAVOLITE_SLAB = new SlabModel("block/flavolite");
public static final UnbakedModel FLAVOLITE_SLAB_TOP = new SlabTopModel("block/flavolite");
public static void registerModel(String path, UnbakedModel model) {
MODELS.put(BetterEnd.makeID(path), model);
@ -34,7 +36,10 @@ public class EndModelProvider implements ModelResourceProvider {
static {
MODELS = Maps.newHashMap();
registerModel("block/flavolite", BASE_BLOCK_MODEL);
registerModel("item/flavolite", BASE_BLOCK_MODEL);
registerModel("item/flavolite", FLAVOLITE_BLOCK);
registerModel("block/flavolite", FLAVOLITE_BLOCK);
registerModel("item/flavolite_slab", FLAVOLITE_SLAB);
registerModel("block/flavolite_slab", FLAVOLITE_SLAB);
registerModel("block/flavolite_slab_top", FLAVOLITE_SLAB_TOP);
}
}

View file

@ -0,0 +1,240 @@
package ru.betterend.blocks.model;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import com.mojang.datafixers.util.Pair;
import net.fabricmc.fabric.api.renderer.v1.Renderer;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder;
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ModelBakeSettings;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.UnbakedModel;
import net.minecraft.client.render.model.json.JsonUnbakedModel;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockRenderView;
import ru.betterend.BetterEnd;
public class SlabModel implements UnbakedModel, BakedModel, FabricBakedModel {
private static final Identifier DEFAULT_SLAB_MODEL = new Identifier("minecraft:block/slab");
private final SpriteIdentifier[] spritesIDs;
private final Sprite[] sprites;
private ModelTransformation transformation;
private Mesh mesh;
public SlabModel(String... textures) {
this.spritesIDs = new SpriteIdentifier[textures.length];
this.sprites = new Sprite[textures.length];
for (int i = 0; i < textures.length; i++) {
this.spritesIDs[i] = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, BetterEnd.makeID(textures[i]));
}
}
@Override
public BakedModel bake(ModelLoader loader, Function<SpriteIdentifier, Sprite> textureGetter,
ModelBakeSettings rotationContainer, Identifier modelId) {
for(int i = 0; i < sprites.length; i++) {
this.sprites[i] = textureGetter.apply(spritesIDs[i]);
}
JsonUnbakedModel jsonBlockModel = (JsonUnbakedModel) loader.getOrLoadModel(DEFAULT_SLAB_MODEL);
this.transformation = jsonBlockModel.getTransformations();
Renderer renderer = RendererAccess.INSTANCE.getRenderer();
MeshBuilder builder = renderer.meshBuilder();
QuadEmitter emitter = builder.getEmitter();
for (Direction direction : Direction.values()) {
switch (sprites.length) {
case 1: {
this.buildFace(emitter, direction, sprites[0]);
break;
}
case 2: {
switch (direction) {
case DOWN:
case UP: {
this.buildFace(emitter, direction, sprites[0]);
break;
}
default: {
this.buildFace(emitter, direction, sprites[1]);
}
}
}
case 3: {
switch (direction) {
case DOWN:
case UP: {
this.buildFace(emitter, direction, sprites[0]);
break;
}
case NORTH:
case SOUTH: {
this.buildFace(emitter, direction, sprites[1]);
break;
}
default: {
this.buildFace(emitter, direction, sprites[2]);
}
}
}
case 4: {
switch (direction) {
case DOWN:
case UP: {
this.buildFace(emitter, direction, sprites[0]);
break;
}
case NORTH: {
this.buildFace(emitter, direction, sprites[1]);
break;
}
case SOUTH: {
this.buildFace(emitter, direction, sprites[2]);
break;
}
default: {
this.buildFace(emitter, direction, sprites[3]);
}
}
}
case 5: {
switch (direction) {
case DOWN:
case UP:
case NORTH:
case SOUTH: {
this.buildFace(emitter, direction, sprites[direction.ordinal()]);
break;
}
default: {
this.buildFace(emitter, direction, sprites[4]);
}
}
}
default: {
this.buildFace(emitter, direction, sprites[direction.ordinal()]);
}
}
emitter.spriteColor(0, -1, -1, -1, -1);
emitter.emit();
}
this.mesh = builder.build();
return this;
}
private void buildFace(QuadEmitter emitter, Direction direction, Sprite sprite) {
switch(direction) {
case DOWN: {
emitter.square(direction, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
emitter.cullFace(direction);
break;
}
case UP: {
emitter.square(direction, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f);
break;
}
default: {
emitter.square(direction, 0.0f, 0.0f, 1.0f, 0.5f, 0.0f);
emitter.cullFace(direction);
}
}
emitter.spriteBake(0, sprite, MutableQuadView.BAKE_LOCK_UV);
}
@Override
public boolean isVanillaAdapter() {
return false;
}
@Override
public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos,
Supplier<Random> randomSupplier, RenderContext context) {
context.meshConsumer().accept(mesh);
}
@Override
public void emitItemQuads(ItemStack stack, Supplier<Random> randomSupplier, RenderContext context) {
context.meshConsumer().accept(mesh);
}
@Override
public List<BakedQuad> getQuads(BlockState state, Direction face, Random random) {
return null;
}
@Override
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean hasDepth() {
return false;
}
@Override
public boolean isSideLit() {
return true;
}
@Override
public boolean isBuiltin() {
return false;
}
@Override
public Sprite getSprite() {
return this.sprites[0];
}
@Override
public ModelTransformation getTransformation() {
return this.transformation;
}
@Override
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
@Override
public Collection<Identifier> getModelDependencies() {
return Arrays.asList(DEFAULT_SLAB_MODEL);
}
@Override
public Collection<SpriteIdentifier> getTextureDependencies(Function<Identifier, UnbakedModel> unbakedModelGetter,
Set<Pair<String, String>> unresolvedTextureReferences) {
return Arrays.asList(spritesIDs);
}
}

View file

@ -0,0 +1,241 @@
package ru.betterend.blocks.model;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Random;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Supplier;
import com.mojang.datafixers.util.Pair;
import net.fabricmc.fabric.api.renderer.v1.Renderer;
import net.fabricmc.fabric.api.renderer.v1.RendererAccess;
import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh;
import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder;
import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView;
import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter;
import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
import net.fabricmc.fabric.api.renderer.v1.render.RenderContext;
import net.minecraft.block.BlockState;
import net.minecraft.client.render.model.BakedModel;
import net.minecraft.client.render.model.BakedQuad;
import net.minecraft.client.render.model.ModelBakeSettings;
import net.minecraft.client.render.model.ModelLoader;
import net.minecraft.client.render.model.UnbakedModel;
import net.minecraft.client.render.model.json.JsonUnbakedModel;
import net.minecraft.client.render.model.json.ModelOverrideList;
import net.minecraft.client.render.model.json.ModelTransformation;
import net.minecraft.client.texture.Sprite;
import net.minecraft.client.texture.SpriteAtlasTexture;
import net.minecraft.client.util.SpriteIdentifier;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockRenderView;
import ru.betterend.BetterEnd;
public class SlabTopModel implements UnbakedModel, BakedModel, FabricBakedModel {
private static final Identifier DEFAULT_MODEL = new Identifier("minecraft:block/slab_top");
private final SpriteIdentifier[] spritesIDs;
private final Sprite[] sprites;
private ModelTransformation transformation;
private Mesh mesh;
public SlabTopModel(String... textures) {
this.spritesIDs = new SpriteIdentifier[textures.length];
this.sprites = new Sprite[textures.length];
for (int i = 0; i < textures.length; i++) {
this.spritesIDs[i] = new SpriteIdentifier(SpriteAtlasTexture.BLOCK_ATLAS_TEXTURE, BetterEnd.makeID(textures[i]));
}
}
@Override
public BakedModel bake(ModelLoader loader, Function<SpriteIdentifier, Sprite> textureGetter,
ModelBakeSettings rotationContainer, Identifier modelId) {
for(int i = 0; i < sprites.length; i++) {
this.sprites[i] = textureGetter.apply(spritesIDs[i]);
}
JsonUnbakedModel jsonBlockModel = (JsonUnbakedModel) loader.getOrLoadModel(DEFAULT_MODEL);
this.transformation = jsonBlockModel.getTransformations();
Renderer renderer = RendererAccess.INSTANCE.getRenderer();
MeshBuilder builder = renderer.meshBuilder();
QuadEmitter emitter = builder.getEmitter();
Direction[] directions = Direction.values();
for (Direction direction : directions) {
switch (sprites.length) {
case 1: {
this.buildModel(emitter, direction, sprites[0]);
break;
}
case 2: {
switch (direction) {
case DOWN:
case UP: {
this.buildModel(emitter, direction, sprites[0]);
break;
}
default: {
this.buildModel(emitter, direction, sprites[1]);
}
}
}
case 3: {
switch (direction) {
case DOWN:
case UP: {
this.buildModel(emitter, direction, sprites[0]);
break;
}
case NORTH:
case SOUTH: {
this.buildModel(emitter, direction, sprites[1]);
break;
}
default: {
this.buildModel(emitter, direction, sprites[2]);
}
}
}
case 4: {
switch (direction) {
case DOWN:
case UP: {
this.buildModel(emitter, direction, sprites[0]);
break;
}
case NORTH: {
this.buildModel(emitter, direction, sprites[1]);
break;
}
case SOUTH: {
this.buildModel(emitter, direction, sprites[2]);
break;
}
default: {
this.buildModel(emitter, direction, sprites[3]);
}
}
}
case 5: {
switch (direction) {
case DOWN:
case UP:
case NORTH:
case SOUTH: {
this.buildModel(emitter, direction, sprites[direction.ordinal()]);
break;
}
default: {
this.buildModel(emitter, direction, sprites[4]);
}
}
}
default: {
this.buildModel(emitter, direction, sprites[direction.ordinal()]);
}
}
emitter.spriteColor(0, -1, -1, -1, -1);
emitter.emit();
}
this.mesh = builder.build();
return this;
}
private void buildModel(QuadEmitter emitter, Direction direction, Sprite sprite) {
switch(direction) {
case DOWN: {
emitter.square(direction, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f);
break;
}
case UP: {
emitter.square(direction, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f);
emitter.cullFace(direction);
break;
}
default: {
emitter.square(direction, 0.0f, 0.5f, 1.0f, 1.0f, 0.0f);
emitter.cullFace(direction);
}
}
emitter.spriteBake(0, sprite, MutableQuadView.BAKE_LOCK_UV);
}
@Override
public boolean isVanillaAdapter() {
return false;
}
@Override
public void emitBlockQuads(BlockRenderView blockView, BlockState state, BlockPos pos,
Supplier<Random> randomSupplier, RenderContext context) {
context.meshConsumer().accept(mesh);
}
@Override
public void emitItemQuads(ItemStack stack, Supplier<Random> randomSupplier, RenderContext context) {
context.meshConsumer().accept(mesh);
}
@Override
public List<BakedQuad> getQuads(BlockState state, Direction face, Random random) {
return null;
}
@Override
public boolean useAmbientOcclusion() {
return false;
}
@Override
public boolean hasDepth() {
return false;
}
@Override
public boolean isSideLit() {
return true;
}
@Override
public boolean isBuiltin() {
return false;
}
@Override
public Sprite getSprite() {
return this.sprites[0];
}
@Override
public ModelTransformation getTransformation() {
return this.transformation;
}
@Override
public ModelOverrideList getOverrides() {
return ModelOverrideList.EMPTY;
}
@Override
public Collection<Identifier> getModelDependencies() {
return Arrays.asList(DEFAULT_MODEL);
}
@Override
public Collection<SpriteIdentifier> getTextureDependencies(Function<Identifier, UnbakedModel> unbakedModelGetter,
Set<Pair<String, String>> unresolvedTextureReferences) {
return Arrays.asList(spritesIDs);
}
}

View file

@ -30,6 +30,7 @@ import ru.betterend.blocks.EndStoneSmelter;
import ru.betterend.blocks.EnderBlock;
import ru.betterend.blocks.TerminiteBlock;
import ru.betterend.blocks.basis.BlockGlowingFur;
import ru.betterend.blocks.basis.BlockSlab;
import ru.betterend.blocks.basis.BlockVine;
import ru.betterend.blocks.complex.WoodenMaterial;
import ru.betterend.tab.CreativeTab;
@ -48,6 +49,7 @@ public class BlockRegistry {
// Rocks //
public static final Block FLAVOLITE = registerBlock("flavolite", new BlockStone(MaterialColor.SAND));
public static final Block FLAVOLITE_SLAB = registerBlock("flavolite_slab", new BlockSlab(FLAVOLITE));
// Wooden Materials //
public static final Block MOSSY_GLOWSHROOM_SAPLING = registerBlock("mossy_glowshroom_sapling", new BlockMossyGlowshroomSapling());