Added the outline block

src/main/java/dev/hephaestus/glowcase/Glowcase.java

@@ -2,8 +2,20 @@
 
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
-import dev.hephaestus.glowcase.block.*;
-import dev.hephaestus.glowcase.block.entity.*;
+import dev.hephaestus.glowcase.block.HyperlinkBlock;
+import dev.hephaestus.glowcase.block.ItemDisplayBlock;
+import dev.hephaestus.glowcase.block.OutlineBlock;
+import dev.hephaestus.glowcase.block.ParticleDisplayBlock;
+import dev.hephaestus.glowcase.block.PopupBlock;
+import dev.hephaestus.glowcase.block.SpriteBlock;
+import dev.hephaestus.glowcase.block.TextBlock;
+import dev.hephaestus.glowcase.block.entity.HyperlinkBlockEntity;
+import dev.hephaestus.glowcase.block.entity.ItemDisplayBlockEntity;
+import dev.hephaestus.glowcase.block.entity.OutlineBlockEntity;
+import dev.hephaestus.glowcase.block.entity.ParticleDisplayBlockEntity;
+import dev.hephaestus.glowcase.block.entity.PopupBlockEntity;
+import dev.hephaestus.glowcase.block.entity.SpriteBlockEntity;
+import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
 import dev.hephaestus.glowcase.compat.PolydexCompatibility;
 import dev.hephaestus.glowcase.item.LockItem;
 import net.fabricmc.api.ModInitializer;
@@ -56,6 +68,10 @@ public class Glowcase implements ModInitializer {
 	public static final Supplier<BlockItem> SPRITE_BLOCK_ITEM = registerItem("sprite_block", () -> new BlockItem(SPRITE_BLOCK.get(), new Item.Settings()));
 	public static final Supplier<BlockEntityType<SpriteBlockEntity>> SPRITE_BLOCK_ENTITY = registerBlockEntity("sprite_block", () -> BlockEntityType.Builder.create(SpriteBlockEntity::new, SPRITE_BLOCK.get()).build(null));
 
+	public static final Supplier<OutlineBlock> OUTLINE_BLOCK = registerBlock("outline_block", OutlineBlock::new);
+	public static final Supplier<BlockItem> OUTLINE_BLOCK_ITEM = registerItem("outline_block", () -> new BlockItem(OUTLINE_BLOCK.get(), new Item.Settings()));
+	public static final Supplier<BlockEntityType<OutlineBlockEntity>> OUTLINE_BLOCK_ENTITY = registerBlockEntity("outline_block", () -> BlockEntityType.Builder.create(OutlineBlockEntity::new, OUTLINE_BLOCK.get()).build(null));
+
 	public static final Supplier<Item> LOCK_ITEM = registerItem("lock", () -> new LockItem(new Item.Settings()));
 
 	public static final Supplier<ItemGroup> ITEM_GROUP = registerItemGroup("items", () -> FabricItemGroup.builder()
@@ -67,6 +83,7 @@ public class Glowcase implements ModInitializer {
 			entries.add(TEXT_BLOCK_ITEM.get());
 			entries.add(POPUP_BLOCK_ITEM.get());
 			entries.add(SPRITE_BLOCK_ITEM.get());
+			entries.add(OUTLINE_BLOCK_ITEM.get());
 			entries.add(LOCK_ITEM.get());
 			entries.add(PARTICLE_DISPLAY_ITEM.get());
 		})

src/main/java/dev/hephaestus/glowcase/GlowcaseCommonProxy.java

@@ -31,6 +31,10 @@ public void openSpriteBlockEditScreen(BlockPos pos) {
 		//No-op
 	}
 
+	public void openOutlineBlockEditScreen(BlockPos pos) {
+		//No-op
+	}
+
 	public void openParticleDisplayBlockEditScreen(BlockPos pos) {
 		//No-op
 	}

src/main/java/dev/hephaestus/glowcase/GlowcaseNetworking.java

@@ -1,6 +1,12 @@
 package dev.hephaestus.glowcase;
 
-import dev.hephaestus.glowcase.packet.*;
+import dev.hephaestus.glowcase.packet.C2SEditHyperlinkBlock;
+import dev.hephaestus.glowcase.packet.C2SEditItemDisplayBlock;
+import dev.hephaestus.glowcase.packet.C2SEditOutlineBlock;
+import dev.hephaestus.glowcase.packet.C2SEditParticleDisplayBlock;
+import dev.hephaestus.glowcase.packet.C2SEditPopupBlock;
+import dev.hephaestus.glowcase.packet.C2SEditSpriteBlock;
+import dev.hephaestus.glowcase.packet.C2SEditTextBlock;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 
@@ -11,13 +17,15 @@ public static void init() {
 		PayloadTypeRegistry.playC2S().register(C2SEditTextBlock.ID, C2SEditTextBlock.PACKET_CODEC);
 		PayloadTypeRegistry.playC2S().register(C2SEditPopupBlock.ID, C2SEditPopupBlock.PACKET_CODEC);
 		PayloadTypeRegistry.playC2S().register(C2SEditSpriteBlock.ID, C2SEditSpriteBlock.PACKET_CODEC);
+		PayloadTypeRegistry.playC2S().register(C2SEditOutlineBlock.ID, C2SEditOutlineBlock.PACKET_CODEC);
 		PayloadTypeRegistry.playC2S().register(C2SEditParticleDisplayBlock.ID, C2SEditParticleDisplayBlock.PACKET_CODEC);
 
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditHyperlinkBlock.ID, C2SEditHyperlinkBlock::receive);
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditItemDisplayBlock.ID, C2SEditItemDisplayBlock::receive);
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditTextBlock.ID, C2SEditTextBlock::receive);
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditPopupBlock.ID, C2SEditPopupBlock::receive);
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditSpriteBlock.ID, C2SEditSpriteBlock::receive);
+		ServerPlayNetworking.registerGlobalReceiver(C2SEditOutlineBlock.ID, C2SEditOutlineBlock::receive);
 		ServerPlayNetworking.registerGlobalReceiver(C2SEditParticleDisplayBlock.ID, C2SEditParticleDisplayBlock::receive);
 	}
 }

