Skip to content

Fix container placement issues #840

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

Merged
someaddons merged 1 commit into from
May 26, 2026
+1 −28
Merged

Fix container placement issues #840

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
24 changes: 0 additions & 24 deletions src/main/java/com/ldtteam/structurize/event/LifecycleSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,18 @@
import com.ldtteam.structurize.datagen.BlockTagProvider;
import com.ldtteam.structurize.datagen.EntityTagProvider;
import com.ldtteam.structurize.network.messages.*;
import com.ldtteam.structurize.placement.handlers.placement.PlacementHandlers;
import com.ldtteam.structurize.storage.ServerStructurePackLoader;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.DataGenerator;
import net.minecraft.world.level.block.Block;
import net.neoforged.bus.api.EventPriority;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.fml.ModList;
import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
import net.neoforged.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.neoforged.neoforge.data.event.GatherDataEvent;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
import org.jetbrains.annotations.NotNull;

import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Set;

public class LifecycleSubscriber
{
@SubscribeEvent
Expand Down Expand Up @@ -88,18 +78,4 @@ public static void onDatagen(@NotNull final GatherDataEvent event)
generator.addProvider(event.includeServer(), new BlockTagProvider(event.getGenerator().getPackOutput(), Registries.BLOCK, event.getLookupProvider(), event.getExistingFileHelper()));
generator.addProvider(event.includeClient(), new EntityTagProvider(event.getGenerator().getPackOutput(), Registries.ENTITY_TYPE, event.getLookupProvider(), event.getExistingFileHelper()));
}

@SubscribeEvent(priority = EventPriority.LOWEST)
public static void registerCaps(final RegisterCapabilitiesEvent event)
{
final Set<Block> containerBlocks = Collections.newSetFromMap(new IdentityHashMap<>());
for (final Block block : BuiltInRegistries.BLOCK)
{
if (event.isBlockRegistered(Capabilities.ItemHandler.BLOCK, block))
{
containerBlocks.add(block);
}
}
PlacementHandlers.ContainerPlacementHandler.CONTAINERS = containerBlocks;
}
}
5 changes: 1 addition & 4 deletions src/main/java/com/ldtteam/structurize/placement/handlers/placement/PlacementHandlers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.jetbrains.annotations.Nullable;

import java.util.*;
import java.util.concurrent.locks.Lock;

import static com.ldtteam.structurize.api.constants.Constants.UPDATE_FLAG;

Expand Down Expand Up @@ -913,12 +912,10 @@ public boolean doesWorldStateMatchBlueprintState(

public static class ContainerPlacementHandler implements IPlacementHandler
{
public static Set<Block> CONTAINERS = Set.of();

@Override
public boolean canHandle(final Level world, final BlockPos pos, final BlockState blockState)
{
return CONTAINERS.contains(blockState.getBlock());
return blockState.getBlock() instanceof BaseEntityBlock;
}

@Override
Expand Down
Loading