mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
cyberpwn
2022-01-12 01:47:38 -05:00
parent 8c00499e76
commit 2dde426df6
463 changed files with 11845 additions and 10159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java
View File

@@ -93,7 +93,7 @@ public class PlannedPiece {
}
public AxisAlignedBB getBox() {
if (box != null) {
if(box != null) {
return box;
}
@@ -111,18 +111,18 @@ public class PlannedPiece {
}
public KList<IrisJigsawPieceConnector> getAvailableConnectors() {
if (connected.isEmpty()) {
if(connected.isEmpty()) {
return piece.getConnectors().copy();
}
if (connected.size() == piece.getConnectors().size()) {
if(connected.size() == piece.getConnectors().size()) {
return new KList<>();
}
KList<IrisJigsawPieceConnector> c = new KList<>();
for (IrisJigsawPieceConnector i : piece.getConnectors()) {
if (!connected.contains(i)) {
for(IrisJigsawPieceConnector i : piece.getConnectors()) {
if(!connected.contains(i)) {
c.add(i);
}
}
@@ -131,7 +131,7 @@ public class PlannedPiece {
}
public boolean connect(IrisJigsawPieceConnector c) {
if (piece.getConnectors().contains(c)) {
if(piece.getConnectors().contains(c)) {
return connected.addIfMissing(c);
}
@@ -154,10 +154,10 @@ public class PlannedPiece {
PlatformChunkGenerator a = IrisToolbelt.access(world);
int minY = 0;
if (a != null) {
if(a != null) {
minY = a.getEngine().getMinHeight();
if (!a.getEngine().getDimension().isBedrock())
if(!a.getEngine().getDimension().isBedrock())
minY--; //If the dimension has no bedrock, allow it to go a block lower
}
@@ -183,19 +183,19 @@ public class PlannedPiece {
Block block = world.getBlockAt(x, y, z);
//Prevent blocks being set in or bellow bedrock
if (y <= finalMinY || block.getType() == Material.BEDROCK) return;
if(y <= finalMinY || block.getType() == Material.BEDROCK) return;
block.setBlockData(d);
if (a != null && getPiece().getPlacementOptions().getLoot().isNotEmpty() &&
block.getState() instanceof InventoryHolder) {
if(a != null && getPiece().getPlacementOptions().getLoot().isNotEmpty() &&
block.getState() instanceof InventoryHolder) {
IrisLootTable table = getPiece().getPlacementOptions().getTable(block.getBlockData(), getData());
if (table == null) return;
if(table == null) return;
Engine engine = a.getEngine();
engine.addItems(false, ((InventoryHolder) block.getState()).getInventory(),
rng.nextParallelRNG(BlockPosition.toLong(x, y, z)),
new KList<>(table), InventorySlotType.STORAGE, x, y, z, 15);
rng.nextParallelRNG(BlockPosition.toLong(x, y, z)),
new KList<>(table), InventorySlotType.STORAGE, x, y, z, 15);
}
}
@@ -243,7 +243,7 @@ public class PlannedPiece {
@Override
public Engine getEngine() {
if (IrisToolbelt.isIrisWorld(world)) {
if(IrisToolbelt.isIrisWorld(world)) {
return IrisToolbelt.access(world).getEngine();
}

92
src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java
View File

@@ -43,11 +43,11 @@ import org.bukkit.World;
@Data
public class PlannedStructure {
private static transient ConcurrentLinkedHashMap<String, IrisObject> objectRotationCache
= new ConcurrentLinkedHashMap.Builder<String, IrisObject>()
.initialCapacity(64)
.maximumWeightedCapacity(1024)
.concurrencyLevel(32)
.build();
= new ConcurrentLinkedHashMap.Builder<String, IrisObject>()
.initialCapacity(64)
.maximumWeightedCapacity(1024)
.concurrencyLevel(32)
.build();
private KList<PlannedPiece> pieces;
private IrisJigsawStructure structure;
private IrisPosition position;
@@ -66,7 +66,7 @@ public class PlannedStructure {
this.data = structure.getLoader();
generateStartPiece();
for (int i = 0; i < structure.getMaxDepth(); i++) {
for(int i = 0; i < structure.getMaxDepth(); i++) {
generateOutwards();
}
@@ -74,7 +74,7 @@ public class PlannedStructure {
Iris.debug("JPlace: ROOT @ relative " + position.toString());
for (PlannedPiece i : pieces) {
for(PlannedPiece i : pieces) {
Iris.debug("Place: " + i.getObject().getLoadKey() + " at @ relative " + i.getPosition().toString());
}
}
@@ -84,7 +84,7 @@ public class PlannedStructure {
options.getRotation().setEnabled(false);
int startHeight = pieces.get(0).getPosition().getY();
for (PlannedPiece i : pieces) {
for(PlannedPiece i : pieces) {
place(i, startHeight, options, placer, e, eng);
}
}
@@ -92,7 +92,7 @@ public class PlannedStructure {
public void place(PlannedPiece i, int startHeight, IrisObjectPlacement o, IObjectPlacer placer, Mantle e, Engine eng) {
IrisObjectPlacement options = o;
if (i.getPiece().getPlacementOptions() != null) {
if(i.getPiece().getPlacementOptions() != null) {
options = i.getPiece().getPlacementOptions();
options.getRotation().setEnabled(false);
} else {
@@ -109,8 +109,8 @@ public class PlannedStructure {
int offset = i.getPosition().getY() - startHeight;
int height = 0;
if (i.getStructure().getStructure().getLockY() == -1) {
if (i.getStructure().getStructure().getOverrideYRange() != null) {
if(i.getStructure().getStructure().getLockY() == -1) {
if(i.getStructure().getStructure().getOverrideYRange() != null) {
height = (int) i.getStructure().getStructure().getOverrideYRange().get(rng, xx, zz, getData());
} else {
height = placer.getHighest(xx, zz, getData());
@@ -121,24 +121,24 @@ public class PlannedStructure {
height += offset + (v.getH() / 2);
if (options.getMode().equals(ObjectPlaceMode.PAINT)) {
if(options.getMode().equals(ObjectPlaceMode.PAINT)) {
height = -1;
}
int id = rng.i(0, Integer.MAX_VALUE);
vo.place(xx, height, zz, placer, options, rng, e.shouldReduce(eng) ? null : (b)
-> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData());
-> e.set(b.getX(), b.getY(), b.getZ(), v.getLoadKey() + "@" + id), null, getData());
}
public void place(World world) {
for (PlannedPiece i : pieces) {
for(PlannedPiece i : pieces) {
Iris.sq(() -> i.place(world));
}
}
private void generateOutwards() {
for (PlannedPiece i : getPiecesWithAvailableConnectors().shuffle(rng)) {
if (!generatePieceOutwards(i)) {
for(PlannedPiece i : getPiecesWithAvailableConnectors().shuffle(rng)) {
if(!generatePieceOutwards(i)) {
i.setDead(true);
}
}
@@ -147,8 +147,8 @@ public class PlannedStructure {
private boolean generatePieceOutwards(PlannedPiece piece) {
boolean b = false;
for (IrisJigsawPieceConnector i : piece.getAvailableConnectors().shuffleCopy(rng)) {
if (generateConnectorOutwards(piece, i)) {
for(IrisJigsawPieceConnector i : piece.getAvailableConnectors().shuffleCopy(rng)) {
if(generateConnectorOutwards(piece, i)) {
b = true;
}
}
@@ -157,8 +157,8 @@ public class PlannedStructure {
}
private boolean generateConnectorOutwards(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector) {
for (IrisJigsawPiece i : getShuffledPiecesFor(pieceConnector)) {
if (generateRotatedPiece(piece, pieceConnector, i)) {
for(IrisJigsawPiece i : getShuffledPiecesFor(pieceConnector)) {
if(generateRotatedPiece(piece, pieceConnector, i)) {
return true;
}
}
@@ -167,8 +167,8 @@ public class PlannedStructure {
}
private boolean generateRotatedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, IrisJigsawPiece idea) {
if (!piece.getPiece().getPlacementOptions().getRotation().isEnabled()) {
if (generateRotatedPiece(piece, pieceConnector, idea, 0, 0, 0)) {
if(!piece.getPiece().getPlacementOptions().getRotation().isEnabled()) {
if(generateRotatedPiece(piece, pieceConnector, idea, 0, 0, 0)) {
return true;
}
}
@@ -176,23 +176,23 @@ public class PlannedStructure {
KList<Integer> forder1 = new KList<Integer>().qadd(0).qadd(1).qadd(2).qadd(3).shuffle(rng);
KList<Integer> forder2 = new KList<Integer>().qadd(0).qadd(1).qadd(2).qadd(3).shuffle(rng);
for (Integer i : forder1) {
if (pieceConnector.isRotateConnector()) {
for(Integer i : forder1) {
if(pieceConnector.isRotateConnector()) {
assert pieceConnector.getDirection().getAxis() != null;
if (!pieceConnector.getDirection().getAxis().equals(Axis.Y)) {
for (Integer j : forder2) {
if (pieceConnector.getDirection().getAxis().equals(Axis.X) && generateRotatedPiece(piece, pieceConnector, idea, j, i, 0)) {
if(!pieceConnector.getDirection().getAxis().equals(Axis.Y)) {
for(Integer j : forder2) {
if(pieceConnector.getDirection().getAxis().equals(Axis.X) && generateRotatedPiece(piece, pieceConnector, idea, j, i, 0)) {
return true;
}
if (pieceConnector.getDirection().getAxis().equals(Axis.Z) && generateRotatedPiece(piece, pieceConnector, idea, 0, i, j)) {
if(pieceConnector.getDirection().getAxis().equals(Axis.Z) && generateRotatedPiece(piece, pieceConnector, idea, 0, i, j)) {
return true;
}
}
}
}
if (generateRotatedPiece(piece, pieceConnector, idea, 0, i, 0)) {
if(generateRotatedPiece(piece, pieceConnector, idea, 0, i, 0)) {
return true;
}
}
@@ -201,14 +201,14 @@ public class PlannedStructure {
}
private boolean generateRotatedPiece(PlannedPiece piece, IrisJigsawPieceConnector pieceConnector, IrisJigsawPiece idea, IrisObjectRotation rotation) {
if (!idea.getPlacementOptions().getRotation().isEnabled()) {
if(!idea.getPlacementOptions().getRotation().isEnabled()) {
rotation = piece.getRotation();
}
PlannedPiece test = new PlannedPiece(this, piece.getPosition(), idea, rotation);
for (IrisJigsawPieceConnector j : test.getPiece().getConnectors().shuffleCopy(rng)) {
if (generatePositionedPiece(piece, pieceConnector, test, j)) {
for(IrisJigsawPieceConnector j : test.getPiece().getConnectors().shuffleCopy(rng)) {
if(generatePositionedPiece(piece, pieceConnector, test, j)) {
return true;
}
}
@@ -229,18 +229,18 @@ public class PlannedStructure {
IrisDirection desiredDirection = pieceConnector.getDirection().reverse();
IrisPosition desiredPosition = connector.sub(new IrisPosition(desiredDirection.toVector()));
if (!pieceConnector.getTargetName().equals("*") && !pieceConnector.getTargetName().equals(testConnector.getName())) {
if(!pieceConnector.getTargetName().equals("*") && !pieceConnector.getTargetName().equals(testConnector.getName())) {
return false;
}
if (!testConnector.getDirection().equals(desiredDirection)) {
if(!testConnector.getDirection().equals(desiredDirection)) {
return false;
}
IrisPosition shift = test.getWorldPosition(testConnector);
test.setPosition(desiredPosition.sub(shift));
if (collidesWith(test, piece)) {
if(collidesWith(test, piece)) {
return false;
}
@@ -254,11 +254,11 @@ public class PlannedStructure {
private KList<IrisJigsawPiece> getShuffledPiecesFor(IrisJigsawPieceConnector c) {
KList<IrisJigsawPiece> p = new KList<>();
for (String i : c.getPools().shuffleCopy(rng)) {
for (String j : getData().getJigsawPoolLoader().load(i).getPieces().shuffleCopy(rng)) {
for(String i : c.getPools().shuffleCopy(rng)) {
for(String j : getData().getJigsawPoolLoader().load(i).getPieces().shuffleCopy(rng)) {
IrisJigsawPiece pi = getData().getJigsawPieceLoader().load(j);
if (pi == null || (terminating && !pi.isTerminal())) {
if(pi == null || (terminating && !pi.isTerminal())) {
continue;
}
@@ -273,7 +273,7 @@ public class PlannedStructure {
}
private void generateTerminators() {
if (getStructure().isTerminate()) {
if(getStructure().isTerminate()) {
terminating = true;
generateOutwards();
}
@@ -286,7 +286,7 @@ public class PlannedStructure {
public int getVolume() {
int v = 0;
for (PlannedPiece i : pieces) {
for(PlannedPiece i : pieces) {
v += i.getObject().getH() * i.getObject().getW() * i.getObject().getD();
}
@@ -296,7 +296,7 @@ public class PlannedStructure {
public int getMass() {
int v = 0;
for (PlannedPiece i : pieces) {
for(PlannedPiece i : pieces) {
v += i.getObject().getBlocks().size();
}
@@ -304,12 +304,12 @@ public class PlannedStructure {
}
public boolean collidesWith(PlannedPiece piece, PlannedPiece ignore) {
for (PlannedPiece i : pieces) {
if (i.equals(ignore)) {
for(PlannedPiece i : pieces) {
if(i.equals(ignore)) {
continue;
}
if (i.collidesWith(piece)) {
if(i.collidesWith(piece)) {
return true;
}
}
@@ -318,8 +318,8 @@ public class PlannedStructure {
}
public boolean contains(IrisPosition p) {
for (PlannedPiece i : pieces) {
if (i.contains(p)) {
for(PlannedPiece i : pieces) {
if(i.contains(p)) {
return true;
}
}