tggamesyt/szar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

blueprint small fix

Browse Source
This commit is contained in:
TGGamesYT
2026-03-25 15:34:18 +01:00
parent a678f3dd02
commit d44fb3ca9a
13 changed files with 123 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/dev/tggamesyt/szar/BlueprintBehavior.java
View File

@@ -29,13 +29,12 @@ public class BlueprintBehavior {
ItemStack held = player.getStackInHand(hand);
if (held.isEmpty()) {
// Clear stored block
if (held.isEmpty() && player.isSneaking()) {
blueprint.clearStoredBlock();
return ActionResult.SUCCESS;
}
if (held.getItem() instanceof BlockItem blockItem) {
if (!held.isEmpty() && held.getItem() instanceof BlockItem blockItem && !blueprint.hasStoredBlock()) {
String id = Registries.BLOCK.getId(blockItem.getBlock()).toString();
blueprint.setStoredBlock(id);
if (!player.isCreative()) held.decrement(1);

16
src/main/java/dev/tggamesyt/szar/BlueprintBlockEntity.java
View File

@@ -1,5 +1,6 @@
package dev.tggamesyt.szar;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType;
@@ -16,8 +17,19 @@ public class BlueprintBlockEntity extends BlockEntity {
@Nullable
private String storedBlockId = null;
public BlueprintBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
public BlueprintBlockEntity(BlockPos pos, BlockState state) {
super(getBEType(state), pos, state);
}
private static BlockEntityType<BlueprintBlockEntity> getBEType(BlockState state) {
Block block = state.getBlock();
if (block instanceof BlueprintStairsBlock) return BlueprintBlocks.BLUEPRINT_STAIRS_BE_TYPE;
if (block instanceof BlueprintSlabBlock) return BlueprintBlocks.BLUEPRINT_SLAB_BE_TYPE;
if (block instanceof BlueprintDoorBlock) return BlueprintBlocks.BLUEPRINT_DOOR_BE_TYPE;
if (block instanceof BlueprintTrapDoorBlock) return BlueprintBlocks.BLUEPRINT_TRAPDOOR_BE_TYPE;
if (block instanceof BlueprintWallBlock) return BlueprintBlocks.BLUEPRINT_WALL_BE_TYPE;
if (block instanceof BlueprintFenceBlock) return BlueprintBlocks.BLUEPRINT_FENCE_BE_TYPE;
throw new IllegalStateException("Unknown blueprint block: " + block);
}
public boolean hasStoredBlock() {

62
src/main/java/dev/tggamesyt/szar/BlueprintBlocks.java
View File

@@ -4,6 +4,7 @@ import dev.tggamesyt.szar.Szar;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.MapColor;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.item.BlockItem;
@@ -38,47 +39,44 @@ public class BlueprintBlocks {
public static final BlueprintWallBlock BLUEPRINT_WALL =
Registry.register(Registries.BLOCK, new Identifier(Szar.MOD_ID, "blueprint_wall"),
new BlueprintWallBlock(settings()));
new BlueprintWallBlock(AbstractBlock.Settings.copy(Blocks.STONE_BRICK_WALL)));
public static final BlueprintFenceBlock BLUEPRINT_FENCE =
Registry.register(Registries.BLOCK, new Identifier(Szar.MOD_ID, "blueprint_fence"),
new BlueprintFenceBlock(settings()));
new BlueprintFenceBlock(AbstractBlock.Settings.copy(Blocks.OAK_FENCE)));
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_STAIRS_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_stairs_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_STAIRS).build());
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_STAIRS_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_SLAB_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_DOOR_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_TRAPDOOR_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_WALL_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_FENCE_BE_TYPE;
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_SLAB_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_slab_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_SLAB).build());
static {
BLUEPRINT_STAIRS_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_stairs_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_STAIRS).build());
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_DOOR_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_door_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_DOOR).build());
BLUEPRINT_SLAB_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_slab_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_SLAB).build());
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_TRAPDOOR_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_trapdoor_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_TRAPDOOR).build());
BLUEPRINT_DOOR_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_door_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_DOOR).build());
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_WALL_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_wall_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_WALL).build());
BLUEPRINT_TRAPDOOR_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_trapdoor_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_TRAPDOOR).build());
public static final BlockEntityType<BlueprintBlockEntity> BLUEPRINT_FENCE_BE_TYPE =
Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(Szar.MOD_ID, "blueprint_fence_be"),
FabricBlockEntityTypeBuilder.create(
(pos, state) -> new BlueprintBlockEntity(null, pos, state),
BLUEPRINT_FENCE).build());
BLUEPRINT_WALL_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_wall_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_WALL).build());
BLUEPRINT_FENCE_BE_TYPE = Registry.register(Registries.BLOCK_ENTITY_TYPE,
new Identifier(Szar.MOD_ID, "blueprint_fence_be"),
FabricBlockEntityTypeBuilder.create(BlueprintBlockEntity::new, BLUEPRINT_FENCE).build());
}
public static final BlockItem BLUEPRINT_STAIRS_ITEM = Registry.register(Registries.ITEM,
new Identifier(Szar.MOD_ID, "blueprint_stairs"),
new BlockItem(BLUEPRINT_STAIRS, new Item.Settings()));

