Skip to content

Fixed NPE with Redstone++ #54

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
brisingraerowing wants to merge 2 commits into
base: 1.12
Choose a base branch
from
Open

Fixed NPE with Redstone++ #54

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92ec4a0
Fixed NPE with Redstone++
brisingraerowing Jun 5, 2018
c2d0c66
Remove unused import. Thanks, IntelliJ.
brisingraerowing Jun 5, 2018
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
26 changes: 17 additions & 9 deletions src/main/java/com/elytradev/movingworld/common/config/priority/AssemblePriorityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.config.Configuration;
import org.apache.commons.lang3.ArrayUtils;

import java.util.*;

public class AssemblePriorityConfig {
Expand Down Expand Up @@ -146,11 +146,16 @@ void discoverPoweredBlocks() {

for (Block checkBlock : allBlocks) {
IBlockState state = checkBlock.getDefaultState();
for (IProperty prop : state.getProperties().keySet()) {
if (prop.getName().equals("powered")) {
String poweredBlockName = Block.REGISTRY.getNameForObject(checkBlock).toString();
poweredBlockNames.add(poweredBlockName);
MovingWorldMod.LOG.info("Found powered block with name: " + poweredBlockName);
if (state != null) {
for (IProperty prop : state.getProperties().keySet()) {
if (prop.getName().equals("powered")) {
ResourceLocation loc = Block.REGISTRY.getNameForObject(checkBlock);
if (loc != null) {
String poweredBlockName = loc.toString();
poweredBlockNames.add(poweredBlockName);
MovingWorldMod.LOG.info("Found powered block with name: " + poweredBlockName);
}
}
}
}
}
Expand All @@ -162,13 +167,16 @@ void discoverPoweredBlocks() {

String[] defaultHighPriorityAssemblyBlockNames = new String[defaultHighPriorityAssemblyBlocks.length];
for (int i = 0; i < defaultHighPriorityAssemblyBlocks.length; i++) {
defaultHighPriorityAssemblyBlockNames[i] = Block.REGISTRY.getNameForObject(defaultHighPriorityAssemblyBlocks[i]).toString();
ResourceLocation loc = Block.REGISTRY.getNameForObject(defaultHighPriorityAssemblyBlocks[i]);
if (loc != null) {
defaultHighPriorityAssemblyBlockNames[i] = loc.toString();
}
}

config.get("mobile_chunk", "highpriorityassembly_blocks", defaultHighPriorityAssemblyBlockNames, "A list of blocks that should be set to air first, and then placed last when disassembled.").set(ArrayUtils.addAll(defaultHighPriorityAssemblyBlockNames, discoveredPoweredBlockNames));
config.get("mobile_chunk", "highpriorityassembly_blocks", defaultHighPriorityAssemblyBlockNames, "A list of blocks that should be set to air first, and then placed last when disassembled.").set(ArrayUtils.removeAllOccurences(ArrayUtils.addAll(defaultHighPriorityAssemblyBlockNames, discoveredPoweredBlockNames), null));
config.get(Configuration.CATEGORY_GENERAL, "Rediscover powered blocks on next restart?", true).set(false);

highPriorityAssembly = Sets.newHashSet(ArrayUtils.addAll(defaultHighPriorityAssemblyBlockNames, discoveredPoweredBlockNames));
highPriorityAssembly = Sets.newHashSet(ArrayUtils.removeAllOccurences(ArrayUtils.addAll(defaultHighPriorityAssemblyBlockNames, discoveredPoweredBlockNames), null));
}
}

Expand Down