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

reformatted all src files (#141)

Browse Source
This commit is contained in:
YoungOnion
2022-09-17 05:08:02 -06:00
committed by GitHub
parent 3328bfcda2
commit 9011273229
1056 changed files with 88127 additions and 110597 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/paint/BlockPaint.java
+82 -102
View File
@@ -19,10 +19,10 @@
package appeng.block.paint;
import java.util.Collection;
import java.util.Collections;
import java.util.Random;
import appeng.block.AEBaseTileBlock;
import appeng.helpers.Splotch;
import appeng.tile.misc.TilePaint;
import appeng.util.Platform;
import net.minecraft.block.Block;
import net.minecraft.block.material.MapColor;
import net.minecraft.block.material.MaterialLiquid;
@@ -44,128 +44,108 @@ import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.block.AEBaseTileBlock;
import appeng.helpers.Splotch;
import appeng.tile.misc.TilePaint;
import appeng.util.Platform;
import java.util.Collection;
import java.util.Collections;
import java.util.Random;
public class BlockPaint extends AEBaseTileBlock
{
public class BlockPaint extends AEBaseTileBlock {
static final PaintSplotchesProperty SPLOTCHES = new PaintSplotchesProperty();
static final PaintSplotchesProperty SPLOTCHES = new PaintSplotchesProperty();
public BlockPaint()
{
super( new MaterialLiquid( MapColor.AIR ) );
public BlockPaint() {
super(new MaterialLiquid(MapColor.AIR));
this.setLightOpacity( 0 );
this.setFullSize( false );
this.setOpaque( false );
}
this.setLightOpacity(0);
this.setFullSize(false);
this.setOpaque(false);
}
@Override
protected BlockStateContainer createBlockState()
{
return new ExtendedBlockState( this, new IProperty[0], new IUnlistedProperty[] { SPLOTCHES } );
}
@Override
protected BlockStateContainer createBlockState() {
return new ExtendedBlockState(this, new IProperty[0], new IUnlistedProperty[]{SPLOTCHES});
}
@Override
public IBlockState getExtendedState( IBlockState state, IBlockAccess world, BlockPos pos )
{
IExtendedBlockState extState = (IExtendedBlockState) state;
@Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
IExtendedBlockState extState = (IExtendedBlockState) state;
TilePaint te = this.getTileEntity( world, pos );
TilePaint te = this.getTileEntity(world, pos);
Collection<Splotch> splotches = Collections.emptyList();
if( te != null )
{
splotches = te.getDots();
}
Collection<Splotch> splotches = Collections.emptyList();
if (te != null) {
splotches = te.getDots();
}
return extState.withProperty( SPLOTCHES, new PaintSplotches( splotches ) );
}
return extState.withProperty(SPLOTCHES, new PaintSplotches(splotches));
}
@Override
public BlockRenderLayer getBlockLayer()
{
return BlockRenderLayer.CUTOUT;
}
@Override
public BlockRenderLayer getBlockLayer() {
return BlockRenderLayer.CUTOUT;
}
@Override
@SideOnly( Side.CLIENT )
public void getSubBlocks( final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks )
{
// do nothing
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(final CreativeTabs tabs, final NonNullList<ItemStack> itemStacks) {
// do nothing
}
@Override
public AxisAlignedBB getCollisionBoundingBox( IBlockState blockState, IBlockAccess worldIn, BlockPos pos )
{
return null;
}
@Override
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, IBlockAccess worldIn, BlockPos pos) {
return null;
}
@Override
public boolean canCollideCheck( final IBlockState state, final boolean hitIfLiquid )
{
return false;
}
@Override
public boolean canCollideCheck(final IBlockState state, final boolean hitIfLiquid) {
return false;
}
@Override
public void neighborChanged( IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos )
{
final TilePaint tp = this.getTileEntity( world, pos );
@Override
public void neighborChanged(IBlockState state, World world, BlockPos pos, Block blockIn, BlockPos fromPos) {
final TilePaint tp = this.getTileEntity(world, pos);
if( tp != null )
{
tp.neighborChanged();
}
}
if (tp != null) {
tp.neighborChanged();
}
}
@Override
public Item getItemDropped( final IBlockState state, final Random rand, final int fortune )
{
return null;
}
@Override
public Item getItemDropped(final IBlockState state, final Random rand, final int fortune) {
return null;
}
@Override
public void dropBlockAsItemWithChance( final World worldIn, final BlockPos pos, final IBlockState state, final float chance, final int fortune )
{
@Override
public void dropBlockAsItemWithChance(final World worldIn, final BlockPos pos, final IBlockState state, final float chance, final int fortune) {
}
}
@Override
public void fillWithRain( final World w, final BlockPos pos )
{
if( Platform.isServer() )
{
w.setBlockToAir( pos );
}
}
@Override
public void fillWithRain(final World w, final BlockPos pos) {
if (Platform.isServer()) {
w.setBlockToAir(pos);
}
}
@Override
public int getLightValue( final IBlockState state, final IBlockAccess w, final BlockPos pos )
{
final TilePaint tp = this.getTileEntity( w, pos );
@Override
public int getLightValue(final IBlockState state, final IBlockAccess w, final BlockPos pos) {
final TilePaint tp = this.getTileEntity(w, pos);
if( tp != null )
{
return tp.getLightLevel();
}
if (tp != null) {
return tp.getLightLevel();
}
return 0;
}
return 0;
}
@Override
public boolean isAir( final IBlockState state, final IBlockAccess world, final BlockPos pos )
{
return true;
}
@Override
public boolean isAir(final IBlockState state, final IBlockAccess world, final BlockPos pos) {
return true;
}
@Override
public boolean isReplaceable( final IBlockAccess worldIn, final BlockPos pos )
{
return true;
}
@Override
public boolean isReplaceable(final IBlockAccess worldIn, final BlockPos pos) {
return true;
}
}
src/main/java/appeng/block/paint/PaintBakedModel.java
+122 -144
View File
@@ -1,16 +1,10 @@
package appeng.block.paint;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import javax.annotation.Nullable;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.core.AppEng;
import appeng.helpers.Splotch;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
@@ -22,9 +16,11 @@ import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.property.IExtendedBlockState;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.core.AppEng;
import appeng.helpers.Splotch;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
/**
@@ -32,168 +28,150 @@ import appeng.helpers.Splotch;
* a
* matter cannon with paint balls.
*/
class PaintBakedModel implements IBakedModel
{
class PaintBakedModel implements IBakedModel {
private static final ResourceLocation TEXTURE_PAINT1 = new ResourceLocation( AppEng.MOD_ID, "blocks/paint1" );
private static final ResourceLocation TEXTURE_PAINT2 = new ResourceLocation( AppEng.MOD_ID, "blocks/paint2" );
private static final ResourceLocation TEXTURE_PAINT3 = new ResourceLocation( AppEng.MOD_ID, "blocks/paint3" );
private static final ResourceLocation TEXTURE_PAINT1 = new ResourceLocation(AppEng.MOD_ID, "blocks/paint1");
private static final ResourceLocation TEXTURE_PAINT2 = new ResourceLocation(AppEng.MOD_ID, "blocks/paint2");
private static final ResourceLocation TEXTURE_PAINT3 = new ResourceLocation(AppEng.MOD_ID, "blocks/paint3");
private final VertexFormat vertexFormat;
private final VertexFormat vertexFormat;
private final TextureAtlasSprite[] textures;
private final TextureAtlasSprite[] textures;
PaintBakedModel( VertexFormat vertexFormat, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
{
this.vertexFormat = vertexFormat;
this.textures = new TextureAtlasSprite[] {
bakedTextureGetter.apply( TEXTURE_PAINT1 ),
bakedTextureGetter.apply( TEXTURE_PAINT2 ),
bakedTextureGetter.apply( TEXTURE_PAINT3 )
};
}
PaintBakedModel(VertexFormat vertexFormat, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
this.vertexFormat = vertexFormat;
this.textures = new TextureAtlasSprite[]{
bakedTextureGetter.apply(TEXTURE_PAINT1),
bakedTextureGetter.apply(TEXTURE_PAINT2),
bakedTextureGetter.apply(TEXTURE_PAINT3)
};
}
@Override
public List<BakedQuad> getQuads( @Nullable IBlockState state, @Nullable EnumFacing side, long rand )
{
if( side != null )
{
return Collections.emptyList();
}
@Override
public List<BakedQuad> getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, long rand) {
if (side != null) {
return Collections.emptyList();
}
if( !( state instanceof IExtendedBlockState ) )
{
// This is the inventory model which should usually not be used other than in special cases
List<BakedQuad> quads = new ArrayList<>( 1 );
CubeBuilder builder = new CubeBuilder( this.vertexFormat, quads );
builder.setTexture( this.textures[0] );
builder.addCube( 0, 0, 0, 16, 16, 16 );
return quads;
}
if (!(state instanceof IExtendedBlockState)) {
// This is the inventory model which should usually not be used other than in special cases
List<BakedQuad> quads = new ArrayList<>(1);
CubeBuilder builder = new CubeBuilder(this.vertexFormat, quads);
builder.setTexture(this.textures[0]);
builder.addCube(0, 0, 0, 16, 16, 16);
return quads;
}
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
PaintSplotches splotchesState = extendedBlockState.getValue( BlockPaint.SPLOTCHES );
IExtendedBlockState extendedBlockState = (IExtendedBlockState) state;
PaintSplotches splotchesState = extendedBlockState.getValue(BlockPaint.SPLOTCHES);
if( splotchesState == null )
{
return Collections.emptyList();
}
if (splotchesState == null) {
return Collections.emptyList();
}
List<Splotch> splotches = splotchesState.getSplotches();
List<Splotch> splotches = splotchesState.getSplotches();
CubeBuilder builder = new CubeBuilder( this.vertexFormat );
CubeBuilder builder = new CubeBuilder(this.vertexFormat);
float offsetConstant = 0.001f;
for( final Splotch s : splotches )
{
float offsetConstant = 0.001f;
for (final Splotch s : splotches) {
if( s.isLumen() )
{
builder.setColorRGB( s.getColor().whiteVariant );
builder.setRenderFullBright( true );
}
else
{
builder.setColorRGB( s.getColor().mediumVariant );
builder.setRenderFullBright( false );
}
if (s.isLumen()) {
builder.setColorRGB(s.getColor().whiteVariant);
builder.setRenderFullBright(true);
} else {
builder.setColorRGB(s.getColor().mediumVariant);
builder.setRenderFullBright(false);
}
float offset = offsetConstant;
offsetConstant += 0.001f;
float offset = offsetConstant;
offsetConstant += 0.001f;
final float buffer = 0.1f;
final float buffer = 0.1f;
float pos_x = s.x();
float pos_y = s.y();
float pos_x = s.x();
float pos_y = s.y();
pos_x = Math.max( buffer, Math.min( 1.0f - buffer, pos_x ) );
pos_y = Math.max( buffer, Math.min( 1.0f - buffer, pos_y ) );
pos_x = Math.max(buffer, Math.min(1.0f - buffer, pos_x));
pos_y = Math.max(buffer, Math.min(1.0f - buffer, pos_y));
TextureAtlasSprite ico = this.textures[s.getSeed() % this.textures.length];
builder.setTexture( ico );
builder.setCustomUv( s.getSide().getOpposite(), 0, 0, 16, 16 );
TextureAtlasSprite ico = this.textures[s.getSeed() % this.textures.length];
builder.setTexture(ico);
builder.setCustomUv(s.getSide().getOpposite(), 0, 0, 16, 16);
switch( s.getSide() )
{
case UP:
offset = 1.0f - offset;
builder.addQuad( EnumFacing.DOWN, pos_x - buffer, offset, pos_y - buffer,
pos_x + buffer, offset, pos_y + buffer );
break;
switch (s.getSide()) {
case UP:
offset = 1.0f - offset;
builder.addQuad(EnumFacing.DOWN, pos_x - buffer, offset, pos_y - buffer,
pos_x + buffer, offset, pos_y + buffer);
break;
case DOWN:
builder.addQuad( EnumFacing.UP, pos_x - buffer, offset, pos_y - buffer,
pos_x + buffer, offset, pos_y + buffer );
break;
case DOWN:
builder.addQuad(EnumFacing.UP, pos_x - buffer, offset, pos_y - buffer,
pos_x + buffer, offset, pos_y + buffer);
break;
case EAST:
offset = 1.0f - offset;
builder.addQuad( EnumFacing.WEST, offset, pos_x - buffer, pos_y - buffer,
offset, pos_x + buffer, pos_y + buffer );
break;
case EAST:
offset = 1.0f - offset;
builder.addQuad(EnumFacing.WEST, offset, pos_x - buffer, pos_y - buffer,
offset, pos_x + buffer, pos_y + buffer);
break;
case WEST:
builder.addQuad( EnumFacing.EAST, offset, pos_x - buffer, pos_y - buffer,
offset, pos_x + buffer, pos_y + buffer );
break;
case WEST:
builder.addQuad(EnumFacing.EAST, offset, pos_x - buffer, pos_y - buffer,
offset, pos_x + buffer, pos_y + buffer);
break;
case SOUTH:
offset = 1.0f - offset;
builder.addQuad( EnumFacing.NORTH, pos_x - buffer, pos_y - buffer, offset,
pos_x + buffer, pos_y + buffer, offset );
break;
case SOUTH:
offset = 1.0f - offset;
builder.addQuad(EnumFacing.NORTH, pos_x - buffer, pos_y - buffer, offset,
pos_x + buffer, pos_y + buffer, offset);
break;
case NORTH:
builder.addQuad( EnumFacing.SOUTH, pos_x - buffer, pos_y - buffer, offset,
pos_x + buffer, pos_y + buffer, offset );
break;
case NORTH:
builder.addQuad(EnumFacing.SOUTH, pos_x - buffer, pos_y - buffer, offset,
pos_x + buffer, pos_y + buffer, offset);
break;
default:
}
}
default:
}
}
return builder.getOutput();
}
return builder.getOutput();
}
@Override
public boolean isAmbientOcclusion()
{
return false;
}
@Override
public boolean isAmbientOcclusion() {
return false;
}
@Override
public boolean isGui3d()
{
return true;
}
@Override
public boolean isGui3d() {
return true;
}
@Override
public boolean isBuiltInRenderer()
{
return false;
}
@Override
public boolean isBuiltInRenderer() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return this.textures[0];
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.textures[0];
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return ItemCameraTransforms.DEFAULT;
}
@Override
public ItemCameraTransforms getItemCameraTransforms() {
return ItemCameraTransforms.DEFAULT;
}
@Override
public ItemOverrideList getOverrides()
{
return ItemOverrideList.NONE;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.NONE;
}
static List<ResourceLocation> getRequiredTextures()
{
return ImmutableList.of(
TEXTURE_PAINT1, TEXTURE_PAINT2, TEXTURE_PAINT3 );
}
static List<ResourceLocation> getRequiredTextures() {
return ImmutableList.of(
TEXTURE_PAINT1, TEXTURE_PAINT2, TEXTURE_PAINT3);
}
}
src/main/java/appeng/block/paint/PaintModel.java
+21 -27
View File
@@ -1,11 +1,6 @@
package appeng.block.paint;
import java.util.Collection;
import java.util.Collections;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
@@ -14,32 +9,31 @@ import net.minecraftforge.client.model.IModel;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
import java.util.Collection;
import java.util.Collections;
import java.util.function.Function;
class PaintModel implements IModel
{
@Override
public Collection<ResourceLocation> getDependencies()
{
return Collections.emptyList();
}
class PaintModel implements IModel {
@Override
public Collection<ResourceLocation> getTextures()
{
return PaintBakedModel.getRequiredTextures();
}
@Override
public Collection<ResourceLocation> getDependencies() {
return Collections.emptyList();
}
@Override
public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
{
return new PaintBakedModel( format, bakedTextureGetter );
}
@Override
public Collection<ResourceLocation> getTextures() {
return PaintBakedModel.getRequiredTextures();
}
@Override
public IModelState getDefaultState()
{
return TRSRTransformation.identity();
}
@Override
public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
return new PaintBakedModel(format, bakedTextureGetter);
}
@Override
public IModelState getDefaultState() {
return TRSRTransformation.identity();
}
}
src/main/java/appeng/block/paint/PaintRendering.java
+10 -14
View File
@@ -1,24 +1,20 @@
package appeng.block.paint;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.bootstrap.BlockRenderingCustomizer;
import appeng.bootstrap.IBlockRendering;
import appeng.bootstrap.IItemRendering;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
public class PaintRendering extends BlockRenderingCustomizer
{
public class PaintRendering extends BlockRenderingCustomizer {
@Override
@SideOnly( Side.CLIENT )
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
rendering.builtInModel( "models/block/paint", new PaintModel() );
// Disable auto rotation
rendering.modelCustomizer( ( location, model ) -> model );
}
@Override
@SideOnly(Side.CLIENT)
public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
rendering.builtInModel("models/block/paint", new PaintModel());
// Disable auto rotation
rendering.modelCustomizer((location, model) -> model);
}
}
src/main/java/appeng/block/paint/PaintSplotches.java
+11 -16
View File
@@ -1,31 +1,26 @@
package appeng.block.paint;
import java.util.Collection;
import java.util.List;
import appeng.helpers.Splotch;
import com.google.common.collect.ImmutableList;
import appeng.helpers.Splotch;
import java.util.Collection;
import java.util.List;
/**
* Used to transfer the state about paint splotches from the game thread to the render thread.
*/
class PaintSplotches
{
class PaintSplotches {
private final List<Splotch> splotches;
private final List<Splotch> splotches;
PaintSplotches( Collection<Splotch> splotches )
{
this.splotches = ImmutableList.copyOf( splotches );
}
PaintSplotches(Collection<Splotch> splotches) {
this.splotches = ImmutableList.copyOf(splotches);
}
List<Splotch> getSplotches()
{
return this.splotches;
}
List<Splotch> getSplotches() {
return this.splotches;
}
}
src/main/java/appeng/block/paint/PaintSplotchesProperty.java
+17 -23
View File
@@ -1,34 +1,28 @@
package appeng.block.paint;
import net.minecraftforge.common.property.IUnlistedProperty;
class PaintSplotchesProperty implements IUnlistedProperty<PaintSplotches>
{
class PaintSplotchesProperty implements IUnlistedProperty<PaintSplotches> {
@Override
public String getName()
{
return "paint_splots";
}
@Override
public String getName() {
return "paint_splots";
}
@Override
public boolean isValid( PaintSplotches value )
{
return value != null;
}
@Override
public boolean isValid(PaintSplotches value) {
return value != null;
}
@Override
public Class<PaintSplotches> getType()
{
return PaintSplotches.class;
}
@Override
public Class<PaintSplotches> getType() {
return PaintSplotches.class;
}
@Override
public String valueToString( PaintSplotches value )
{
return null;
}
@Override
public String valueToString(PaintSplotches value) {
return null;
}
}