2
src/main/java/dev/tggamesyt/szar/BlueprintDoorBlock.java
View File

@@ -19,7 +19,7 @@ public class BlueprintDoorBlock extends DoorBlock implements BlockEntityProvider
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_DOOR_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

2
src/main/java/dev/tggamesyt/szar/BlueprintFenceBlock.java
View File

@@ -18,7 +18,7 @@ public class BlueprintFenceBlock extends FenceBlock implements BlockEntityProvid
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_FENCE_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

2
src/main/java/dev/tggamesyt/szar/BlueprintSlabBlock.java
View File

@@ -18,7 +18,7 @@ public class BlueprintSlabBlock extends SlabBlock implements BlockEntityProvider
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_SLAB_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

2
src/main/java/dev/tggamesyt/szar/BlueprintStairsBlock.java
View File

@@ -18,7 +18,7 @@ public class BlueprintStairsBlock extends StairsBlock implements BlockEntityProv
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_STAIRS_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

2
src/main/java/dev/tggamesyt/szar/BlueprintTrapDoorBlock.java
View File

@@ -18,7 +18,7 @@ public class BlueprintTrapDoorBlock extends TrapdoorBlock implements BlockEntity
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_TRAPDOOR_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

2
src/main/java/dev/tggamesyt/szar/BlueprintWallBlock.java
View File

@@ -18,7 +18,7 @@ public class BlueprintWallBlock extends WallBlock implements BlockEntityProvider
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BlueprintBlockEntity(BlueprintBlocks.BLUEPRINT_WALL_BE_TYPE, pos, state);
return new BlueprintBlockEntity(pos, state);
}
@Override

23
src/main/resources/assets/szar/blockstates/blueprint_wall.json
View File

@@ -1,22 +1,9 @@
{
"multipart": [
{ "apply": { "model": "szar:block/blueprint_wall_post" },
"when": { "up": "true" } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "uvlock": true },
"when": { "north": "low" } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 90, "uvlock": true },
"when": { "east": "low" } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 180, "uvlock": true },
"when": { "south": "low" } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 270, "uvlock": true },
"when": { "west": "low" } },
{ "apply": { "model": "szar:block/blueprint_wall_side_tall", "uvlock": true },
"when": { "north": "tall" } },
{ "apply": { "model": "szar:block/blueprint_wall_side_tall", "y": 90, "uvlock": true },
"when": { "east": "tall" } },
{ "apply": { "model": "szar:block/blueprint_wall_side_tall", "y": 180, "uvlock": true },
"when": { "south": "tall" } },
{ "apply": { "model": "szar:block/blueprint_wall_side_tall", "y": 270, "uvlock": true },
"when": { "west": "tall" } }
{ "apply": { "model": "szar:block/blueprint_wall_post" } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "uvlock": true } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 90, "uvlock": true } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 180, "uvlock": true } },
{ "apply": { "model": "szar:block/blueprint_wall_side", "y": 270, "uvlock": true } }
]
}

BIN
src/main/resources/assets/szar/textures/block/blueprint.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 873 B