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

大铁砧多方块配方 #945

Merged
merged 7 commits into from
Jun 23, 2024
Merged

大铁砧多方块配方 #945

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b66efb9
大铁砧多方块
dmzz-yyhyy Jun 22, 2024
4745d47
Merge branch 'releases/1.20.1' into gaint_anvil
dmzz-yyhyy Jun 22, 2024
35c019a
填加剩余配方
dmzz-yyhyy Jun 22, 2024
e507a75
修改blockstate
dmzz-yyhyy Jun 22, 2024
81415e0
修正配方
dmzz-yyhyy Jun 22, 2024
5273ded
优化import
dmzz-yyhyy Jun 22, 2024
c6d32cd
调整
Gu-ZT Jun 23, 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
20 changes: 9 additions & 11 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
Expand Up @@ -7,10 +7,10 @@
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.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.EnumProperty;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.Shapes;
Expand All @@ -26,23 +26,23 @@ public class HeavyIronBeamBlock extends Block implements IHammerRemovable, IHamm
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 static final EnumProperty<Direction.Axis> AXIS = BlockStateProperties.AXIS;

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

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

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

@SuppressWarnings("deprecation")
Expand All @@ -53,12 +53,10 @@ protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockSt
@Nonnull BlockPos blockPos,
@Nonnull CollisionContext collisionContext
) {
return switch (blockState.getValue(FACING)) {
case WEST:
case EAST:
return switch (blockState.getValue(AXIS)) {
case X:
yield AABB_X;
case NORTH:
case SOUTH:
case Z:
default:
yield AABB_Z;
};
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/AnvilCraftDatagen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.ProviderType;
import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.advancement.AdvancementHandler;
import dev.dubhe.anvilcraft.data.generator.lang.LangHandler;
import dev.dubhe.anvilcraft.data.generator.loot.LootHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...on/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingLikeRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.block.CementCauldronBlock;
import dev.dubhe.anvilcraft.block.state.Color;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe.Builder;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/ItemInjectRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/ItemSmashRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
Expand Down
204 changes: 204 additions & 0 deletions .../main/java/dev/dubhe/anvilcraft/data/generator/recipe/MultiblockCraftingRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
package dev.dubhe.anvilcraft.data.generator.recipe;

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.block.HeavyIronBeamBlock;
import dev.dubhe.anvilcraft.data.recipe.RecipeBlock;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeResult;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
import dev.dubhe.anvilcraft.init.ModBlocks;
import net.minecraft.core.Direction;
import net.minecraft.data.recipes.RecipeCategory;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.state.properties.Half;
import net.minecraft.world.level.block.state.properties.SlabType;
import net.minecraft.world.phys.Vec3;

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

public class MultiblockCraftingRecipeLoader {
private static RegistrateRecipeProvider provider = null;

/**
* 初始化粉碎配方
*
* @param provider 提供器
*/
public static void init(RegistrateRecipeProvider provider) {
MultiblockCraftingRecipeLoader.provider = provider;
multiblockCrafting(
new HashMap<>() {{
put('A', RecipeBlock.of(ModBlocks.POLISHED_HEAVY_IRON_BLOCK.get()));
put('B', RecipeBlock.of(ModBlocks.HEAVY_IRON_COLUMN.get()));
put('C', RecipeBlock.of(ModBlocks.HEAVY_IRON_PLATE.get()));
put('D', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_BLOCK.get()));
}},
new String[]{
"AAA",
"AAA",
"AAA",

"CCC",
"CBC",
"CCC",

"DDD",
"DDD",
"DDD",
},
RecipeResult.of(RecipeItem.of(ModBlocks.GIANT_ANVIL))
);
multiblockCrafting(
new HashMap<>() {{
put('A', RecipeBlock.of(ModBlocks.POLISHED_HEAVY_IRON_BLOCK.get()));
put('B', RecipeBlock.of(ModBlocks.HEAVY_IRON_BEAM.get(),
Map.entry(HeavyIronBeamBlock.AXIS, Direction.Axis.Z)));
put('C', RecipeBlock.of(ModBlocks.HEAVY_IRON_BEAM.get(),
Map.entry(HeavyIronBeamBlock.AXIS, Direction.Axis.X)));
put('D', RecipeBlock.of(ModBlocks.HEAVY_IRON_COLUMN.get()));
put('E', RecipeBlock.of(ModBlocks.HEAVY_IRON_PLATE.get()));
put('F', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_STAIRS.get(),
Map.entry(StairBlock.FACING, Direction.SOUTH),
Map.entry(StairBlock.HALF, Half.BOTTOM)));
put('G', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_STAIRS.get(),
Map.entry(StairBlock.FACING, Direction.NORTH),
Map.entry(StairBlock.HALF, Half.BOTTOM)));
put('H', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_STAIRS.get(),
Map.entry(StairBlock.FACING, Direction.EAST),
Map.entry(StairBlock.HALF, Half.BOTTOM)));
put('I', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_STAIRS.get(),
Map.entry(StairBlock.FACING, Direction.WEST),
Map.entry(StairBlock.HALF, Half.BOTTOM)));
put('J', RecipeBlock.of(ModBlocks.CUT_HEAVY_IRON_SLAB.get(),
Map.entry(SlabBlock.TYPE, SlabType.BOTTOM)));
}},
new String[]{
"ABA",
"CAC",
"ABA",

"EEE",
"EDE",
"EEE",

"JGJ",
"HDI",
"JFJ",
},
RecipeResult.of(RecipeItem.of(ModBlocks.GIANT_ANVIL))
);
multiblockCrafting(
new HashMap<>() {{
put('A', RecipeBlock.of(Blocks.SPONGE));
put('B', RecipeBlock.of(ModBlocks.VOID_MATTER_BLOCK.get()));
}},
new String[]{
"AAA",
"A A",
"AAA",

"A A",
" B ",
"A A",

"AAA",
"A A",
"AAA",
},
RecipeResult.of(RecipeItem.of(ModBlocks.MENGER_SPONGE))
);
}