src/main/java/dev/hephaestus/glowcase/block/OutlineBlock.java

@@ -0,0 +1,62 @@
+package dev.hephaestus.glowcase.block;
+
+import dev.hephaestus.glowcase.Glowcase;
+import dev.hephaestus.glowcase.block.entity.OutlineBlockEntity;
+import net.minecraft.block.BlockEntityProvider;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.NbtComponent;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+import net.minecraft.util.Hand;
+import net.minecraft.util.ItemActionResult;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class OutlineBlock extends GlowcaseBlock implements BlockEntityProvider {
+	@Nullable
+	@Override
+	public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+		return new OutlineBlockEntity(pos, state);
+	}
+
+	@Override
+	public void onPlaced(World world, BlockPos pos, BlockState state, LivingEntity placer, ItemStack stack) {
+		if (world.isClient && placer instanceof PlayerEntity player && canEditGlowcase(player, pos)) {
+			//load any ctrl-picked NBT clientside
+			NbtComponent blockEntityTag = stack.get(DataComponentTypes.BLOCK_ENTITY_DATA);
+			if (blockEntityTag != null && world.getBlockEntity(pos) instanceof OutlineBlockEntity be) {
+				blockEntityTag.applyToBlockEntity(be, world.getRegistryManager());
+			}
+
+			Glowcase.proxy.openOutlineBlockEditScreen(pos);
+		}
+	}
+
+	@Override
+	protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+		if (!(world.getBlockEntity(pos) instanceof OutlineBlockEntity be)) return ItemActionResult.CONSUME;
+
+		if (world.isClient && player.getStackInHand(hand).isIn(Glowcase.ITEM_TAG) && canEditGlowcase(player, pos)) {
+			Glowcase.proxy.openOutlineBlockEditScreen(pos);
+		}
+
+		return ItemActionResult.SUCCESS;
+	}
+
+	@Override
+	public void appendTooltip(ItemStack itemStack, Item.TooltipContext context, List<Text> tooltip, TooltipType options) {
+		tooltip.add(Text.translatable("block.glowcase.outline_block.tooltip.0").formatted(Formatting.GRAY));
+		tooltip.add(Text.translatable("block.glowcase.generic.tooltip").formatted(Formatting.DARK_GRAY));
+	}
+}

