mirror of
https://github.com/VolmitSoftware/Iris.git
synced 2025-07-19 10:43:14 +00:00
Next step to free sizes for saplongs
This commit is contained in:
CocoTheOwner
parent
8f37dc8570
commit
71f067f678
@ -75,7 +75,7 @@ public class TreeManager implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Find best object placement based on sizes
|
// Find best object placement based on sizes
|
||||||
IrisObjectPlacement placement = getObjectPlacement(worldAccess, event.getLocation(), event.getSpecies(), null);
|
IrisObjectPlacement placement = getObjectPlacement(worldAccess, event.getLocation(), event.getSpecies(), new IrisTreeSize(1, 1));
|
||||||
|
|
||||||
// If none were found, just exit
|
// If none were found, just exit
|
||||||
if (placement == null) {
|
if (placement == null) {
|
||||||
@ -211,8 +211,8 @@ public class TreeManager implements Listener {
|
|||||||
private KList<IrisObjectPlacement> matchObjectPlacements(KList<IrisObjectPlacement> objects, IrisTreeSize size, TreeType type) {
|
private KList<IrisObjectPlacement> matchObjectPlacements(KList<IrisObjectPlacement> objects, IrisTreeSize size, TreeType type) {
|
||||||
|
|
||||||
Predicate<IrisTree> isValid = irisTree -> (
|
Predicate<IrisTree> isValid = irisTree -> (
|
||||||
irisTree.isAnySize() || irisTree.getSizes().stream().anyMatch(treeSize -> treeSize == IrisTreeSize.ANY || treeSize == size)) && (
|
irisTree.isAnySize() || irisTree.getSizes().stream().anyMatch(treeSize -> treeSize.doesMatch(size))) && (
|
||||||
irisTree.isAnyTree() || irisTree.getTreeTypes().stream().anyMatch(treeType -> treeType == type));
|
irisTree.isAnyTree() || irisTree.getTreeTypes().stream().anyMatch(treeType -> treeType.equals(type)));
|
||||||
|
|
||||||
objects.removeIf(objectPlacement -> objectPlacement.getTrees().stream().noneMatch(isValid));
|
objects.removeIf(objectPlacement -> objectPlacement.getTrees().stream().noneMatch(isValid));
|
||||||
|
|
||||||
|
|||||||
@ -1,188 +1,33 @@
|
|||||||
package com.volmit.iris.engine.object;
|
package com.volmit.iris.engine.object;
|
||||||
|
|
||||||
import com.volmit.iris.Iris;
|
|
||||||
import com.volmit.iris.engine.object.annotations.Desc;
|
import com.volmit.iris.engine.object.annotations.Desc;
|
||||||
import com.volmit.iris.util.collection.KList;
|
import com.volmit.iris.engine.object.annotations.Required;
|
||||||
import com.volmit.iris.util.collection.KMap;
|
import lombok.AllArgsConstructor;
|
||||||
import org.bukkit.Location;
|
import lombok.Data;
|
||||||
import org.bukkit.Material;
|
import lombok.NoArgsConstructor;
|
||||||
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
@Accessors(chain = true)
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
@Desc("Sapling override object picking options")
|
@Desc("Sapling override object picking options")
|
||||||
public enum IrisTreeSize {
|
@Data
|
||||||
|
public class IrisTreeSize {
|
||||||
|
|
||||||
@Desc("Only one sapling")
|
@Required
|
||||||
ONE,
|
@Desc("The width of the sapling area")
|
||||||
|
int width = 1;
|
||||||
|
|
||||||
@Desc("Two by two area")
|
@Required
|
||||||
TWO,
|
@Desc("The depth of the sapling area")
|
||||||
|
int depth = 1;
|
||||||
@Desc("Three by three any location")
|
|
||||||
THREE_ANY,
|
|
||||||
|
|
||||||
@Desc("Three by three area with center")
|
|
||||||
THREE_CENTER,
|
|
||||||
|
|
||||||
@Desc("Four by four")
|
|
||||||
FOUR,
|
|
||||||
|
|
||||||
@Desc("Five by five")
|
|
||||||
FIVE_ANY,
|
|
||||||
|
|
||||||
@Desc("Five by five center")
|
|
||||||
FIVE_CENTER,
|
|
||||||
|
|
||||||
@Desc("Any size")
|
|
||||||
ANY;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All sizes in this enum
|
* Does the size match
|
||||||
|
* @param size the size to check match
|
||||||
|
* @return true if it matches (fits within width and depth)
|
||||||
*/
|
*/
|
||||||
public static final KList<IrisTreeSize> sizes = new KList<>(ONE, TWO, THREE_ANY, THREE_CENTER, FOUR, FIVE_ANY, FIVE_CENTER);
|
public boolean doesMatch(IrisTreeSize size){
|
||||||
|
return (width <= size.getWidth() && depth <= size.getDepth()) || (depth <= size.getWidth() && width <= size.getDepth());
|
||||||
/**
|
|
||||||
* Get the best size to match against from a list of sizes
|
|
||||||
* @param sizes The list of sizes
|
|
||||||
* @return The best size (highest & center > any)
|
|
||||||
*/
|
|
||||||
public static IrisTreeSize bestSizeInSizes(KList<IrisTreeSize> sizes){
|
|
||||||
if (sizes.contains(ANY)){
|
|
||||||
return ANY;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(FIVE_CENTER)){
|
|
||||||
return FIVE_CENTER;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(FIVE_ANY)){
|
|
||||||
return FIVE_ANY;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(FOUR)){
|
|
||||||
return FOUR;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(THREE_CENTER)){
|
|
||||||
return THREE_CENTER;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(THREE_ANY)){
|
|
||||||
return THREE_ANY;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(TWO)){
|
|
||||||
return TWO;
|
|
||||||
}
|
|
||||||
else if (sizes.contains(ONE)){
|
|
||||||
return ONE;
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the size at a specific location is valid
|
|
||||||
* @param size the IrisTreeSize to check
|
|
||||||
* @param location at this location
|
|
||||||
* @return A list of locations if any match, or null if not.
|
|
||||||
*/
|
|
||||||
public static KList<KList<Location>> getPlacesIfValid (IrisTreeSize size, Location location) {
|
|
||||||
if (size == ANY){
|
|
||||||
Iris.debug("ANY was passed to getPlacesIfValid while it should never!");
|
|
||||||
}
|
|
||||||
return switch (size){
|
|
||||||
case ONE -> new KList<KList<Location>>(new KList<>(location));
|
|
||||||
case TWO -> loopLocation(location, 2);
|
|
||||||
case THREE_ANY -> loopLocation(location, 3);
|
|
||||||
case FOUR -> loopLocation(location, 4);
|
|
||||||
case FIVE_ANY -> loopLocation(location, 5);
|
|
||||||
case THREE_CENTER -> isCenterMapValid(location, 3);
|
|
||||||
case FIVE_CENTER -> isCenterMapValid(location, 5);
|
|
||||||
case ANY -> null;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check a map with
|
|
||||||
* @param center this block location as a center
|
|
||||||
* @param size with this size map
|
|
||||||
* @return A 2d KList of locations or null
|
|
||||||
*/
|
|
||||||
private static KList<KList<Location>> isCenterMapValid(Location center, int size) {
|
|
||||||
KList<KList<Location>> locations = getMap(size, center, true);
|
|
||||||
return isMapValid(locations, center.getBlock().getType()) ? locations : null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Loops over all possible squares based on
|
|
||||||
* @param center center position
|
|
||||||
* @param size a square size
|
|
||||||
* @return A list of matching locations, or null.
|
|
||||||
*/
|
|
||||||
private static KList<KList<Location>> loopLocation(Location center, int size){
|
|
||||||
Material blockType = center.getBlock().getType();
|
|
||||||
KList<KList<Location>> locations;
|
|
||||||
for (int i = -size + 1; i <= 0; i++){
|
|
||||||
for (int j = -size + 1; j <= 0; j++){
|
|
||||||
locations = getMap(size, center.clone().add(i, 0, j));
|
|
||||||
if (isMapValid(locations, blockType)){
|
|
||||||
return locations;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get if the map is valid, compared to a block material
|
|
||||||
* @param map The map to check inside of
|
|
||||||
* @param block The block material to check with
|
|
||||||
* @return True if it's valid
|
|
||||||
*/
|
|
||||||
private static boolean isMapValid(KList<KList<Location>> map, Material block){
|
|
||||||
if (map == null) return false;
|
|
||||||
return map.stream().allMatch(row -> row.stream().allMatch(location -> location.getBlock().getType().equals(block)));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a map with all blocks in a
|
|
||||||
* @param size `size * size` square area
|
|
||||||
* @param leftTop starting from the here
|
|
||||||
* @return A map with all block locations in the area
|
|
||||||
*/
|
|
||||||
private static KList<KList<Location>> getMap(int size, Location leftTop){
|
|
||||||
KList<KList<Location>> locations = new KList<>();
|
|
||||||
for (int i = 0; i < size; i++){
|
|
||||||
KList<Location> row = new KList<>();
|
|
||||||
for (int j = 0; j < size; j++){
|
|
||||||
row.add(leftTop.clone().add(i, 0, j));
|
|
||||||
}
|
|
||||||
locations.add(row);
|
|
||||||
}
|
|
||||||
return locations;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a map with all blocks in a
|
|
||||||
* @param size `size * size` square to check, must be odd (returns null if not)
|
|
||||||
* @param center from a center
|
|
||||||
* @param useCenter boolean toggle to call this function over IrisTreeSize#getMap(size, leftTop)
|
|
||||||
* @return A map with all block locations in the area
|
|
||||||
*/
|
|
||||||
private static KList<KList<Location>> getMap(int size, Location center, boolean useCenter){
|
|
||||||
if (size % 2 != 1){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return getMap(size, center.clone().add(-(size - 1) / 2d, 0, -(size - 1) / 2d));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get sizes hash with size -> location map
|
|
||||||
* @param location the location to search from
|
|
||||||
* @return A hash with IrisTreeSize -> KList-KList-Location
|
|
||||||
*/
|
|
||||||
public static KMap<IrisTreeSize, KList<KList<Location>>> getValidSizes(Location location) {
|
|
||||||
KMap<IrisTreeSize, KList<KList<Location>>> sizes = new KMap<>();
|
|
||||||
IrisTreeSize.sizes.forEach(size -> {
|
|
||||||
KList<KList<Location>> locations = getPlacesIfValid(size, location);
|
|
||||||
if (locations != null){
|
|
||||||
sizes.put(size, locations);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
return sizes;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user