Skip to content

Fixed 2 issues with lockgen code: #65

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
Laike-Endaril wants to merge 1 commit into
base: 1.12.2
Choose a base branch
from
Open

Fixed 2 issues with lockgen code: #65

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
40 changes: 27 additions & 13 deletions src/main/java/melonslise/locks/common/event/LocksEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package melonslise.locks.common.event;

import java.util.HashSet;
import java.util.List;
import java.util.Map.Entry;
import java.util.Random;
Expand Down Expand Up @@ -63,6 +64,8 @@
@Mod.EventBusSubscriber(modid = Locks.ID)
public final class LocksEvents
{
protected static final HashSet<PopulateChunkEvent.Post> DELAYED_POPULATION_EVENTS = new HashSet<>();

private LocksEvents() {}

@SubscribeEvent
Expand Down Expand Up @@ -114,20 +117,31 @@ public static void onWorldLoad(WorldEvent.Load event)
@SubscribeEvent
public static void onChunkPopulate(PopulateChunkEvent.Post event)
{
World world = event.getWorld();
Random rand = event.getRand();
double ch = LocksConfig.COMMON.generationChance;
if(ch == 0d || rand.nextDouble() > ch)
return;
ILockableStorage lockables = world.getCapability(LocksCapabilities.LOCKABLES, null);
for(Entry<BlockPos, TileEntity> entry : world.getChunkFromChunkCoords(event.getChunkX(), event.getChunkZ()).getTileEntityMap().entrySet())
DELAYED_POPULATION_EVENTS.add(event);
}

@SubscribeEvent
protected static void delayedPopulation(TickEvent.ServerTickEvent tickEvent)
{
if (tickEvent.phase != Phase.START) return;
DELAYED_POPULATION_EVENTS.removeIf(event ->
{
BlockPos pos = entry.getKey();
if(!(entry.getValue() instanceof TileEntityChest) || lockables.get().values().stream().anyMatch(lockable1 -> lockable1.box.intersects(pos)))
continue;
BlockPos adjPos = LocksUtil.getAdjacentChest((TileEntityChest) entry.getValue());
lockables.add(new Lockable(new Cuboid6i(pos, adjPos == null ? pos : adjPos), new Lock(rand.nextInt(), LocksConfig.COMMON.randLockLen(rand), true), Orientation.fromDirection(world.getBlockState(pos).getValue(BlockChest.FACING), EnumFacing.NORTH)));
}
World world = event.getWorld();
Random rand = event.getRand();
double ch = LocksConfig.COMMON.generationChance;
ILockableStorage lockables = world.getCapability(LocksCapabilities.LOCKABLES, null);
for(Entry<BlockPos, TileEntity> entry : world.getChunkFromChunkCoords(event.getChunkX(), event.getChunkZ()).getTileEntityMap().entrySet())
{
BlockPos pos = entry.getKey();
if(ch == 0d || rand.nextDouble() > ch)
continue;
if (!(entry.getValue() instanceof TileEntityChest) || lockables.get().values().stream().anyMatch(lockable1 -> lockable1.box.intersects(pos)))
continue;
BlockPos adjPos = LocksUtil.getAdjacentChest((TileEntityChest) entry.getValue());
lockables.add(new Lockable(new Cuboid6i(pos, adjPos == null ? pos : adjPos), new Lock(rand.nextInt(), LocksConfig.COMMON.randLockLen(rand), true), Orientation.fromDirection(world.getBlockState(pos).getValue(BlockChest.FACING), EnumFacing.NORTH)));
}
return true;
});
}

public static void syncLockables(World world, int dimId)
Expand Down