Skip to content

Support automatically mapping items of item displays #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
eclipseisoffline wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support automatically mapping items of item displays #39

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
7 changes: 7 additions & 0 deletions client/src/main/java/org/geysermc/rainbow/client/command/PackGeneratorCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import net.minecraft.world.phys.Vec3;
import org.geysermc.rainbow.client.PackManager;
import org.geysermc.rainbow.client.mapper.InventoryMapper;
import org.geysermc.rainbow.client.mapper.ItemDisplayMapper;
import org.geysermc.rainbow.client.mapper.PackMapper;
import org.geysermc.rainbow.client.mapper.RecipeMapper;
import org.geysermc.rainbow.pack.BedrockPack;
Expand Down Expand Up @@ -163,6 +164,12 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
source.sendFeedback(Component.translatable("commands.rainbow.automatic_inventory_mapping"));
}))
)
.then(ClientCommands.literal("item_display")
.executes(runWithPack(packManager, (source, _) -> {
packMapper.setItemProvider(ItemDisplayMapper.INSTANCE);
source.sendFeedback(Component.literal("item display auto mapping activated"));
}))
)
.then(ClientCommands.literal("recipes")
.executes(runWithPack(packManager, (source, _) -> {
source.sendFeedback(Component.translatable("commands.rainbow.automatic_recipe_mapping"));
Expand Down
37 changes: 37 additions & 0 deletions client/src/main/java/org/geysermc/rainbow/client/mapper/ItemDisplayMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package org.geysermc.rainbow.client.mapper;

import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.multiplayer.ClientPacketListener;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.world.entity.Display;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ItemStackTemplate;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

public final class ItemDisplayMapper implements CustomItemProvider {
public static final ItemDisplayMapper INSTANCE = new ItemDisplayMapper();

private ItemDisplayMapper() {}

@Override
public Collection<ItemStackTemplate> nextItems(LocalPlayer player, ClientPacketListener connection) {
List<ItemStackTemplate> items = new ArrayList<>();
((ClientLevel) player.level()).entitiesForRendering().forEach(entity -> {
if (entity instanceof Display.ItemDisplay itemDisplay) {
ItemStack stack = itemDisplay.getItemStack();
if (!stack.isEmpty()) {
items.add(ItemStackTemplate.fromNonEmptyStack(stack));
}
}
});
return items;
}

@Override
public boolean isDone() {
return true;
}
}
Loading