icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new loader

Browse Source
This commit is contained in:
gnembon committed 2019-11-20 01:16:46 -04:00
1 parent d2d3b2894e
commit f6eea46195
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/CarpetExpression.java
+3 -3
View File
@@ -901,7 +901,7 @@ public class CarpetExpression
BlockState targetBlockState = world.getBlockState(targetLocator.block.getPos()); BlockState targetBlockState = world.getBlockState(targetLocator.block.getPos());
if (sourceLocator.offset < lv.size()) if (sourceLocator.offset < lv.size())
{ {
StateManager<Block, BlockState> states = sourceBlockState.getBlock().getStateFactory(); StateManager<Block, BlockState> states = sourceBlockState.getBlock().getStateManager();
for (int i = sourceLocator.offset; i < lv.size(); i += 2) for (int i = sourceLocator.offset; i < lv.size(); i += 2)
{ {
String paramString = lv.get(i).evalValue(c).getString(); String paramString = lv.get(i).evalValue(c).getString();
@@ -1073,7 +1073,7 @@ public class CarpetExpression
if (lv.size() <= locator.offset) if (lv.size() <= locator.offset)
throw new InternalExpressionException("'property' requires to specify a property to query"); throw new InternalExpressionException("'property' requires to specify a property to query");
String tag = lv.get(locator.offset).evalValue(c).getString(); String tag = lv.get(locator.offset).evalValue(c).getString();
StateManager<Block, BlockState> states = state.getBlock().getStateFactory(); StateManager<Block, BlockState> states = state.getBlock().getStateManager();
Property<?> property = states.getProperty(tag); Property<?> property = states.getProperty(tag);
if (property == null) if (property == null)
return LazyValue.NULL; return LazyValue.NULL;
@@ -1085,7 +1085,7 @@ public class CarpetExpression
{ {
BlockValue.LocatorResult locator = BlockValue.fromParams((CarpetContext) c, lv, 0); BlockValue.LocatorResult locator = BlockValue.fromParams((CarpetContext) c, lv, 0);
BlockState state = locator.block.getBlockState(); BlockState state = locator.block.getBlockState();
StateManager<Block, BlockState> states = state.getBlock().getStateFactory(); StateManager<Block, BlockState> states = state.getBlock().getStateManager();
Value res = ListValue.wrap(states.getProperties().stream().map( Value res = ListValue.wrap(states.getProperties().stream().map(
p -> new StringValue(p.getName())).collect(Collectors.toList()) p -> new StringValue(p.getName())).collect(Collectors.toList())
); );