src/main/java/dev/hephaestus/glowcase/block/ParticleDisplayBlock.java

@@ -8,14 +8,20 @@
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.ItemActionResult;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.List;
+
 public class ParticleDisplayBlock extends GlowcaseBlock implements BlockEntityProvider {
 	@Override
 	public @Nullable <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
@@ -38,4 +44,10 @@ protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, Worl
 	public @Nullable BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
 		return new ParticleDisplayBlockEntity(pos, state);
 	}
+
+	@Override
+	public void appendTooltip(ItemStack itemStack, Item.TooltipContext context, List<Text> tooltip, TooltipType options) {
+		tooltip.add(Text.translatable("block.glowcase.particle_display_block.tooltip.0").formatted(Formatting.GRAY));
+		tooltip.add(Text.translatable("block.glowcase.generic.tooltip").formatted(Formatting.DARK_GRAY));
+	}
 }

src/main/java/dev/hephaestus/glowcase/block/entity/OutlineBlockEntity.java

@@ -0,0 +1,74 @@
+package dev.hephaestus.glowcase.block.entity;
+
+import dev.hephaestus.glowcase.Glowcase;
+import dev.hephaestus.glowcase.client.render.block.entity.BakedBlockEntityRenderer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.nbt.NbtCompound;
+import net.minecraft.network.listener.ClientPlayPacketListener;
+import net.minecraft.network.packet.Packet;
+import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
+import net.minecraft.registry.RegistryWrapper;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3i;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public class OutlineBlockEntity extends BlockEntity {
+	public Vec3i offset = Vec3i.ZERO;
+	public Vec3i scale = new Vec3i(1, 1, 1);
+	public int color = 0xFFFFFF;
+
+	public OutlineBlockEntity(BlockPos pos, BlockState state) {
+		super(Glowcase.OUTLINE_BLOCK_ENTITY.get(), pos, state);
+	}
+
+	@Override
+	public void writeNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
+		super.writeNbt(tag, registryLookup);
+
+		tag.putIntArray("offset", List.of(this.offset.getX(), this.offset.getY(), this.offset.getZ()));
+		tag.putIntArray("scale", List.of(this.scale.getX(), this.scale.getY(), this.scale.getZ()));
+		tag.putInt("color", this.color);
+	}
+
+	@Override
+	public void readNbt(NbtCompound tag, RegistryWrapper.WrapperLookup registryLookup) {
+		super.readNbt(tag, registryLookup);
+
+		int[] offset = tag.getIntArray("offset");
+		int[] scale = tag.getIntArray("scale");
+
+		this.offset = new Vec3i(offset[0], offset[1], offset[2]);
+		this.scale = new Vec3i(scale[0], scale[1], scale[2]);
+		this.color = tag.getInt("color");
+	}
+
+	@SuppressWarnings({"MethodCallSideOnly", "VariableUseSideOnly"})
+	@Override
+	public void markRemoved() {
+		if (world != null && world.isClient) {
+			BakedBlockEntityRenderer.Manager.markForRebuild(getPos());
+		}
+		super.markRemoved();
+	}
+
+	// standard blockentity boilerplate
+
+	public void dispatch() {
+		if (world instanceof ServerWorld sworld) sworld.getChunkManager().markForUpdate(pos);
+	}
+
+	@Override
+	public NbtCompound toInitialChunkDataNbt(RegistryWrapper.WrapperLookup registryLookup) {
+		return createNbt(registryLookup);
+	}
+
+	@Nullable
+	@Override
+	public Packet<ClientPlayPacketListener> toUpdatePacket() {
+		return BlockEntityUpdateS2CPacket.create(this);
+	}
+}

src/main/java/dev/hephaestus/glowcase/client/GlowcaseClient.java

@@ -4,9 +4,10 @@
 import dev.hephaestus.glowcase.client.render.block.entity.BakedBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.HyperlinkBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.ItemDisplayBlockEntityRenderer;
-import dev.hephaestus.glowcase.client.render.block.entity.TextBlockEntityRenderer;
+import dev.hephaestus.glowcase.client.render.block.entity.OutlineBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.PopupBlockEntityRenderer;
 import dev.hephaestus.glowcase.client.render.block.entity.SpriteBlockEntityRenderer;
