fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pick 97420a31d The big reformat of 2020

Browse Source
This commit is contained in:
yueh
2020-06-16 21:41:28 +02:00
parent 5304b3febe
commit 5225ea426b
2252 changed files with 95466 additions and 118582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/me/pathfinding/AdHocChannelUpdater.java
+20 -26
View File
@@ -18,40 +18,34 @@
package appeng.me.pathfinding;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridConnectionVisitor;
import appeng.api.networking.IGridNode;
import appeng.me.GridConnection;
import appeng.me.GridNode;
public class AdHocChannelUpdater implements IGridConnectionVisitor {
public class AdHocChannelUpdater implements IGridConnectionVisitor
{
private final int usedChannels;
private final int usedChannels;
public AdHocChannelUpdater(final int used) {
this.usedChannels = used;
}
public AdHocChannelUpdater( final int used )
{
this.usedChannels = used;
}
@Override
public boolean visitNode(final IGridNode n) {
final GridNode gn = (GridNode) n;
gn.setControllerRoute(null, true);
gn.incrementChannelCount(this.usedChannels);
gn.finalizeChannels();
return true;
}
@Override
public boolean visitNode( final IGridNode n )
{
final GridNode gn = (GridNode) n;
gn.setControllerRoute( null, true );
gn.incrementChannelCount( this.usedChannels );
gn.finalizeChannels();
return true;
}
@Override
public void visitConnection( final IGridConnection gcc )
{
final GridConnection gc = (GridConnection) gcc;
gc.setControllerRoute( null, true );
gc.incrementChannelCount( this.usedChannels );
gc.finalizeChannels();
}
@Override
public void visitConnection(final IGridConnection gcc) {
final GridConnection gc = (GridConnection) gcc;
gc.setControllerRoute(null, true);
gc.incrementChannelCount(this.usedChannels);
gc.finalizeChannels();
}
}
src/main/java/appeng/me/pathfinding/ControllerChannelUpdater.java
+12 -17
View File
@@ -18,29 +18,24 @@
package appeng.me.pathfinding;
import appeng.api.networking.IGridConnection;
import appeng.api.networking.IGridConnectionVisitor;
import appeng.api.networking.IGridNode;
import appeng.me.GridConnection;
import appeng.me.GridNode;
public class ControllerChannelUpdater implements IGridConnectionVisitor {
public class ControllerChannelUpdater implements IGridConnectionVisitor
{
@Override
public boolean visitNode(final IGridNode n) {
final GridNode gn = (GridNode) n;
gn.finalizeChannels();
return true;
}
@Override
public boolean visitNode( final IGridNode n )
{
final GridNode gn = (GridNode) n;
gn.finalizeChannels();
return true;
}
@Override
public void visitConnection( final IGridConnection gcc )
{
final GridConnection gc = (GridConnection) gcc;
gc.finalizeChannels();
}
@Override
public void visitConnection(final IGridConnection gcc) {
final GridConnection gc = (GridConnection) gcc;
gc.finalizeChannels();
}
}
src/main/java/appeng/me/pathfinding/ControllerValidator.java
+51 -64
View File
@@ -18,7 +18,6 @@
package appeng.me.pathfinding;
import net.minecraft.util.math.BlockPos;
import appeng.api.networking.IGridHost;
@@ -26,79 +25,67 @@ import appeng.api.networking.IGridNode;
import appeng.api.networking.IGridVisitor;
import appeng.tile.networking.TileController;
public class ControllerValidator implements IGridVisitor {
public class ControllerValidator implements IGridVisitor
{
private boolean isValid = true;
private int found = 0;
private int minX;
private int minY;
private int minZ;
private int maxX;
private int maxY;
private int maxZ;
private boolean isValid = true;
private int found = 0;
private int minX;
private int minY;
private int minZ;
private int maxX;
private int maxY;
private int maxZ;
public ControllerValidator(final int x, final int y, final int z) {
this.minX = x;
this.maxX = x;
this.minY = y;
this.maxY = y;
this.minZ = z;
this.maxZ = z;
}
public ControllerValidator( final int x, final int y, final int z )
{
this.minX = x;
this.maxX = x;
this.minY = y;
this.maxY = y;
this.minZ = z;
this.maxZ = z;
}
@Override
public boolean visitNode(final IGridNode n) {
final IGridHost host = n.getMachine();
if (this.isValid() && host instanceof TileController) {
final TileController c = (TileController) host;
@Override
public boolean visitNode( final IGridNode n )
{
final IGridHost host = n.getMachine();
if( this.isValid() && host instanceof TileController )
{
final TileController c = (TileController) host;
final BlockPos pos = c.getPos();
final BlockPos pos = c.getPos();
this.minX = Math.min(pos.getX(), this.minX);
this.maxX = Math.max(pos.getX(), this.maxX);
this.minY = Math.min(pos.getY(), this.minY);
this.maxY = Math.max(pos.getY(), this.maxY);
this.minZ = Math.min(pos.getZ(), this.minZ);
this.maxZ = Math.max(pos.getZ(), this.maxZ);
this.minX = Math.min( pos.getX(), this.minX );
this.maxX = Math.max( pos.getX(), this.maxX );
this.minY = Math.min( pos.getY(), this.minY );
this.maxY = Math.max( pos.getY(), this.maxY );
this.minZ = Math.min( pos.getZ(), this.minZ );
this.maxZ = Math.max( pos.getZ(), this.maxZ );
if (this.maxX - this.minX < 7 && this.maxY - this.minY < 7 && this.maxZ - this.minZ < 7) {
this.setFound(this.getFound() + 1);
return true;
}
if( this.maxX - this.minX < 7 && this.maxY - this.minY < 7 && this.maxZ - this.minZ < 7 )
{
this.setFound( this.getFound() + 1 );
return true;
}
this.setValid(false);
} else {
return false;
}
this.setValid( false );
}
else
{
return false;
}
return this.isValid();
}
return this.isValid();
}
public boolean isValid() {
return this.isValid;
}
public boolean isValid()
{
return this.isValid;
}
private void setValid(final boolean isValid) {
this.isValid = isValid;
}
private void setValid( final boolean isValid )
{
this.isValid = isValid;
}
public int getFound() {
return this.found;
}
public int getFound()
{
return this.found;
}
private void setFound( final int found )
{
this.found = found;
}
private void setFound(final int found) {
this.found = found;
}
}
src/main/java/appeng/me/pathfinding/IPathItem.java
+25 -28
View File
@@ -18,44 +18,41 @@
package appeng.me.pathfinding;
import java.util.EnumSet;
import appeng.api.networking.GridFlags;
import appeng.api.util.IReadOnlyCollection;
public interface IPathItem {
public interface IPathItem
{
IPathItem getControllerRoute();
IPathItem getControllerRoute();
void setControllerRoute(IPathItem fast, boolean zeroOut);
void setControllerRoute( IPathItem fast, boolean zeroOut );
/**
* used to determine if the finder can continue.
*/
boolean canSupportMoreChannels();
/**
* used to determine if the finder can continue.
*/
boolean canSupportMoreChannels();
/**
* find possible choices for other pathing.
*/
IReadOnlyCollection<IPathItem> getPossibleOptions();
/**
* find possible choices for other pathing.
*/
IReadOnlyCollection<IPathItem> getPossibleOptions();
/**
* add one to the channel count, this is mostly for cables.
*/
void incrementChannelCount(int usedChannels);
/**
* add one to the channel count, this is mostly for cables.
*/
void incrementChannelCount( int usedChannels );
/**
* get the grid flags for this IPathItem.
*
* @return the flag set.
*/
EnumSet<GridFlags> getFlags();
/**
* get the grid flags for this IPathItem.
*
* @return the flag set.
*/
EnumSet<GridFlags> getFlags();
/**
* channels are done, wrap it up.
*/
void finalizeChannels();
/**
* channels are done, wrap it up.
*/
void finalizeChannels();
}
src/main/java/appeng/me/pathfinding/PathSegment.java
+93 -119
View File
@@ -18,7 +18,6 @@
package appeng.me.pathfinding;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Iterator;
@@ -30,142 +29,117 @@ import appeng.api.networking.IGridMultiblock;
import appeng.api.networking.IGridNode;
import appeng.me.cache.PathGridCache;
public class PathSegment {
public class PathSegment
{
private final PathGridCache pgc;
private final Set<IPathItem> semiOpen;
private final Set<IPathItem> closed;
private boolean isDead;
private List<IPathItem> open;
private final PathGridCache pgc;
private final Set<IPathItem> semiOpen;
private final Set<IPathItem> closed;
private boolean isDead;
private List<IPathItem> open;
public PathSegment(final PathGridCache myPGC, final List<IPathItem> open, final Set<IPathItem> semiOpen,
final Set<IPathItem> closed) {
this.open = open;
this.semiOpen = semiOpen;
this.closed = closed;
this.pgc = myPGC;
this.setDead(false);
}
public PathSegment( final PathGridCache myPGC, final List<IPathItem> open, final Set<IPathItem> semiOpen, final Set<IPathItem> closed )
{
this.open = open;
this.semiOpen = semiOpen;
this.closed = closed;
this.pgc = myPGC;
this.setDead( false );
}
public boolean step() {
final List<IPathItem> oldOpen = this.open;
this.open = new ArrayList<>();
public boolean step()
{
final List<IPathItem> oldOpen = this.open;
this.open = new ArrayList<>();
for (final IPathItem i : oldOpen) {
for (final IPathItem pi : i.getPossibleOptions()) {
final EnumSet<GridFlags> flags = pi.getFlags();
for( final IPathItem i : oldOpen )
{
for( final IPathItem pi : i.getPossibleOptions() )
{
final EnumSet<GridFlags> flags = pi.getFlags();
if (!this.closed.contains(pi)) {
pi.setControllerRoute(i, true);
if( !this.closed.contains( pi ) )
{
pi.setControllerRoute( i, true );
if (flags.contains(GridFlags.REQUIRE_CHANNEL)) {
// close the semi open.
if (!this.semiOpen.contains(pi)) {
final boolean worked;
if( flags.contains( GridFlags.REQUIRE_CHANNEL ) )
{
// close the semi open.
if( !this.semiOpen.contains( pi ) )
{
final boolean worked;
if (flags.contains(GridFlags.COMPRESSED_CHANNEL)) {
worked = this.useDenseChannel(pi);
} else {
worked = this.useChannel(pi);
}
if( flags.contains( GridFlags.COMPRESSED_CHANNEL ) )
{
worked = this.useDenseChannel( pi );
}
else
{
worked = this.useChannel( pi );
}
if (worked && flags.contains(GridFlags.MULTIBLOCK)) {
final Iterator<IGridNode> oni = ((IGridMultiblock) ((IGridNode) pi).getGridBlock())
.getMultiblockNodes();
while (oni.hasNext()) {
final IGridNode otherNodes = oni.next();
if (otherNodes != pi) {
this.semiOpen.add((IPathItem) otherNodes);
}
}
}
} else {
pi.incrementChannelCount(1); // give a channel.
this.semiOpen.remove(pi);
}
}
if( worked && flags.contains( GridFlags.MULTIBLOCK ) )
{
final Iterator<IGridNode> oni = ( (IGridMultiblock) ( (IGridNode) pi ).getGridBlock() ).getMultiblockNodes();
while( oni.hasNext() )
{
final IGridNode otherNodes = oni.next();
if( otherNodes != pi )
{
this.semiOpen.add( (IPathItem) otherNodes );
}
}
}
}
else
{
pi.incrementChannelCount( 1 ); // give a channel.
this.semiOpen.remove( pi );
}
}
this.closed.add(pi);
this.open.add(pi);
}
}
}
this.closed.add( pi );
this.open.add( pi );
}
}
}
return this.open.isEmpty();
}
return this.open.isEmpty();
}
private boolean useDenseChannel(final IPathItem start) {
IPathItem pi = start;
while (pi != null) {
if (!pi.canSupportMoreChannels() || pi.getFlags().contains(GridFlags.CANNOT_CARRY_COMPRESSED)) {
return false;
}
private boolean useDenseChannel( final IPathItem start )
{
IPathItem pi = start;
while( pi != null )
{
if( !pi.canSupportMoreChannels() || pi.getFlags().contains( GridFlags.CANNOT_CARRY_COMPRESSED ) )
{
return false;
}
pi = pi.getControllerRoute();
}
pi = pi.getControllerRoute();
}
pi = start;
while (pi != null) {
this.pgc.setChannelsByBlocks(this.pgc.getChannelsByBlocks() + 1);
pi.incrementChannelCount(1);
pi = pi.getControllerRoute();
}
pi = start;
while( pi != null )
{
this.pgc.setChannelsByBlocks( this.pgc.getChannelsByBlocks() + 1 );
pi.incrementChannelCount( 1 );
pi = pi.getControllerRoute();
}
this.pgc.setChannelsInUse(this.pgc.getChannelsInUse() + 1);
return true;
}
this.pgc.setChannelsInUse( this.pgc.getChannelsInUse() + 1 );
return true;
}
private boolean useChannel(final IPathItem start) {
IPathItem pi = start;
while (pi != null) {
if (!pi.canSupportMoreChannels()) {
return false;
}
private boolean useChannel( final IPathItem start )
{
IPathItem pi = start;
while( pi != null )
{
if( !pi.canSupportMoreChannels() )
{
return false;
}
pi = pi.getControllerRoute();
}
pi = pi.getControllerRoute();
}
pi = start;
while (pi != null) {
this.pgc.setChannelsByBlocks(this.pgc.getChannelsByBlocks() + 1);
pi.incrementChannelCount(1);
pi = pi.getControllerRoute();
}
pi = start;
while( pi != null )
{
this.pgc.setChannelsByBlocks( this.pgc.getChannelsByBlocks() + 1 );
pi.incrementChannelCount( 1 );
pi = pi.getControllerRoute();
}
this.pgc.setChannelsInUse(this.pgc.getChannelsInUse() + 1);
return true;
}
this.pgc.setChannelsInUse( this.pgc.getChannelsInUse() + 1 );
return true;
}
public boolean isDead() {
return this.isDead;
}
public boolean isDead()
{
return this.isDead;
}
public void setDead( final boolean isDead )
{
this.isDead = isDead;
}
public void setDead(final boolean isDead) {
this.isDead = isDead;
}
}