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-21 16:42:46 +03:00
parent 2ece809541
commit d9c5f8e89c
4 changed files with 98 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/ru/betterend/blocks/basis/EndDoorBlock.java
View file

@ -97,35 +97,35 @@ public class EndDoorBlock extends DoorBlock implements IRenderTypeable, BlockMod
switch (facing) {
case EAST: {
if (hinge && open) {
rotation = BlockModelRotation.by(0, 90);
rotation = BlockModelRotation.X0_Y90;
} else if (open) {
rotation = BlockModelRotation.by(0, 270);
rotation = BlockModelRotation.X0_Y270;
}
break;
}
case SOUTH: {
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.by(0, 90);
rotation = BlockModelRotation.X0_Y90;
} else if (hinge) {
rotation = BlockModelRotation.by(0, 180);
rotation = BlockModelRotation.X0_Y180;
}
break;
}
case WEST: {
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.by(0, 180);
rotation = BlockModelRotation.X0_Y180;
} else if (hinge) {
rotation = BlockModelRotation.by(0, 270);
rotation = BlockModelRotation.X0_Y270;
} else {
rotation = BlockModelRotation.by(0, 90);
rotation = BlockModelRotation.X0_Y90;
}
break;
}
case NORTH: {
if (!hinge && !open || hinge && !open) {
rotation = BlockModelRotation.by(0, 270);
rotation = BlockModelRotation.X0_Y270;
} else if (!hinge) {
rotation = BlockModelRotation.by(0, 180);
rotation = BlockModelRotation.X0_Y180;
}
break;
}

18
src/main/java/ru/betterend/blocks/basis/EndFenceBlock.java
View file

@ -25,9 +25,12 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.storage.loot.LootContext;
import org.jetbrains.annotations.Nullable;
import ru.betterend.BetterEnd;
import ru.betterend.client.models.BlockModelProvider;
import ru.betterend.client.models.Patterns;
import static net.minecraft.client.resources.model.ModelBakery.MISSING_MODEL_LOCATION;
public class EndFenceBlock extends FenceBlock implements BlockModelProvider {
private final Block parent;
@ -63,11 +66,12 @@ public class EndFenceBlock extends FenceBlock implements BlockModelProvider {
@Override
public @Nullable UnbakedModel getBlockModel(ResourceLocation blockId, BlockState blockState) {
ResourceLocation postId = new ResourceLocation(blockId.getNamespace(),
"block/" + blockId.getPath() + "_post");
ResourceLocation sideId = new ResourceLocation(blockId.getNamespace(),
"block/" + blockId.getPath() + "_side");
ResourceLocation thisId = Registry.BLOCK.getKey(this);
ResourceLocation parentId = Registry.BLOCK.getKey(parent);
ResourceLocation postId = new ResourceLocation(thisId.getNamespace(),
"block/" + thisId.getPath() + "_post");
ResourceLocation sideId = new ResourceLocation(thisId.getNamespace(),
"block/" + thisId.getPath() + "_side");
if (blockId.equals(postId)) {
Optional<String> pattern = Patterns.createJson(Patterns.BLOCK_FENCE_POST, parentId.getPath(), blockId.getPath());
return pattern.map(BlockModel::fromString).orElse(null);
@ -85,10 +89,9 @@ public class EndFenceBlock extends FenceBlock implements BlockModelProvider {
"block/" + blockId.getPath() + "_post");
ResourceLocation sideId = new ResourceLocation(blockId.getNamespace(),
"block/" + blockId.getPath() + "_side");
registerBlockModel(blockId, postId, blockState, modelCache);
registerBlockModel(blockId, sideId, blockState, modelCache);
registerBlockModel(postId, postId, blockState, modelCache);
registerBlockModel(sideId, sideId, blockState, modelCache);
StateDefinition<Block, BlockState> blockStateDefinition = getStateDefinition();
MultiVariant postVariant = new MultiVariant(Lists.newArrayList(
new Variant(postId, Transformation.identity(), false, 1)));
MultiVariant sideNorth = new MultiVariant(Lists.newArrayList(
@ -99,6 +102,7 @@ public class EndFenceBlock extends FenceBlock implements BlockModelProvider {
new Variant(sideId, BlockModelRotation.X0_Y180.getRotation(), true, 1)));
MultiVariant sideWest = new MultiVariant(Lists.newArrayList(
new Variant(sideId, BlockModelRotation.X0_Y270.getRotation(), true, 1)));
StateDefinition<Block, BlockState> blockStateDefinition = getStateDefinition();
return new MultiPart(blockStateDefinition, Lists.newArrayList(
new Selector(Condition.TRUE, postVariant),
new Selector(stateDefinition -> state -> state.getValue(NORTH), sideNorth),