Merge branch 'master' into 1.16

docs/scarpet/resources/editors/idea/2.txt

@@ -86,10 +86,12 @@ sky_light
 solid
 sound
 spawn
+spawn_potential
 stack_limit
 statistic
 store_app_data
 structures
+structure_eligibility
 structure_references
 suffocates
 tick_time

docs/scarpet/resources/editors/npp/scarpet.xml

@@ -54,8 +54,8 @@
                 hardness blast_resistance top loaded suffocates power ticks_randomly update block_tick random_tick in_slime_chunk
                 set without_updates
                 blocks_movement block_sound material map_colour property block_properties block_data poi set_poi
-                place_item set_biome biome loaded_status generation_status inhabited_time chunk_tickets
-                structures structure_references set_structure reset_chunk
+                place_item set_biome biome loaded_status generation_status inhabited_time spawn_potential chunk_tickets
+                structure_eligibility structures structure_references set_structure reset_chunk
 
                 scoreboard scoreboard_add scoreboard_remove scoreboard_display
 

src/main/java/carpet/script/CarpetExpression.java

@@ -1153,7 +1153,7 @@ public class CarpetExpression
                 if (!needSize) return LazyValue.TRUE;
                 Value ret = ListValue.of(
                         ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)),
-                        ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ))
+                        ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ))
                 );
                 return (_c, _t) -> ret;
             }
@@ -1165,7 +1165,7 @@ public class CarpetExpression
                 Value key = new StringValue(FeatureGenerator.structureToFeature.get(str.getName()).get(0));
                 ret.put(key, (!needSize)?Value.NULL:ListValue.of(
                         ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ)),
-                        ListValue.of(new NumericValue(box.minX), new NumericValue(box.minY), new NumericValue(box.minZ))
+                        ListValue.of(new NumericValue(box.maxX), new NumericValue(box.maxY), new NumericValue(box.maxZ))
                 ));
             }
             Value retMap = MapValue.wrap(ret);