+import dev.hephaestus.glowcase.client.render.block.entity.TextBlockEntityRenderer;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.InvalidateRenderStateCallback;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
@@ -22,6 +23,7 @@ public void onInitializeClient() {
 		BlockEntityRendererFactories.register(Glowcase.ITEM_DISPLAY_BLOCK_ENTITY.get(), ItemDisplayBlockEntityRenderer::new);
 		BlockEntityRendererFactories.register(Glowcase.POPUP_BLOCK_ENTITY.get(), PopupBlockEntityRenderer::new);
 		BlockEntityRendererFactories.register(Glowcase.SPRITE_BLOCK_ENTITY.get(), SpriteBlockEntityRenderer::new);
+		BlockEntityRendererFactories.register(Glowcase.OUTLINE_BLOCK_ENTITY.get(), OutlineBlockEntityRenderer::new);
 
 		WorldRenderEvents.AFTER_TRANSLUCENT.register(BakedBlockEntityRenderer.Manager::render);
 		InvalidateRenderStateCallback.EVENT.register(BakedBlockEntityRenderer.Manager::reset);

src/main/java/dev/hephaestus/glowcase/client/GlowcaseClientProxy.java

@@ -1,6 +1,19 @@
 package dev.hephaestus.glowcase.client;
 
 import dev.hephaestus.glowcase.GlowcaseCommonProxy;
+import dev.hephaestus.glowcase.block.entity.HyperlinkBlockEntity;
+import dev.hephaestus.glowcase.block.entity.ItemDisplayBlockEntity;
+import dev.hephaestus.glowcase.block.entity.OutlineBlockEntity;
+import dev.hephaestus.glowcase.block.entity.PopupBlockEntity;
+import dev.hephaestus.glowcase.block.entity.SpriteBlockEntity;
+import dev.hephaestus.glowcase.block.entity.TextBlockEntity;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.HyperlinkBlockEditScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.ItemDisplayBlockEditScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.OutlineBlockEditScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.PopupBlockEditScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.PopupBlockViewScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.SpriteBlockEditScreen;
+import dev.hephaestus.glowcase.client.gui.screen.ingame.TextBlockEditScreen;
 import dev.hephaestus.glowcase.block.entity.*;
 import dev.hephaestus.glowcase.client.gui.screen.ingame.*;
 import net.minecraft.client.MinecraftClient;
@@ -61,6 +74,14 @@ public void openSpriteBlockEditScreen(BlockPos pos) {
 		}
 	}
 
+	@Override
+	public void openOutlineBlockEditScreen(BlockPos pos) {
+		MinecraftClient client = MinecraftClient.getInstance();
+		if (client.world != null && client.world.getBlockEntity(pos) instanceof OutlineBlockEntity be) {
+			MinecraftClient.getInstance().setScreen(new OutlineBlockEditScreen(be));
+		}
+	}
+
 	@Override
 	public void openParticleDisplayBlockEditScreen(BlockPos pos) {
 		MinecraftClient client = MinecraftClient.getInstance();

src/main/java/dev/hephaestus/glowcase/client/gui/screen/ingame/ItemDisplayBlockEditScreen.java

@@ -47,9 +47,9 @@ public void init() {
 				editItemDisplayBlock(false);
 			}).dimensions(centerW - 75, centerH + individualPadding, 150, 20).build();
 
-			this.offsetButton = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.offset", this.displayBlock.offset), (action) -> {
+			this.offsetButton = ButtonWidget.builder(Text.stringifiedTranslatable("gui.glowcase.offset_value", this.displayBlock.offset), (action) -> {
 				this.displayBlock.cycleOffset();
-				this.offsetButton.setMessage(Text.stringifiedTranslatable("gui.glowcase.offset", this.displayBlock.offset));
+				this.offsetButton.setMessage(Text.stringifiedTranslatable("gui.glowcase.offset_value", this.displayBlock.offset));
 				editItemDisplayBlock(true);
 			}).dimensions(centerW - 75, centerH + 20 + padding, 150, 20).build();