Skip to content

Add pick block handling for Infinite Spray Can color selection #39

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

Open
WhitePhant0m wants to merge 3 commits into
base: main
Choose a base branch
from
+115 −0
Open

Add pick block handling for Infinite Spray Can color selection #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0103e9
Add pick block handling for Infinite Spray Can color selection
WhitePhant0m Jun 7, 2026
f9da1e0
spotless
WhitePhant0m Jun 7, 2026
583eac6
also support rest of the blocks infinite spray can is able to color f…
WhitePhant0m Jun 7, 2026
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
83 changes: 83 additions & 0 deletions src/main/java/net/neganote/gtutilities/client/event/ClientTickHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
package net.neganote.gtutilities.client.event;

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.blockentity.IPaintable;
import com.gregtechceu.gtceu.api.pipenet.IPipeNode;

import net.minecraft.client.Minecraft;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputEvent;
Expand All @@ -13,10 +20,14 @@
import net.neganote.gtutilities.GregTechModernUtilities;
import net.neganote.gtutilities.client.gui.screen.ColorRadialMenuScreen;
import net.neganote.gtutilities.client.keybind.UtilKeybinds;
import net.neganote.gtutilities.common.item.InfiniteSprayCanBehaviour;
import net.neganote.gtutilities.common.item.InfiniteSprayCanItem;
import net.neganote.gtutilities.network.UtilsNetwork;
import net.neganote.gtutilities.network.packet.SelectColorPacket;

import appeng.api.implementations.blockentities.IColorableBlockEntity;
import appeng.api.util.AEColor;

@Mod.EventBusSubscriber(modid = GregTechModernUtilities.MOD_ID,
bus = Mod.EventBusSubscriber.Bus.FORGE,
value = Dist.CLIENT)
Expand Down Expand Up @@ -81,4 +92,76 @@ public static void onRightClick(InputEvent.InteractionKeyMappingTriggered event)
event.setCanceled(true);
mc.setScreen(new ColorRadialMenuScreen(InteractionHand.MAIN_HAND));
}

@SubscribeEvent
public static void onKeyInput(InputEvent.InteractionKeyMappingTriggered event) {
if (!event.isPickBlock()) return;

var mc = Minecraft.getInstance();
if (mc.player == null) return;

var player = mc.player;
var stack = player.getMainHandItem();
if (!(stack.getItem() instanceof InfiniteSprayCanItem)) return;
event.setCanceled(true);

var target = mc.hitResult;
if (target == null || target.getType() != HitResult.Type.BLOCK) return;

var level = player.level();
var blockHit = (BlockHitResult) target;
var pos = blockHit.getBlockPos();
var be = level.getBlockEntity(pos);

if (GTCEu.Mods.isAE2Loaded() && be instanceof IColorableBlockEntity colorable) {
if (colorable.getColor().equals(AEColor.TRANSPARENT)) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, -1));
return;
}

for (AEColor color : AEColor.values()) {
if (color.equals(colorable.getColor())) {
UtilsNetwork.CHANNEL
.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, color.ordinal()));
return;
}
}
} else if (be instanceof IPipeNode pipe) {
if (!pipe.isPainted()) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, -1));
} else {
for (int i = 0; i < DyeColor.values().length; i++) {
DyeColor color = DyeColor.byId(i);
if (color.getMapColor().col == pipe.getPaintingColor()) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, i));
return;
}
}
}
} else if (be instanceof IPaintable paintable) {
if (!paintable.isPainted()) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, -1));
} else {
for (int i = 0; i < DyeColor.values().length; i++) {
DyeColor color = DyeColor.byId(i);
if (color.getMapColor().col == paintable.getRealColor()) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, i));
return;
}
}
}
} else if (be instanceof ShulkerBoxBlockEntity shulkerBox) {
if (shulkerBox.getColor() == null) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, -1));
} else {
UtilsNetwork.CHANNEL.sendToServer(
new SelectColorPacket(InteractionHand.MAIN_HAND, shulkerBox.getColor().ordinal()));
}
} else {
Integer colorIndex = InfiniteSprayCanBehaviour.getBlockPickedColorIndex(level.getBlockState(pos));
if (colorIndex != null) {
UtilsNetwork.CHANNEL.sendToServer(new SelectColorPacket(InteractionHand.MAIN_HAND, colorIndex));
}
}
}
}
32 changes: 32 additions & 0 deletions src/main/java/net/neganote/gtutilities/common/item/InfiniteSprayCanBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public class InfiniteSprayCanBehaviour implements IInteractionItem, IAddInformat
private static final ImmutableMap<DyeColor, Block> CONCRETE_MAP;
private static final ImmutableMap<DyeColor, Block> CONCRETE_POWDER_MAP;
private static final ImmutableMap<DyeColor, Block> SHULKER_BOX_MAP;
private static final ImmutableMap<Block, Integer> BLOCK_TO_COLOR_INDEX;

private static Block getBlock(DyeColor color, String postfix) {
ResourceLocation id = new ResourceLocation("minecraft", color.getSerializedName() + "_" + postfix);
Expand Down Expand Up @@ -91,6 +92,22 @@ private static Block getBlock(DyeColor color, String postfix) {
CONCRETE_MAP = concreteBuilder.build();
CONCRETE_POWDER_MAP = concretePowderBuilder.build();
SHULKER_BOX_MAP = shulkerBoxBuilder.build();

ImmutableMap.Builder<Block, Integer> blockColorBuilder = ImmutableMap.builder();
blockColorBuilder.put(Blocks.GLASS, -1);
blockColorBuilder.put(Blocks.GLASS_PANE, -1);
blockColorBuilder.put(Blocks.TERRACOTTA, -1);
for (DyeColor color : DyeColor.values()) {
int ordinal = color.ordinal();
blockColorBuilder.put(GLASS_MAP.get(color), ordinal);
blockColorBuilder.put(GLASS_PANE_MAP.get(color), ordinal);
blockColorBuilder.put(TERRACOTTA_MAP.get(color), ordinal);
blockColorBuilder.put(WOOL_MAP.get(color), ordinal);
blockColorBuilder.put(CARPET_MAP.get(color), ordinal);
blockColorBuilder.put(CONCRETE_MAP.get(color), ordinal);
blockColorBuilder.put(CONCRETE_POWDER_MAP.get(color), ordinal);
}
BLOCK_TO_COLOR_INDEX = blockColorBuilder.build();
}

private static final TriPredicate<IPaintable, IPaintable, Direction> paintablePredicate = (parent, child, dir) -> {
Expand Down Expand Up @@ -167,6 +184,21 @@ public static DyeColor getColor(ItemStack stack) {
return null;
}

/**
* Returns the spray can color index for the given block state: -1 for uncolored/solvent,
* 0-15 for a DyeColor ordinal, or null if the block is not supported by the spray can.
*/
@Nullable
@SuppressWarnings("unchecked")
public static Integer getBlockPickedColorIndex(BlockState state) {
for (Property<?> property : state.getProperties()) {
if (property.getValueClass() == DyeColor.class) {
return state.getValue((Property<DyeColor>) property).ordinal();
}
}
return BLOCK_TO_COLOR_INDEX.get(state.getBlock());
}

private void handleBlocks(BlockPos start, DyeColor color, int limit, UseOnContext context) {
final var level = context.getLevel();
var collected = BreadthFirstBlockSearch
Expand Down