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/services/compass/CompassException.java
+6 -9
View File
@@ -18,16 +18,13 @@
package appeng.services.compass;
public class CompassException extends RuntimeException {
public class CompassException extends RuntimeException
{
private static final long serialVersionUID = 8825268683203860877L;
private static final long serialVersionUID = 8825268683203860877L;
private final Throwable inner;
private final Throwable inner;
public CompassException( final Throwable t )
{
this.inner = t;
}
public CompassException(final Throwable t) {
this.inner = t;
}
}
src/main/java/appeng/services/compass/CompassReader.java
+34 -43
View File
@@ -18,62 +18,53 @@
package appeng.services.compass;
import com.google.common.base.Preconditions;
import net.minecraft.world.server.ServerWorld;
import java.util.HashMap;
import java.util.Map;
import com.google.common.base.Preconditions;
public final class CompassReader
{
private final Map<Long, CompassRegion> regions = new HashMap<>( 100 );
private final ServerWorld world;
import net.minecraft.world.server.ServerWorld;
public CompassReader( ServerWorld world )
{
this.world = Preconditions.checkNotNull( world );
}
public final class CompassReader {
private final Map<Long, CompassRegion> regions = new HashMap<>(100);
private final ServerWorld world;
public void close()
{
for( final CompassRegion r : this.regions.values() )
{
r.close();
}
public CompassReader(ServerWorld world) {
this.world = Preconditions.checkNotNull(world);
}
this.regions.clear();
}
public void close() {
for (final CompassRegion r : this.regions.values()) {
r.close();
}
public void setHasBeacon( final int cx, final int cz, final int cdy, final boolean hasBeacon )
{
final CompassRegion r = this.getRegion( cx, cz );
this.regions.clear();
}
r.setHasBeacon( cx, cz, cdy, hasBeacon );
}
public void setHasBeacon(final int cx, final int cz, final int cdy, final boolean hasBeacon) {
final CompassRegion r = this.getRegion(cx, cz);
public boolean hasBeacon( final int cx, final int cz )
{
final CompassRegion r = this.getRegion( cx, cz );
r.setHasBeacon(cx, cz, cdy, hasBeacon);
}
return r.hasBeacon( cx, cz );
}
public boolean hasBeacon(final int cx, final int cz) {
final CompassRegion r = this.getRegion(cx, cz);
private CompassRegion getRegion( final int cx, final int cz )
{
long pos = cx >> 10;
pos <<= 32;
pos |= ( cz >> 10 );
return r.hasBeacon(cx, cz);
}
CompassRegion cr = this.regions.get( pos );
private CompassRegion getRegion(final int cx, final int cz) {
long pos = cx >> 10;
pos <<= 32;
pos |= (cz >> 10);
if( cr == null )
{
cr = new CompassRegion( world, cx, cz );
this.regions.put( pos, cr );
}
CompassRegion cr = this.regions.get(pos);
return cr;
}
if (cr == null) {
cr = new CompassRegion(world, cx, cz);
this.regions.put(pos, cr);
}
return cr;
}
}
src/main/java/appeng/services/compass/CompassRegion.java
+90 -109
View File
@@ -18,145 +18,126 @@
package appeng.services.compass;
import com.google.common.base.Preconditions;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.world.storage.WorldSavedData;
final class CompassRegion
{
private final int lowX;
private final int lowZ;
private final ServerWorld world;
private SaveData data;
final class CompassRegion {
private final int lowX;
private final int lowZ;
private final ServerWorld world;
private SaveData data;
public CompassRegion(ServerWorld world, final int cx, final int cz )
{
Preconditions.checkNotNull( world );
public CompassRegion(ServerWorld world, final int cx, final int cz) {
Preconditions.checkNotNull(world);
this.world = world;
this.world = world;
final int region_x = cx >> 10;
final int region_z = cz >> 10;
final int region_x = cx >> 10;
final int region_z = cz >> 10;
this.lowX = region_x << 10;
this.lowZ = region_z << 10;
this.lowX = region_x << 10;
this.lowZ = region_z << 10;
this.openData(false);
}
this.openData(false);
}
void close()
{
if( this.data != null )
{
this.data = null;
}
}
void close() {
if (this.data != null) {
this.data = null;
}
}
boolean hasBeacon( int cx, int cz )
{
if( this.data != null )
{
cx &= 0x3FF;
cz &= 0x3FF;
boolean hasBeacon(int cx, int cz) {
if (this.data != null) {
cx &= 0x3FF;
cz &= 0x3FF;
final int val = this.read( cx, cz );
return val != 0;
}
final int val = this.read(cx, cz);
return val != 0;
}
return false;
}
return false;
}
void setHasBeacon( int cx, int cz, final int cdy, final boolean hasBeacon )
{
cx &= 0x3FF;
cz &= 0x3FF;
void setHasBeacon(int cx, int cz, final int cdy, final boolean hasBeacon) {
cx &= 0x3FF;
cz &= 0x3FF;
this.openData( hasBeacon );
this.openData(hasBeacon);
if( this.data != null )
{
int val = this.read( cx, cz );
final int originalVal = val;
if (this.data != null) {
int val = this.read(cx, cz);
final int originalVal = val;
if( hasBeacon )
{
val |= 1 << cdy;
}
else
{
val &= ~( 1 << cdy );
}
if (hasBeacon) {
val |= 1 << cdy;
} else {
val &= ~(1 << cdy);
}
if( originalVal != val )
{
this.write( cx, cz, val );
}
}
}
if (originalVal != val) {
this.write(cx, cz, val);
}
}
}
private void openData(final boolean create )
{
if( this.data != null )
{
return;
}
private void openData(final boolean create) {
if (this.data != null) {
return;
}
String name = this.lowX + "_" + this.lowZ;
String name = this.lowX + "_" + this.lowZ;
if (create) {
this.data = world.getSavedData().getOrCreate(() -> new SaveData(name), name);
if (this.data.bitmap == null) {
this.data.bitmap = new byte[SaveData.BITMAP_LENGTH];
}
} else {
this.data = world.getSavedData().get(() -> new SaveData(name), name);
}
}
if (create) {
this.data = world.getSavedData().getOrCreate(() -> new SaveData(name), name);
if (this.data.bitmap == null) {
this.data.bitmap = new byte[SaveData.BITMAP_LENGTH];
}
} else {
this.data = world.getSavedData().get(() -> new SaveData(name), name);
}
}
private int read( final int cx, final int cz )
{
try
{
return this.data.bitmap[cx + cz * 0x400];
}
catch( final IndexOutOfBoundsException outOfBounds )
{
return 0;
}
}
private int read(final int cx, final int cz) {
try {
return this.data.bitmap[cx + cz * 0x400];
} catch (final IndexOutOfBoundsException outOfBounds) {
return 0;
}
}
private void write( final int cx, final int cz, final int val )
{
this.data.bitmap[cx + cz * 0x400] = (byte) val;
this.data.markDirty();
}
private void write(final int cx, final int cz, final int val) {
this.data.bitmap[cx + cz * 0x400] = (byte) val;
this.data.markDirty();
}
private static class SaveData extends WorldSavedData {
private static class SaveData extends WorldSavedData {
private static final int BITMAP_LENGTH = 0x400 * 0x400;
private static final int BITMAP_LENGTH = 0x400 * 0x400;
private byte[] bitmap;
private byte[] bitmap;
public SaveData(String name) {
super(name);
}
public SaveData(String name) {
super(name);
}
@Override
public void read(CompoundNBT nbt) {
this.bitmap = nbt.getByteArray("b");
if (this.bitmap.length != BITMAP_LENGTH) {
throw new IllegalStateException("Invalid bitmap length: " + bitmap.length);
}
}
@Override
public void read(CompoundNBT nbt) {
this.bitmap = nbt.getByteArray("b");
if (this.bitmap.length != BITMAP_LENGTH) {
throw new IllegalStateException("Invalid bitmap length: " + bitmap.length);
}
}
@Override
public CompoundNBT write(CompoundNBT compound) {
compound.putByteArray("b", bitmap);
return compound;
}
@Override
public CompoundNBT write(CompoundNBT compound) {
compound.putByteArray("b", bitmap);
return compound;
}
}
}
}
src/main/java/appeng/services/compass/CompassThreadFactory.java
+6 -10
View File
@@ -18,26 +18,22 @@
package appeng.services.compass;
import java.util.concurrent.ThreadFactory;
import javax.annotation.Nonnull;
import com.google.common.base.Preconditions;
/**
* @author thatsIch
* @version rv3 - 31.05.2015
* @since rv3 31.05.2015
*/
public final class CompassThreadFactory implements ThreadFactory
{
@Override
public Thread newThread( @Nonnull final Runnable job )
{
Preconditions.checkNotNull( job );
public final class CompassThreadFactory implements ThreadFactory {
@Override
public Thread newThread(@Nonnull final Runnable job) {
Preconditions.checkNotNull(job);
return new Thread( job, "AE Compass Service" );
}
return new Thread(job, "AE Compass Service");
}
}
src/main/java/appeng/services/compass/ICompassCallback.java
+10 -12
View File
@@ -18,17 +18,15 @@
package appeng.services.compass;
public interface ICompassCallback {
public interface ICompassCallback
{
/**
* Called from another thread.
*
* @param hasResult true if found a target
* @param spin true if should spin
* @param radians radians
* @param dist distance
*/
void calculatedDirection( boolean hasResult, boolean spin, double radians, double dist );
/**
* Called from another thread.
*
* @param hasResult true if found a target
* @param spin true if should spin
* @param radians radians
* @param dist distance
*/
void calculatedDirection(boolean hasResult, boolean spin, double radians, double dist);
}