Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

添加重质铁块相关方块 #781

Merged
merged 4 commits into from
May 25, 2024
Merged

添加重质铁块相关方块 #781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3949a2
添加重质铁梁
wdfaESfaef May 23, 2024
ec997a5
Merge branch 'refs/heads/releases/1.20.1' into heavy-iron
wdfaESfaef May 24, 2024
e101f78
添加重质铁相关方块
wdfaESfaef May 24, 2024
ea511ef
添加配方
wdfaESfaef May 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/block/HeavyIronBeamBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package dev.dubhe.anvilcraft.block;

import dev.dubhe.anvilcraft.api.hammer.IHammerChangeableBlock;
import dev.dubhe.anvilcraft.api.hammer.IHammerRemovable;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.HorizontalDirectionalBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.DirectionProperty;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable;

import javax.annotation.Nonnull;

public class HeavyIronBeamBlock extends Block implements IHammerRemovable, IHammerChangeableBlock {

public static final VoxelShape AABB_X =
Shapes.join(Block.box(0, 12, 0, 16, 16, 16), Block.box(0, 0, 4, 16, 12, 12), BooleanOp.OR);
public static final VoxelShape AABB_Z =
Shapes.join(Block.box(0, 12, 0, 16, 16, 16), Block.box(4, 0, 0, 12, 12, 16), BooleanOp.OR);

public static final DirectionProperty FACING = HorizontalDirectionalBlock.FACING;

public HeavyIronBeamBlock(Properties properties) {
super(properties);
registerDefaultState(getStateDefinition().any().setValue(FACING, Direction.NORTH));
}

@Nullable
@Override
public BlockState getStateForPlacement(BlockPlaceContext context) {
return this.defaultBlockState()
.setValue(FACING, context.getHorizontalDirection().getOpposite());
}

@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
builder.add(FACING);
}

@SuppressWarnings("deprecation")
@Override
public @Nonnull VoxelShape getShape(
@Nonnull BlockState blockState,
@Nonnull BlockGetter blockGetter,
@Nonnull BlockPos blockPos,
@Nonnull CollisionContext collisionContext
) {
return switch (blockState.getValue(FACING)) {
case WEST:
case EAST:
yield AABB_X;
case NORTH:
case SOUTH:
default:
yield AABB_Z;
};
}
}
30 changes: 30 additions & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/block/HeavyIronPlateBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package dev.dubhe.anvilcraft.block;

import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;

import javax.annotation.Nonnull;

public class HeavyIronPlateBlock extends Block {

public static final VoxelShape AABB = Block.box(0, 12, 0, 16, 16, 16);

public HeavyIronPlateBlock(Properties properties) {
super(properties);
}

@SuppressWarnings("deprecation")
@Override
public @Nonnull VoxelShape getShape(
@Nonnull BlockState blockState,
@Nonnull BlockGetter blockGetter,
@Nonnull BlockPos blockPos,
@Nonnull CollisionContext collisionContext
) {
return AABB;
}
}
42 changes: 42 additions & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/VanillaRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import dev.dubhe.anvilcraft.init.ModItems;
import net.minecraft.data.recipes.RecipeCategory;
import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.data.recipes.SimpleCookingRecipeBuilder;
import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
import net.minecraft.data.recipes.packs.VanillaRecipeProvider;
Expand Down Expand Up @@ -70,6 +71,17 @@ public static void init(RegistrateRecipeProvider provider) {
.define('A', ModItems.SPONGE_GEMMULE)
.unlockedBy("hasitem", AnvilCraftDatagen.has(ModItems.SPONGE_GEMMULE))
.save(provider);
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ModBlocks.HEAVY_IRON_BLOCK)
.pattern("AAA")
.pattern("AAA")
.pattern("AAA")
.define('A', Items.IRON_BLOCK)
.unlockedBy("hasitem", AnvilCraftDatagen.has(Items.IRON_BLOCK))
.save(provider);
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, Items.IRON_BLOCK, 9)
.requires(ModBlocks.HEAVY_IRON_BLOCK)
.unlockedBy("hasitem", RegistrateRecipeProvider.has(ModBlocks.HEAVY_IRON_BLOCK))
.save(provider);

SimpleCookingRecipeBuilder.campfireCooking(Ingredient.of(ModItemTags.DOUGH), RecipeCategory.FOOD,
Items.BREAD, 0.35f, 600)
Expand Down Expand Up @@ -110,6 +122,36 @@ public static void init(RegistrateRecipeProvider provider) {
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.SMOOTH_ROYAL_STEEL_BLOCK, ModBlocks.ROYAL_STEEL_BLOCK, 4);

VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.POLISHED_HEAVY_IRON_BLOCK, ModBlocks.HEAVY_IRON_BLOCK);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.POLISHED_HEAVY_IRON_SLAB, ModBlocks.HEAVY_IRON_BLOCK, 2);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.POLISHED_HEAVY_IRON_STAIRS, ModBlocks.HEAVY_IRON_BLOCK);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.POLISHED_HEAVY_IRON_SLAB, ModBlocks.POLISHED_HEAVY_IRON_BLOCK, 2);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.POLISHED_HEAVY_IRON_STAIRS, ModBlocks.POLISHED_HEAVY_IRON_BLOCK);

VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.CUT_HEAVY_IRON_BLOCK, ModBlocks.HEAVY_IRON_BLOCK, 4);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.CUT_HEAVY_IRON_SLAB, ModBlocks.HEAVY_IRON_BLOCK, 8);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.CUT_HEAVY_IRON_STAIRS, ModBlocks.HEAVY_IRON_BLOCK, 4);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.CUT_HEAVY_IRON_SLAB, ModBlocks.CUT_HEAVY_IRON_BLOCK, 2);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.CUT_HEAVY_IRON_STAIRS, ModBlocks.CUT_HEAVY_IRON_BLOCK);

VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.HEAVY_IRON_PLATE, ModBlocks.HEAVY_IRON_BLOCK, 8);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.HEAVY_IRON_COLUMN, ModBlocks.HEAVY_IRON_BLOCK, 4);
VanillaRecipeProvider.stonecutterResultFromBase(provider, RecipeCategory.BUILDING_BLOCKS,
ModBlocks.HEAVY_IRON_BEAM, ModBlocks.HEAVY_IRON_BLOCK, 4);




