simple-tech

Minecraft: Better than Adventure! mod that adds simple blocks to automate tasks
git clone git://memoryshards.xyz/simple-tech.git
Log | Files | Refs | README | LICENSE

commit b7855d04c695364bafc2124bb6033c5f8158d0f8
parent b44a337832138909f8573cb7173ab76e37c8044f
Author: Amb0s <ambos@disroot.org>
Date:   Sun,  3 Sep 2023 22:36:14 +0200

Refactorized block builders

Diffstat:
Msrc/main/java/turniplabs/simpletech/SimpleTech.java | 59++++++++++++++++++++++++-----------------------------------
1 file changed, 24 insertions(+), 35 deletions(-)

diff --git a/src/main/java/turniplabs/simpletech/SimpleTech.java b/src/main/java/turniplabs/simpletech/SimpleTech.java @@ -30,62 +30,51 @@ public class SimpleTech implements ModInitializer { public static final int ALLOCATOR_ID = 3794; // Builders - public static final BlockBuilder miscBuilder = new BlockBuilder(MOD_ID) + public static final BlockBuilder stoneBlockBuilder = new BlockBuilder(MOD_ID) + .setHardness(1.5f) + .setResistance(10.0f) + .setLuminance(0) + .setBlockSound(BlockSounds.STONE) + .setTags(BlockTags.MINEABLE_BY_PICKAXE); + public static final BlockBuilder fanBuilder = stoneBlockBuilder .setTopBottomTexture("misc_top_bottom.png") .setEastTexture("misc_side.png") .setWestTexture("misc_side.png") - .setNorthTexture("misc_side.png") - .setHardness(1.5f) - .setResistance(10.0f) + .setNorthTexture("misc_side.png"); + public static final BlockBuilder woodenBlockBuilder = new BlockBuilder(MOD_ID) + .setHardness(1.0f) + .setResistance(2.5f) .setLuminance(0) - .setBlockSound(BlockSounds.STONE); + .setBlockSound(BlockSounds.WOOD) + .setTags(BlockTags.MINEABLE_BY_AXE); // Blocks - public static final Block unpoweredFan = miscBuilder + public static final Block unpoweredFan = fanBuilder .setSouthTexture("fan_front.png") - .setTags(BlockTags.MINEABLE_BY_PICKAXE) .build(new BlockFan("fan.unpowered", UNPOWERED_FAN_ID, Material.stone, false)); - public static final Block poweredFan = miscBuilder + public static final Block poweredFan = fanBuilder .setSouthTexture("fan_front_powered.png") - .setTags(BlockTags.NOT_IN_CREATIVE_MENU, BlockTags.MINEABLE_BY_PICKAXE) + .setTags(BlockTags.NOT_IN_CREATIVE_MENU) .build(new BlockFan("fan.powered", POWERED_FAN_ID, Material.stone, true)); - public static final Block jumpPad = new BlockBuilder(MOD_ID) + public static final Block jumpPad = woodenBlockBuilder .setTextures("jump_pad.png") - .setHardness(1.0f) - .setResistance(2.5f) - .setLuminance(0) - .setBlockSound(BlockSounds.WOOD) - .setTags(BlockTags.MINEABLE_BY_AXE) .build(new BlockJumpPad("jumppad", JUMP_PAD_ID, Material.wood)); - public static final Block trappedChest = new BlockBuilder(MOD_ID) + public static final Block trappedChest = woodenBlockBuilder .setHardness(2.5f) .setResistance(5.0f) - .setLuminance(0) - .setBlockSound(BlockSounds.WOOD) - .setTags(BlockTags.FENCES_CONNECT, BlockTags.MINEABLE_BY_AXE) + .setTags(BlockTags.MINEABLE_BY_AXE, BlockTags.FENCES_CONNECT) .build(new BlockTrappedChest("chest.trapped", TRAPPED_CHEST_ID, Material.wood)); - public static final Block lightSensor = new BlockBuilder(MOD_ID) + public static final Block lightSensor = woodenBlockBuilder .setTextures("light_sensor.png") - .setHardness(1.0f) - .setResistance(2.5f) - .setLuminance(0) - .setBlockSound(BlockSounds.WOOD) - .setTags(BlockTags.MINEABLE_BY_AXE) .build(new BlockLightSensor("lightsensor", LIGHT_SENSOR_ID, Material.wood)); - public static final Block allocator = new BlockBuilder(MOD_ID) + public static final Block allocator = stoneBlockBuilder .setTopTexture("allocator_back_top_bottom.png") .setBottomTexture("allocator_front_top_bottom.png") .setEastTexture("misc_side.png") .setWestTexture("misc_top_bottom.png") .setNorthTexture("allocator_back.png") .setSouthTexture("allocator_front.png") - .setHardness(1.5f) - .setResistance(10.0f) - .setLuminance(0) - .setBlockSound(BlockSounds.STONE) - .setTags(BlockTags.MINEABLE_BY_PICKAXE) - .build(new BlockAllocator("allocator", ALLOCATOR_ID, Material.stone, true, - true)); + .build(new BlockAllocator("allocator", ALLOCATOR_ID, Material.stone, true, true)); @Override public void onInitialize() { @@ -154,8 +143,8 @@ public class SimpleTech implements ModInitializer { return setBit(metadata, invertedOffset, inverted); } - public static int get3DDirectionFromMeta(int meta) { - return meta & 7; + public static int get3DDirectionFromMeta(int metadata) { + return metadata & 7; } public static int getOppositeDirectionById(int i) {