mirror of
https://github.com/GTNewHorizons/StructureLib.git
synced 2026-11-17 10:55:13 +00:00
Add reject_continue to PlaceResult and make SKIP short-circuit in ofChain (#63)
ofChain survival placement had a bug where SKIP (returned when a block already exists) would not stop the chain, causing fallback alternatives to replace already valid blocks , for example: <img width="436" height="477" alt="image" src="https://github.com/user-attachments/assets/7ff3d6fa-de98-4716-823f-3ad2abab7394" /> SKIP now short-circuits the chain, remaining alternatives are skipped because the position is already valid. To keep correct behavior for elements without autobuild (which previously returned SKIP as a "no implementation" signal), a new REJECT_CONTINUE value is added, which: continues silently like SKIP (no error, not counted) in the walker and in the chain tries the next alternative like REJECT Default survivalPlaceBlock and IStructureElementCheckOnly now return REJECT_CONTINUE instead of SKIP for unhandled paths. Tested this with the example above, and fixed the issue: <img width="435" height="498" alt="image" src="https://github.com/user-attachments/assets/d92bce4d-b5ad-4051-af79-ffd8c819f9f7" /> survival placement also still works: <img width="1234" height="916" alt="image" src="https://github.com/user-attachments/assets/632d5556-524d-4dc5-a7f5-75c859cb6b70" /> this should ideally merged before https://github.com/GTNewHorizons/GT5-Unofficial/pull/6922 , to fix this underlying bug, but if possible not be tagged without the other PR, which would cause all NEI previews of multis with water to not show any water anymore --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
1 parent
95d1533342
commit
287e8317c9
5 files changed
+37
-27
No files matched your search
@@ -791,7 +791,7 @@ public class StructureUtility {
|
||||
public PlaceResult survivalPlaceBlock(T t, World world, int x, int y, int z, ItemStack trigger,
|
||||
AutoPlaceEnvironment env) {
|
||||
Pair<Block, Integer> hint = getHint(trigger);
|
||||
if (hint == null) return PlaceResult.REJECT; // TODO or SKIP?
|
||||
if (hint == null) return PlaceResult.REJECT;
|
||||
Block block = world.getBlock(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
TIER tier = tierExtractor.convert(block, meta);
|
||||
@@ -2032,11 +2032,11 @@ public class StructureUtility {
|
||||
/**
|
||||
* Enable this structure element only if given predicate returns true.
|
||||
* <p>
|
||||
* Return SKIP when survival auto place if given predicate returns false.
|
||||
* Return REJECT_CONTINUE when survival auto place if given predicate returns false.
|
||||
*/
|
||||
public static <T> IStructureElement<T> onlyIf(Predicate<? super T> predicate,
|
||||
IStructureElement<? super T> downstream) {
|
||||
return onlyIf(predicate, downstream, PlaceResult.SKIP);
|
||||
return onlyIf(predicate, downstream, PlaceResult.REJECT_CONTINUE);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2111,10 +2111,10 @@ public class StructureUtility {
|
||||
* using {@link #isAir()}. It will not attempt to capture any errors though, so next one will not be tried if
|
||||
* previous one would crash.
|
||||
* <p>
|
||||
* (*): For survival auto place, it will * REJECT, if all structure element REJECT * SKIP, if 1 or more structure
|
||||
* element SKIP and the rest structure element (0 or more) REJECT * any other result, **immediately** upon any
|
||||
* structure element returns these other results. This behavior is not 100% fixed and might change later on, but we
|
||||
* will send the notice on a best effort basis.
|
||||
* (*): For survival auto place, it will: REJECT, if any structure element returns REJECT (and none returned ACCEPT,
|
||||
* STOP, ACCEPT_STOP, or SKIP); REJECT_CONTINUE, if all structure elements return REJECT_CONTINUE (none returned
|
||||
* REJECT); SKIP, as soon as any structure element returns SKIP; any other result, immediately upon any structure
|
||||
* element returning those.
|
||||
* <p>
|
||||
* Take care while chaining, as it will try to call every structure element until it returns true. If none does it
|
||||
* will finally return false.
|
||||
|
||||
Reference in new issue
Block a user