SmithingTransformRecipeBuilder.smithing(Ingredient.of(ModItems.ROYAL_STEEL_UPGRADE_SMITHING_TEMPLATE),
Expand Down
93 changes: 93 additions & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/init/ModBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
import dev.dubhe.anvilcraft.block.CreativeGeneratorBlock;
import dev.dubhe.anvilcraft.block.FerriteCoreMagnetBlock;
import dev.dubhe.anvilcraft.block.HeaterBlock;
import dev.dubhe.anvilcraft.block.HeavyIronBeamBlock;
import dev.dubhe.anvilcraft.block.HeavyIronPlateBlock;
import dev.dubhe.anvilcraft.block.HollowMagnetBlock;
import dev.dubhe.anvilcraft.block.HoneyCauldronBlock;
import dev.dubhe.anvilcraft.block.InductionLightBlock;
Expand Down Expand Up @@ -403,6 +405,97 @@ public class ModBlocks {
AnvilCraftDatagen.has(ModBlocks.CUT_ROYAL_STEEL_BLOCK))
.save(provider, AnvilCraft.of("craft/cut_royal_steel_stairs")))
.register();
public static final BlockEntry<? extends Block> HEAVY_IRON_BLOCK = REGISTRATE
.block("heavy_iron_block", Block::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> POLISHED_HEAVY_IRON_BLOCK = REGISTRATE
.block("polished_heavy_iron_block", Block::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> POLISHED_HEAVY_IRON_SLAB = REGISTRATE
.block("polished_heavy_iron_slab", SlabBlock::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> provider.slabBlock(ctx.get(),
AnvilCraft.of("block/polished_heavy_iron_block"),
AnvilCraft.of("block/polished_heavy_iron_block")))
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> POLISHED_HEAVY_IRON_STAIRS = REGISTRATE
.block("polished_heavy_iron_stairs", (properties) ->
new StairBlock(ModBlocks.POLISHED_HEAVY_IRON_BLOCK.getDefaultState(), properties))
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> provider.stairsBlock(ctx.get(),
AnvilCraft.of("block/polished_heavy_iron_block")))
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> CUT_HEAVY_IRON_BLOCK = REGISTRATE
.block("cut_heavy_iron_block", Block::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> CUT_HEAVY_IRON_SLAB = REGISTRATE
.block("cut_heavy_iron_slab", SlabBlock::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> provider.slabBlock(ctx.get(),
AnvilCraft.of("block/cut_heavy_iron_block"),
AnvilCraft.of("block/cut_heavy_iron_block")))
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> CUT_HEAVY_IRON_STAIRS = REGISTRATE
.block("cut_heavy_iron_stairs", (properties) ->
new StairBlock(ModBlocks.CUT_HEAVY_IRON_BLOCK.getDefaultState(), properties))
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> provider.stairsBlock(ctx.get(),
AnvilCraft.of("block/cut_heavy_iron_block")))
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> HEAVY_IRON_PLATE = REGISTRATE
.block("heavy_iron_plate", HeavyIronPlateBlock::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> {
})
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> HEAVY_IRON_COLUMN = REGISTRATE
.block("heavy_iron_column", Block::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> {
})
.simpleItem()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> HEAVY_IRON_BEAM = REGISTRATE
.block("heavy_iron_beam", HeavyIronBeamBlock::new)
.initialProperties(() -> Blocks.NETHERITE_BLOCK)
.blockstate((ctx, provider) -> {
})
.item()
.model((ctx, provider) -> {
})
.build()
.defaultLoot()
.tag(BlockTags.MINEABLE_WITH_PICKAXE)
.register();
public static final BlockEntry<? extends Block> LAVA_CAULDRON = REGISTRATE
.block("lava_cauldron", LavaCauldronBlock::new)
.initialProperties(() -> Blocks.LAVA_CAULDRON)
Expand Down
10 changes: 10 additions & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/init/ModItemGroups.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,16 @@ public class ModItemGroups {
entries.accept(ModBlocks.CUT_ROYAL_STEEL_BLOCK.asStack());
entries.accept(ModBlocks.CUT_ROYAL_STEEL_SLAB.asStack());
entries.accept(ModBlocks.CUT_ROYAL_STEEL_STAIRS.asStack());
entries.accept(ModBlocks.HEAVY_IRON_BLOCK.asStack());
entries.accept(ModBlocks.POLISHED_HEAVY_IRON_BLOCK.asStack());
entries.accept(ModBlocks.POLISHED_HEAVY_IRON_SLAB.asStack());
entries.accept(ModBlocks.POLISHED_HEAVY_IRON_STAIRS.asStack());
entries.accept(ModBlocks.CUT_HEAVY_IRON_BLOCK.asStack());
entries.accept(ModBlocks.CUT_HEAVY_IRON_SLAB.asStack());
entries.accept(ModBlocks.CUT_HEAVY_IRON_STAIRS.asStack());
entries.accept(ModBlocks.HEAVY_IRON_PLATE.asStack());
entries.accept(ModBlocks.HEAVY_IRON_COLUMN.asStack());
entries.accept(ModBlocks.HEAVY_IRON_BEAM.asStack());
entries.accept(ModBlocks.CURSED_GOLD_BLOCK.asStack());
entries.accept(ModBlocks.ZINC_BLOCK.asStack());
entries.accept(ModBlocks.TIN_BLOCK.asStack());
Expand Down
16 changes: 16 additions & 0 deletions common/src/main/resources/assets/anvilcraft/blockstates/heavy_iron_beam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"variants": {
"facing=east": {
"model": "anvilcraft:block/heavy_iron_beam_x"
},
"facing=north": {
"model": "anvilcraft:block/heavy_iron_beam_z"
},
"facing=south": {
"model": "anvilcraft:block/heavy_iron_beam_z"
},
"facing=west": {
"model": "anvilcraft:block/heavy_iron_beam_x"
}
}
}
7 changes: 7 additions & 0 deletions common/src/main/resources/assets/anvilcraft/blockstates/heavy_iron_column.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "anvilcraft:block/heavy_iron_column"
}
}
}
7 changes: 7 additions & 0 deletions common/src/main/resources/assets/anvilcraft/blockstates/heavy_iron_plate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "anvilcraft:block/heavy_iron_plate"
}
}
}
3 changes: 3 additions & 0 deletions common/src/main/resources/assets/anvilcraft/models/item/heavy_iron_beam.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "anvilcraft:block/heavy_iron_beam_x"
}
7 changes: 7 additions & 0 deletions fabric/src/generated/resources/assets/anvilcraft/blockstates/cut_heavy_iron_block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "anvilcraft:block/cut_heavy_iron_block"
}
}
}
13 changes: 13 additions & 0 deletions fabric/src/generated/resources/assets/anvilcraft/blockstates/cut_heavy_iron_slab.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "anvilcraft:block/cut_heavy_iron_slab"
},
"type=double": {
"model": "anvilcraft:block/cut_heavy_iron_block"
},
"type=top": {
"model": "anvilcraft:block/cut_heavy_iron_slab_top"
}
}
}
Loading
Loading