lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix state parsing (#1573)

Browse source
This commit is contained in:
Nicholas Ignoffo 2019-04-14 08:23:02 -07:00
parent 53b6030ba9
commit f832103386
1 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/main/java/WayofTime/bloodmagic/util/StateUtil.java
View file

@ -8,30 +8,31 @@ import net.minecraft.init.Blocks;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.ForgeRegistries;
public class StateUtil public class StateUtil {
{ public static IBlockState parseState(String state) {
public static IBlockState parseState(String blockInfo) if (state.contains("[")) {
{ String[] split = state.split("\\[");
String[] split = blockInfo.split("\\["); split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state
split[1] = split[1].substring(0, split[1].lastIndexOf("]")); // Make sure brackets are removed from state
Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0])); // Find the block Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(split[0]));
if (block == Blocks.AIR) if (block == Blocks.AIR)
return Blocks.AIR.getDefaultState(); // The block is air, so we're looking at invalid data return block.getDefaultState();
BlockStateContainer blockState = block.getBlockState(); BlockStateContainer blockState = block.getBlockState();
IBlockState returnState = blockState.getBaseState(); IBlockState returnState = blockState.getBaseState();
// Force our values into the state // Force our values into the state
String[] stateValues = split[1].split(","); // Splits up each value String[] stateValues = split[1].split(","); // Splits up each value
for (String value : stateValues) for (String value : stateValues) {
{ String[] valueSplit = value.split("=");
String[] valueSplit = value.split("="); // Separates property and value IProperty property = blockState.getProperty(valueSplit[0]);
IProperty property = blockState.getProperty(valueSplit[0]); if (property != null)
if (property != null) returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get());
returnState = returnState.withProperty(property, (Comparable) property.parseValue(valueSplit[1]).get()); // Force the property into the state }
return returnState;
} else {
return ForgeRegistries.BLOCKS.getValue(new ResourceLocation(state)).getDefaultState();
} }
return returnState;
} }
} }