Skip to content
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

allow function block accept the same format as function set & block_state #1620

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

allow function block accept the same format as function set & block_state #1620

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25f0b41
need to test if everything ok
17183248569 Oct 15, 2023
1f86abd
ah. now it is required
17183248569 Oct 15, 2023
5fd481a
format, change to use Pair instead
17183248569 Oct 16, 2023
70e34ec
use camelCase
17183248569 Oct 16, 2023
143eb92
add that usage in doc
17183248569 Oct 16, 2023
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
115 changes: 68 additions & 47 deletions src/main/java/carpet/script/api/WorldAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,14 @@ public static void apply(Expression expression)
{
throw new InternalExpressionException("Block requires at least one parameter");
}
BlockValue retval = BlockArgument.findIn(cc, lv, 0, true).block;

BlockArgument locator = BlockArgument.findIn(cc, lv, 0, true);
BlockValue retval = locator.block;
if (lv.size() > locator.offset)
{
var rl = find_blockstate_extra_args(lv, locator.offset, retval.getBlockState(), retval.getString());
return new BlockValue((BlockState) rl[1], cc.level(), (CompoundTag) (rl[0] == null ? retval.getData():rl[0]));
}
// fixing block state and data
retval.getBlockState();
retval.getData();
Expand Down Expand Up @@ -750,52 +757,8 @@ else if (!("any".equals(statusString)))
CompoundTag data = null;
if (lv.size() > sourceLocator.offset)
{
List<Value> args = new ArrayList<>();
for (int i = sourceLocator.offset, m = lv.size(); i < m; i++)
{
args.add(lv.get(i));
}
if (args.get(0) instanceof final ListValue list)
{
if (args.size() == 2 && NBTSerializableValue.fromValue(args.get(1)) instanceof final NBTSerializableValue nbtsv)
{
data = nbtsv.getCompoundTag();
}
args = list.getItems();
}
else if (args.get(0) instanceof final MapValue map)
{
if (args.size() == 2 && NBTSerializableValue.fromValue(args.get(1)) instanceof final NBTSerializableValue nbtsv)
{
data = nbtsv.getCompoundTag();
}
Map<Value, Value> state = map.getMap();
List<Value> mapargs = new ArrayList<>();
state.forEach((k, v) -> {
mapargs.add(k);
mapargs.add(v);
});
args = mapargs;
}
else
{
if ((args.size() & 1) == 1 && NBTSerializableValue.fromValue(args.get(args.size() - 1)) instanceof final NBTSerializableValue nbtsv)
{
data = nbtsv.getCompoundTag();
}
}
StateDefinition<Block, BlockState> states = sourceBlockState.getBlock().getStateDefinition();
for (int i = 0; i < args.size() - 1; i += 2)
{
String paramString = args.get(i).getString();
Property<?> property = states.getProperty(paramString);
if (property == null)
{
throw new InternalExpressionException("Property " + paramString + " doesn't apply to " + sourceLocator.block.getString());
}
String paramValue = args.get(i + 1).getString();
sourceBlockState = setProperty(property, paramString, paramValue, sourceBlockState);
}
var rl = find_blockstate_extra_args(lv,sourceLocator.offset,sourceBlockState,sourceLocator.block.getString());
data=(CompoundTag) rl[0];sourceBlockState=(BlockState) rl[1];
17183248569 marked this conversation as resolved.
Show resolved Hide resolved
}

if (data == null)
Expand Down Expand Up @@ -1797,4 +1760,62 @@ public static double sampleNoise(NoiseRouter router, ServerLevel level, String w
}
return DensityFunctions.zero();
});

private static Object[] find_blockstate_extra_args(List<Value> lv, int start,BlockState sourceBlockState,String name_in_exception){
17183248569 marked this conversation as resolved.
Show resolved Hide resolved
CompoundTag data = null;
List<Value> args = new ArrayList<>();
for (int i = start, m = lv.size(); i < m; i++)
gnembon marked this conversation as resolved.
Show resolved Hide resolved
{
args.add(lv.get(i));
}
if (args.get(0) instanceof ListValue)
{
if (args.size() == 2)
{
Value dataValue = NBTSerializableValue.fromValue( args.get(1));
if (dataValue instanceof NBTSerializableValue)
{
data = ((NBTSerializableValue) dataValue).getCompoundTag();
}
}
args = ((ListValue) args.get(0)).getItems();
}
else if (args.get(0) instanceof MapValue)
{
if (args.size() == 2)
{
Value dataValue = NBTSerializableValue.fromValue( args.get(1));
if (dataValue instanceof NBTSerializableValue)
{
data = ((NBTSerializableValue) dataValue).getCompoundTag();
}
}
Map<Value, Value> state = ((MapValue) args.get(0)).getMap();
List<Value> mapargs = new ArrayList<>();
state.forEach( (k, v) -> {mapargs.add(k); mapargs.add(v);});
args = mapargs;
}
else
{
if ((args.size() & 1) == 1)
{
Value dataValue = NBTSerializableValue.fromValue( args.get(args.size()-1));
if (dataValue instanceof NBTSerializableValue)
{
data = ((NBTSerializableValue) dataValue).getCompoundTag();
}
}
}
StateDefinition<Block, BlockState> states = sourceBlockState.getBlock().getStateDefinition();
for (int i = 0; i < args.size()-1; i += 2)
{
String paramString = args.get(i).getString();
Property<?> property = states.getProperty(paramString);
if (property == null)
throw new InternalExpressionException("Property " + paramString + " doesn't apply to " + name_in_exception);
String paramValue = args.get(i + 1).getString();
sourceBlockState = setProperty(property, paramString, paramValue, sourceBlockState);
}
return new Object[]{data,sourceBlockState};
};
}