/**
* 大铁砧多方块合成配方
* maps传参示例
*
* <p>new String[]{
*
* <p>"AAA",
*
* <p>"AAA",
*
* <p>"AAA",
*
* <p><p>"AAA",
*
* <p>"AAA",
*
* <p>"AAA",
*
* <p><p>"AAA",
*
* <p>"AAA",
*
* <p>"AAA",
*
* <p>}
*
* @param mappingTable 方块与字母对照表
* @param maps 每一行的配方, 要求数量必须为单行配方字数的平方
* @param recipeResults 配方的输出
*/
public static void multiblockCrafting(
Map<Character, RecipeBlock> mappingTable,
String[] maps,
RecipeResult... recipeResults
) {
if (Arrays.stream(maps).findFirst().isEmpty()) return;
int size = Arrays.stream(maps).findFirst().get().length();
if (maps.length != size * size) return;
AnvilRecipe.Builder builder = AnvilRecipe.Builder.create(RecipeCategory.MISC)
.type(AnvilRecipeType.MULTIBLOCK_CRAFTING);
if (Arrays.stream(recipeResults).findFirst().isPresent())
builder = builder.icon(Arrays.stream(recipeResults).findFirst().get().getIcon());
for (int x = -(size - 1) / 2; x <= (size - 1) / 2; x++) {
for (int z = -(size - 1) / 2; z <= (size - 1) / 2; z++) {
builder = builder.hasBlock(new Vec3(x, -1, z), Blocks.CRAFTING_TABLE);
}
}
StringBuilder path = new StringBuilder("multiblock_crafting/");
path.append(Arrays.stream(recipeResults).findFirst().get().getKey());
path.append("_from_");
int index = 0;
for (RecipeBlock recipeBlock : mappingTable.values()) {
if (index >= 6) {
break;
}
path.append(recipeBlock.getKey());
path.append("_");
index++;
}
mappingTable.put(' ', RecipeBlock.of(Blocks.AIR));
index = 0;
for (String map : maps) {
if (map.length() != size) return;
for (int i = 0; i < map.length(); i++) {
char ch = map.charAt(i);
if (!mappingTable.containsKey(ch)) return;
builder = builder.hasBlockIngredient(new Vec3(
index % 3 - (int) ((double) (size - 1) / 2),
(int) (-((double) index / 9) - 2),
-((int) (((double) index % 9) / 3) - (int) ((double) (size - 1) / 2))
),
mappingTable.get(ch)
);
index++;
}
}
for (RecipeResult recipeResult : recipeResults) {
if (recipeResult.isItem()) {
builder = builder.spawnItem(recipeResult.getOffset().add(0, -3, 0), recipeResult.getRecipeItem());
} else {
builder = builder.setBlock(recipeResult.getOffset().add(0, -3, 0), recipeResult.getRecipeBlock());
}
}
builder.save(provider, AnvilCraft.of(path.substring(0, path.length() - 1)));
}
}
1 change: 1 addition & 0 deletions common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/RecipesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,6 @@ public static void init(RegistrateRecipeProvider provider) {
SmithingRecipesLoader.init(provider);
MobTransformRecipesLoader.init(provider);
BulgingLikeRecipesLoader.init(provider);
MultiblockCraftingRecipeLoader.init(provider);
}
}
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/SievingRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
import dev.dubhe.anvilcraft.init.ModBlocks;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/StampingRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe.Builder;
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/SuperHeatingRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe.Builder;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/dev/dubhe/anvilcraft/data/generator/recipe/TimeWarpRecipesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.tterrag.registrate.providers.RegistrateRecipeProvider;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.block.CorruptedBeaconBlock;
import dev.dubhe.anvilcraft.data.RecipeItem;
import dev.dubhe.anvilcraft.data.recipe.RecipeItem;
import dev.dubhe.anvilcraft.data.generator.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipe;
import dev.dubhe.anvilcraft.data.recipe.anvil.AnvilRecipeType;
Expand Down
Loading
Loading