Skip to content

add offhand auto coloring & color stripping for infinite spray can #40

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 1 commit into
base: main
Choose a base branch
from
+63 −15
Open

add offhand auto coloring & color stripping for infinite spray can #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/main/java/net/neganote/gtutilities/GregTechModernUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import net.neganote.gtutilities.client.renderer.SprayCanHudOverlay;
import net.neganote.gtutilities.client.renderer.UtilShaders;
import net.neganote.gtutilities.common.data.UtilPlaceholders;
import net.neganote.gtutilities.common.item.InfiniteSprayCanBehaviour;
import net.neganote.gtutilities.common.item.UtilItems;
import net.neganote.gtutilities.common.item.UtilToolItems;
import net.neganote.gtutilities.common.machine.UtilAEMachines;
Expand Down Expand Up @@ -72,6 +73,8 @@ public GregTechModernUtilities() {
// If we want to use annotations to register event listeners,
// we need to register our object like this!
MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.addListener(InfiniteSprayCanBehaviour::onBlockPlaced);
MinecraftForge.EVENT_BUS.addListener(InfiniteSprayCanBehaviour::onBlockBreak);
}

public static void init() {
Expand Down
75 changes: 60 additions & 15 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 @@ -36,6 +36,7 @@
import net.minecraft.world.level.block.state.properties.Property;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.util.TriPredicate;
import net.minecraftforge.event.level.BlockEvent;

import appeng.api.implementations.blockentities.IColorableBlockEntity;
import appeng.api.util.AEColor;
Expand Down Expand Up @@ -120,15 +121,64 @@ public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) {
int maxBlocksToRecolor = player.isShiftKeyDown() ? ConfigHolder.INSTANCE.tools.sprayCanChainLength : 1;

var pos = context.getClickedPos();
tryPaintAt(level, pos, selectedColor, maxBlocksToRecolor, player);

return InteractionResult.sidedSuccess(level.isClientSide);
}

private static void tryPaintAt(Level level, BlockPos pos, @Nullable DyeColor color, int limit, Player player) {
var first = level.getBlockEntity(pos);
if (first == null || !handleSpecialBlockEntities(first, color, limit, level, player))
handleBlocks(pos, color, limit, level);

if (first == null || !handleSpecialBlockEntities(first, selectedColor, maxBlocksToRecolor, context)) {
handleBlocks(pos, selectedColor, maxBlocksToRecolor, context);
}
GTSoundEntries.SPRAY_CAN_TOOL.play(level, null, player.position(), 1.0f, 1.0f);
}

private static boolean tryStripAt(Level level, BlockPos pos, Player player) {
var before = level.getBlockState(pos);
var be = level.getBlockEntity(pos);
if (be != null && handleSpecialBlockEntities(be, null, 1, level, player)) return true;

tryStripBlockColor(level, pos, before.getBlock());
return level.getBlockState(pos) != before;
}

public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
if (event.isCanceled()) return;
if (!(event.getEntity() instanceof Player player)) return;
if (!(event.getLevel() instanceof Level level)) return;

ItemStack offhand = player.getOffhandItem();
if (!(offhand.getItem() instanceof InfiniteSprayCanItem)) return;

tryPaintAt(level, event.getPos(), getColor(offhand), 1, player);
}

public static void onBlockBreak(BlockEvent.BreakEvent event) {
if (event.isCanceled()) return;
if (event.getPlayer() == null) return;
if (!(event.getLevel() instanceof Level level)) return;
var player = event.getPlayer();

var offhand = player.getOffhandItem();
if (!(offhand.getItem() instanceof InfiniteSprayCanItem)) return;

var pos = event.getPos();
var stateBefore = level.getBlockState(pos);

if (!tryStripAt(level, pos, player)) return;

GTSoundEntries.SPRAY_CAN_TOOL.play(level, null, player.position(), 1.0f, 1.0f);

return InteractionResult.sidedSuccess(level.isClientSide);
var stateAfter = level.getBlockState(pos);
if (stateAfter == stateBefore) return;
event.setCanceled(true);

var be = level.getBlockEntity(pos);
var tool = player.getMainHandItem();

level.removeBlock(pos, false);
if (!player.isCreative()) stateAfter.getBlock().playerDestroy(level, player, pos, stateAfter, be, tool);
}

@Override
Expand Down Expand Up @@ -167,8 +217,7 @@ public static DyeColor getColor(ItemStack stack) {
return null;
}

private void handleBlocks(BlockPos start, DyeColor color, int limit, UseOnContext context) {
final var level = context.getLevel();
private static void handleBlocks(BlockPos start, @Nullable DyeColor color, int limit, Level level) {
var collected = BreadthFirstBlockSearch
.conditionalBlockPosSearch(start,
(parent, child) -> parent == null ||
Expand All @@ -179,10 +228,8 @@ private void handleBlocks(BlockPos start, DyeColor color, int limit, UseOnContex
}
}

private boolean handleSpecialBlockEntities(BlockEntity first, DyeColor color, int limit, UseOnContext context) {
var player = context.getPlayer();
if (player == null) return false;

private static boolean handleSpecialBlockEntities(BlockEntity first, @Nullable DyeColor color, int limit,
Level level, Player player) {
if (GTCEu.Mods.isAE2Loaded() && first instanceof IColorableBlockEntity) {
var collected = BreadthFirstBlockSearch.conditionalSearch(
IColorableBlockEntity.class,
Expand Down Expand Up @@ -224,10 +271,8 @@ else if (first instanceof IPipeNode pipe) {

else if (first instanceof ShulkerBoxBlockEntity shulkerBox) {
var tag = shulkerBox.saveWithoutMetadata();
var level = first.getLevel();
var pos = first.getBlockPos();
recolorBlockNoState(SHULKER_BOX_MAP, color, level, pos, Blocks.SHULKER_BOX);
assert level != null;
if (level.getBlockEntity(pos) instanceof ShulkerBoxBlockEntity newShulker) {
newShulker.load(tag);
}
Expand All @@ -237,13 +282,13 @@ else if (first instanceof ShulkerBoxBlockEntity shulkerBox) {
return false;
}

private <T extends IPaintable> void paintPaintables(Set<T> paintables, DyeColor color) {
private static <T extends IPaintable> void paintPaintables(Set<T> paintables, @Nullable DyeColor color) {
for (var c : paintables) {
paintPaintable(c, color);
}
}

private void tryPaintBlock(Level level, BlockPos pos, DyeColor color) {
private static void tryPaintBlock(Level level, BlockPos pos, @Nullable DyeColor color) {
var blockState = level.getBlockState(pos);
var block = blockState.getBlock();
if (color == null) {
Expand All @@ -255,7 +300,7 @@ private void tryPaintBlock(Level level, BlockPos pos, DyeColor color) {
}
}

private void tryPaintSpecialBlock(Level world, BlockPos pos, Block block, DyeColor color) {
private static void tryPaintSpecialBlock(Level world, BlockPos pos, Block block, @Nullable DyeColor color) {
if (block.defaultBlockState().is(Tags.Blocks.GLASS)) {
if (recolorBlockNoState(GLASS_MAP, color, world, pos, Blocks.GLASS)) {
return;
Expand Down