-
Notifications
You must be signed in to change notification settings - Fork 40
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Some base blocks renamed;
- Loading branch information
Showing
13 changed files
with
877 additions
and
869 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,91 @@ | ||
| package ru.bclib.blocks; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import com.google.common.collect.Maps; | ||
|
|
||
| import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; | ||
| import net.minecraft.client.renderer.block.model.BlockModel; | ||
| import net.minecraft.client.resources.model.UnbakedModel; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.level.block.AnvilBlock; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.block.Blocks; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.block.state.StateDefinition; | ||
| import net.minecraft.world.level.block.state.properties.IntegerProperty; | ||
| import net.minecraft.world.level.material.MaterialColor; | ||
| import net.minecraft.world.level.storage.loot.LootContext; | ||
| import ru.bclib.client.models.BasePatterns; | ||
| import ru.bclib.client.models.BlockModelProvider; | ||
| import ru.bclib.client.models.ModelsHelper; | ||
| import ru.bclib.client.models.PatternsHelper; | ||
|
|
||
| public class BaseAnvilBlock extends AnvilBlock implements BlockModelProvider { | ||
| private static final IntegerProperty DESTRUCTION = BlockProperties.DESTRUCTION; | ||
|
|
||
| public BaseAnvilBlock(MaterialColor color) { | ||
| super(FabricBlockSettings.copyOf(Blocks.ANVIL).materialColor(color)); | ||
| } | ||
|
|
||
| @Override | ||
| protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) { | ||
| super.createBlockStateDefinition(builder); | ||
| builder.add(getDestructionProperty()); | ||
| } | ||
|
|
||
| public IntegerProperty getDestructionProperty() { | ||
| return DESTRUCTION; | ||
| } | ||
|
|
||
| @Override | ||
| public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) { | ||
| ItemStack stack = new ItemStack(this); | ||
| int level = state.getValue(getDestructionProperty()); | ||
| stack.getOrCreateTag().putInt("level", level); | ||
| return Collections.singletonList(stack); | ||
| } | ||
|
|
||
| protected String getTop(ResourceLocation blockId, String block) { | ||
| if (block.contains("item")) { | ||
| return blockId.getPath() + "_top_0"; | ||
| } | ||
| char last = block.charAt(block.length() - 1); | ||
| return blockId.getPath() + "_top_" + last; | ||
| } | ||
|
|
||
| @Override | ||
| public BlockModel getItemModel(ResourceLocation blockId) { | ||
| return getBlockModel(blockId, defaultBlockState()); | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) { | ||
| IntegerProperty destructionProperty = getDestructionProperty(); | ||
| int destruction = blockState.getValue(destructionProperty); | ||
| String name = blockId.getPath(); | ||
| Map<String, String> textures = Maps.newHashMap(); | ||
| textures.put("%anvil%", name); | ||
| textures.put("%top%", name + "_top_" + destruction); | ||
| Optional<String> pattern = PatternsHelper.createJson(BasePatterns.BLOCK_ANVIL, textures); | ||
| return ModelsHelper.fromPattern(pattern); | ||
| } | ||
|
|
||
| @Override | ||
| public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) { | ||
| IntegerProperty destructionProperty = getDestructionProperty(); | ||
| int destruction = blockState.getValue(destructionProperty); | ||
| String modId = stateId.getNamespace(); | ||
| String modelId = "block/" + stateId.getPath() + "_top_" + destruction; | ||
| ResourceLocation modelLocation = new ResourceLocation(modId, modelId); | ||
| registerBlockModel(stateId, modelLocation, blockState, modelCache); | ||
| return ModelsHelper.createFacingModel(modelLocation, blockState.getValue(FACING), false, false); | ||
| } | ||
| } | ||
| package ru.bclib.blocks; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Optional; | ||
|
|
||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import com.google.common.collect.Maps; | ||
|
|
||
| import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; | ||
| import net.minecraft.client.renderer.block.model.BlockModel; | ||
| import net.minecraft.client.resources.model.UnbakedModel; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.level.block.AnvilBlock; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.block.Blocks; | ||
| import net.minecraft.world.level.block.state.BlockState; | ||
| import net.minecraft.world.level.block.state.StateDefinition; | ||
| import net.minecraft.world.level.block.state.properties.IntegerProperty; | ||
| import net.minecraft.world.level.material.MaterialColor; | ||
| import net.minecraft.world.level.storage.loot.LootContext; | ||
| import ru.bclib.client.models.BasePatterns; | ||
| import ru.bclib.client.models.BlockModelProvider; | ||
| import ru.bclib.client.models.ModelsHelper; | ||
| import ru.bclib.client.models.PatternsHelper; | ||
|
|
||
| public class BaseAnvilBlock extends AnvilBlock implements BlockModelProvider { | ||
| private static final IntegerProperty DESTRUCTION = BlockProperties.DESTRUCTION; | ||
|
|
||
| public BaseAnvilBlock(MaterialColor color) { | ||
| super(FabricBlockSettings.copyOf(Blocks.ANVIL).materialColor(color)); | ||
| } | ||
|
|
||
| @Override | ||
| protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) { | ||
| super.createBlockStateDefinition(builder); | ||
| builder.add(getDestructionProperty()); | ||
| } | ||
|
|
||
| public IntegerProperty getDestructionProperty() { | ||
| return DESTRUCTION; | ||
| } | ||
|
|
||
| @Override | ||
| public List<ItemStack> getDrops(BlockState state, LootContext.Builder builder) { | ||
| ItemStack stack = new ItemStack(this); | ||
| int level = state.getValue(getDestructionProperty()); | ||
| stack.getOrCreateTag().putInt("level", level); | ||
| return Collections.singletonList(stack); | ||
| } | ||
|
|
||
| protected String getTop(ResourceLocation blockId, String block) { | ||
| if (block.contains("item")) { | ||
| return blockId.getPath() + "_top_0"; | ||
| } | ||
| char last = block.charAt(block.length() - 1); | ||
| return blockId.getPath() + "_top_" + last; | ||
| } | ||
|
|
||
| @Override | ||
| public BlockModel getItemModel(ResourceLocation blockId) { | ||
| return getBlockModel(blockId, defaultBlockState()); | ||
| } | ||
|
|
||
| @Override | ||
| public @Nullable BlockModel getBlockModel(ResourceLocation blockId, BlockState blockState) { | ||
| IntegerProperty destructionProperty = getDestructionProperty(); | ||
| int destruction = blockState.getValue(destructionProperty); | ||
| String name = blockId.getPath(); | ||
| Map<String, String> textures = Maps.newHashMap(); | ||
| textures.put("%modid%", blockId.getNamespace()); | ||
| textures.put("%anvil%", name); | ||
| textures.put("%top%", name + "_top_" + destruction); | ||
| Optional<String> pattern = PatternsHelper.createJson(BasePatterns.BLOCK_ANVIL, textures); | ||
| return ModelsHelper.fromPattern(pattern); | ||
| } | ||
|
|
||
| @Override | ||
| public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map<ResourceLocation, UnbakedModel> modelCache) { | ||
| IntegerProperty destructionProperty = getDestructionProperty(); | ||
| int destruction = blockState.getValue(destructionProperty); | ||
| String modId = stateId.getNamespace(); | ||
| String modelId = "block/" + stateId.getPath() + "_top_" + destruction; | ||
| ResourceLocation modelLocation = new ResourceLocation(modId, modelId); | ||
| registerBlockModel(stateId, modelLocation, blockState, modelCache); | ||
| return ModelsHelper.createFacingModel(modelLocation, blockState.getValue(FACING), false, false); | ||
| } | ||
| } |
Oops, something went wrong.