From 61d4a33cf6d53df30660feeaa4b13e0c07ba931f Mon Sep 17 00:00:00 2001 From: Aleksey Date: Thu, 10 Jun 2021 22:04:17 +0300 Subject: [PATCH] EndAnvilBlock extends BaseAnvilBlock (BCLib) --- .../betterend/blocks/basis/EndAnvilBlock.java | 86 +------------------ 1 file changed, 4 insertions(+), 82 deletions(-) diff --git a/src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java b/src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java index ba2bbdd3..0b31d849 100644 --- a/src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java +++ b/src/main/java/ru/betterend/blocks/basis/EndAnvilBlock.java @@ -1,96 +1,18 @@ package ru.betterend.blocks.basis; -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.BlockModelProvider; -import ru.bclib.client.models.ModelsHelper; -import ru.betterend.blocks.BlockProperties; -import ru.betterend.client.models.Patterns; +import ru.bclib.blocks.BaseAnvilBlock; + +public class EndAnvilBlock extends BaseAnvilBlock { -public class EndAnvilBlock extends AnvilBlock implements BlockModelProvider { - private static final IntegerProperty DESTRUCTION = BlockProperties.DESTRUCTION; protected final int level; public EndAnvilBlock(MaterialColor color, int level) { - super(FabricBlockSettings.copyOf(Blocks.ANVIL).materialColor(color)); + super(color); this.level = level; } - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(getDestructionProperty()); - } - - public IntegerProperty getDestructionProperty() { - return DESTRUCTION; - } - public int getCraftingLevel() { return level; } - - @Override - public List 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 textures = Maps.newHashMap(); - textures.put("%anvil%", name); - textures.put("%top%", name + "_top_" + destruction); - Optional pattern = Patterns.createJson(Patterns.BLOCK_ANVIL, textures); - return ModelsHelper.fromPattern(pattern); - } - - @Override - public UnbakedModel getModelVariant(ResourceLocation stateId, BlockState blockState, Map 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); - } }