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/client/render/spatial/SpatialPylonBakedModel.java
+146 -184
View File
@@ -18,10 +18,15 @@
package appeng.client.render.spatial;
import java.util.List;
import java.util.Map;
import java.util.Random;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.tile.spatial.TileSpatialPylon;
import com.google.common.collect.ImmutableMap;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.ItemOverrideList;
@@ -30,217 +35,174 @@ import net.minecraft.util.Direction;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Map;
import java.util.Random;
import appeng.client.render.cablebus.CubeBuilder;
import appeng.tile.spatial.TileSpatialPylon;
/**
* The baked model that will be used for rendering the spatial pylon.
*/
class SpatialPylonBakedModel implements IDynamicBakedModel
{
class SpatialPylonBakedModel implements IDynamicBakedModel {
private final Map<SpatialPylonTextureType, TextureAtlasSprite> textures;
private final Map<SpatialPylonTextureType, TextureAtlasSprite> textures;
SpatialPylonBakedModel( Map<SpatialPylonTextureType, TextureAtlasSprite> textures )
{
this.textures = ImmutableMap.copyOf( textures );
}
SpatialPylonBakedModel(Map<SpatialPylonTextureType, TextureAtlasSprite> textures) {
this.textures = ImmutableMap.copyOf(textures);
}
@Nonnull
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) {
int flags = this.getFlags( extraData );
@Nonnull
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand,
@Nonnull IModelData extraData) {
int flags = this.getFlags(extraData);
CubeBuilder builder = new CubeBuilder();
CubeBuilder builder = new CubeBuilder();
if( flags != 0 )
{
Direction ori = null;
int displayAxis = flags & TileSpatialPylon.DISPLAY_Z;
if( displayAxis == TileSpatialPylon.DISPLAY_X )
{
ori = Direction.EAST;
if (flags != 0) {
Direction ori = null;
int displayAxis = flags & TileSpatialPylon.DISPLAY_Z;
if (displayAxis == TileSpatialPylon.DISPLAY_X) {
ori = Direction.EAST;
if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
builder.setUvRotation( Direction.SOUTH, 1 );
builder.setUvRotation( Direction.NORTH, 1 );
builder.setUvRotation( Direction.UP, 2 );
builder.setUvRotation( Direction.DOWN, 2 );
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
builder.setUvRotation( Direction.SOUTH, 2 );
builder.setUvRotation( Direction.NORTH, 2 );
builder.setUvRotation( Direction.UP, 1 );
builder.setUvRotation( Direction.DOWN, 1 );
}
else
{
builder.setUvRotation( Direction.SOUTH, 1 );
builder.setUvRotation( Direction.NORTH, 1 );
builder.setUvRotation( Direction.UP, 1 );
builder.setUvRotation( Direction.DOWN, 1 );
}
}
if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) {
builder.setUvRotation(Direction.SOUTH, 1);
builder.setUvRotation(Direction.NORTH, 1);
builder.setUvRotation(Direction.UP, 2);
builder.setUvRotation(Direction.DOWN, 2);
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) {
builder.setUvRotation(Direction.SOUTH, 2);
builder.setUvRotation(Direction.NORTH, 2);
builder.setUvRotation(Direction.UP, 1);
builder.setUvRotation(Direction.DOWN, 1);
} else {
builder.setUvRotation(Direction.SOUTH, 1);
builder.setUvRotation(Direction.NORTH, 1);
builder.setUvRotation(Direction.UP, 1);
builder.setUvRotation(Direction.DOWN, 1);
}
}
else if( displayAxis == TileSpatialPylon.DISPLAY_Y )
{
ori = Direction.UP;
if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
builder.setUvRotation( Direction.NORTH, 3 );
builder.setUvRotation( Direction.SOUTH, 3 );
builder.setUvRotation( Direction.EAST, 3 );
builder.setUvRotation( Direction.WEST, 3 );
}
}
else if (displayAxis == TileSpatialPylon.DISPLAY_Y) {
ori = Direction.UP;
if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) {
builder.setUvRotation(Direction.NORTH, 3);
builder.setUvRotation(Direction.SOUTH, 3);
builder.setUvRotation(Direction.EAST, 3);
builder.setUvRotation(Direction.WEST, 3);
}
}
else if( displayAxis == TileSpatialPylon.DISPLAY_Z )
{
ori = Direction.NORTH;
if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
builder.setUvRotation( Direction.EAST, 2 );
builder.setUvRotation( Direction.WEST, 1 );
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
builder.setUvRotation( Direction.EAST, 1 );
builder.setUvRotation( Direction.WEST, 2 );
builder.setUvRotation( Direction.UP, 3 );
builder.setUvRotation( Direction.DOWN, 3 );
}
else
{
builder.setUvRotation( Direction.EAST, 1 );
builder.setUvRotation( Direction.WEST, 2 );
}
}
else if (displayAxis == TileSpatialPylon.DISPLAY_Z) {
ori = Direction.NORTH;
if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) {
builder.setUvRotation(Direction.EAST, 2);
builder.setUvRotation(Direction.WEST, 1);
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) {
builder.setUvRotation(Direction.EAST, 1);
builder.setUvRotation(Direction.WEST, 2);
builder.setUvRotation(Direction.UP, 3);
builder.setUvRotation(Direction.DOWN, 3);
} else {
builder.setUvRotation(Direction.EAST, 1);
builder.setUvRotation(Direction.WEST, 2);
}
}
builder.setTextures( this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.UP ) ),
this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.DOWN ) ),
this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.NORTH ) ),
this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.SOUTH ) ),
this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.EAST ) ),
this.textures.get( getTextureTypeFromSideOutside( flags, ori, Direction.WEST ) ) );
builder.addCube( 0, 0, 0, 16, 16, 16 );
builder.setTextures(this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.UP)),
this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.DOWN)),
this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.NORTH)),
this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.SOUTH)),
this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.EAST)),
this.textures.get(getTextureTypeFromSideOutside(flags, ori, Direction.WEST)));
builder.addCube(0, 0, 0, 16, 16, 16);
if( ( flags & TileSpatialPylon.DISPLAY_POWERED_ENABLED ) == TileSpatialPylon.DISPLAY_POWERED_ENABLED )
{
builder.setRenderFullBright( true );
}
if ((flags & TileSpatialPylon.DISPLAY_POWERED_ENABLED) == TileSpatialPylon.DISPLAY_POWERED_ENABLED) {
builder.setRenderFullBright(true);
}
builder.setTextures( this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.UP ) ),
this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.DOWN ) ),
this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.NORTH ) ),
this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.SOUTH ) ),
this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.EAST ) ),
this.textures.get( getTextureTypeFromSideInside( flags, ori, Direction.WEST ) ) );
builder.addCube( 0, 0, 0, 16, 16, 16 );
}
else
{
builder.setTexture( this.textures.get( SpatialPylonTextureType.BASE ) );
builder.addCube( 0, 0, 0, 16, 16, 16 );
builder.setTextures(this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.UP)),
this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.DOWN)),
this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.NORTH)),
this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.SOUTH)),
this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.EAST)),
this.textures.get(getTextureTypeFromSideInside(flags, ori, Direction.WEST)));
builder.addCube(0, 0, 0, 16, 16, 16);
} else {
builder.setTexture(this.textures.get(SpatialPylonTextureType.BASE));
builder.addCube(0, 0, 0, 16, 16, 16);
builder.setTexture( this.textures.get( SpatialPylonTextureType.DIM ) );
builder.addCube( 0, 0, 0, 16, 16, 16 );
}
builder.setTexture(this.textures.get(SpatialPylonTextureType.DIM));
builder.addCube(0, 0, 0, 16, 16, 16);
}
return builder.getOutput();
}
return builder.getOutput();
}
private int getFlags( IModelData modelData )
{
Integer flags = modelData.getData(TileSpatialPylon.STATE);
return flags != null ? flags : 0;
}
private int getFlags(IModelData modelData) {
Integer flags = modelData.getData(TileSpatialPylon.STATE);
return flags != null ? flags : 0;
}
private static SpatialPylonTextureType getTextureTypeFromSideOutside( int flags, Direction ori, Direction dir )
{
if( ori == dir || ori.getOpposite() == dir )
{
return SpatialPylonTextureType.BASE;
}
private static SpatialPylonTextureType getTextureTypeFromSideOutside(int flags, Direction ori, Direction dir) {
if (ori == dir || ori.getOpposite() == dir) {
return SpatialPylonTextureType.BASE;
}
if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_MIDDLE )
{
return SpatialPylonTextureType.BASE_SPANNED;
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
return SpatialPylonTextureType.BASE_END;
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
return SpatialPylonTextureType.BASE_END;
}
if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_MIDDLE) {
return SpatialPylonTextureType.BASE_SPANNED;
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) {
return SpatialPylonTextureType.BASE_END;
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) {
return SpatialPylonTextureType.BASE_END;
}
return SpatialPylonTextureType.BASE;
}
return SpatialPylonTextureType.BASE;
}
private static SpatialPylonTextureType getTextureTypeFromSideInside( int flags, Direction ori, Direction dir )
{
final boolean good = ( flags & TileSpatialPylon.DISPLAY_ENABLED ) == TileSpatialPylon.DISPLAY_ENABLED;
private static SpatialPylonTextureType getTextureTypeFromSideInside(int flags, Direction ori, Direction dir) {
final boolean good = (flags & TileSpatialPylon.DISPLAY_ENABLED) == TileSpatialPylon.DISPLAY_ENABLED;
if( ori == dir || ori.getOpposite() == dir )
{
return good ? SpatialPylonTextureType.DIM : SpatialPylonTextureType.RED;
}
if (ori == dir || ori.getOpposite() == dir) {
return good ? SpatialPylonTextureType.DIM : SpatialPylonTextureType.RED;
}
if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_MIDDLE )
{
return good ? SpatialPylonTextureType.DIM_SPANNED : SpatialPylonTextureType.RED_SPANNED;
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MIN )
{
return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END;
}
else if( ( flags & TileSpatialPylon.DISPLAY_MIDDLE ) == TileSpatialPylon.DISPLAY_END_MAX )
{
return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END;
}
if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_MIDDLE) {
return good ? SpatialPylonTextureType.DIM_SPANNED : SpatialPylonTextureType.RED_SPANNED;
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MIN) {
return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END;
} else if ((flags & TileSpatialPylon.DISPLAY_MIDDLE) == TileSpatialPylon.DISPLAY_END_MAX) {
return good ? SpatialPylonTextureType.DIM_END : SpatialPylonTextureType.RED_END;
}
return SpatialPylonTextureType.BASE;
}
return SpatialPylonTextureType.BASE;
}
@Override
public boolean func_230044_c_() {
return false;
}
@Override
public boolean func_230044_c_() {
return false;
}
@Override
public boolean isAmbientOcclusion()
{
return true;
}
@Override
public boolean isAmbientOcclusion() {
return true;
}
@Override
public boolean isGui3d()
{
return false;
}
@Override
public boolean isGui3d() {
return false;
}
@Override
public boolean isBuiltInRenderer()
{
return false;
}
@Override
public boolean isBuiltInRenderer() {
return false;
}
@Override
public TextureAtlasSprite getParticleTexture()
{
return this.textures.get( SpatialPylonTextureType.DIM );
}
@Override
public TextureAtlasSprite getParticleTexture() {
return this.textures.get(SpatialPylonTextureType.DIM);
}
@Override
public ItemOverrideList getOverrides()
{
return ItemOverrideList.EMPTY;
}
@Override
public ItemOverrideList getOverrides() {
return ItemOverrideList.EMPTY;
}
}
src/main/java/appeng/client/render/spatial/SpatialPylonModel.java
+26 -26
View File
@@ -18,9 +18,12 @@
package appeng.client.render.spatial;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import appeng.core.AppEng;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -28,36 +31,33 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import appeng.core.AppEng;
public class SpatialPylonModel implements IModelGeometry<SpatialPylonModel> {
public class SpatialPylonModel implements IModelGeometry<SpatialPylonModel>
{
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery,
Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform,
ItemOverrideList overrides, ResourceLocation modelLocation) {
Map<SpatialPylonTextureType, TextureAtlasSprite> textures = new EnumMap<>(SpatialPylonTextureType.class);
@Override
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) {
Map<SpatialPylonTextureType, TextureAtlasSprite> textures = new EnumMap<>( SpatialPylonTextureType.class );
for (SpatialPylonTextureType type : SpatialPylonTextureType.values()) {
textures.put(type, spriteGetter.apply(getTexturePath(type)));
}
for( SpatialPylonTextureType type : SpatialPylonTextureType.values() )
{
textures.put( type, spriteGetter.apply(getTexturePath( type )) );
}
return new SpatialPylonBakedModel(textures);
}
return new SpatialPylonBakedModel( textures );
}
@Override
public Collection<Material> getTextures(IModelConfiguration owner,
Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
return Arrays.stream(SpatialPylonTextureType.values()).map(SpatialPylonModel::getTexturePath)
.collect(Collectors.toList());
}
@Override
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
return Arrays.stream( SpatialPylonTextureType.values() )
.map( SpatialPylonModel::getTexturePath )
.collect( Collectors.toList() );
}
private static Material getTexturePath( SpatialPylonTextureType type )
{
return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation( AppEng.MOD_ID, "block/spatial_pylon/" + type.name().toLowerCase() ) );
}
private static Material getTexturePath(SpatialPylonTextureType type) {
return new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE,
new ResourceLocation(AppEng.MOD_ID, "block/spatial_pylon/" + type.name().toLowerCase()));
}
}
src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java
+16 -17
View File
@@ -18,7 +18,6 @@
package appeng.client.render.spatial;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
@@ -35,24 +34,24 @@ import appeng.bootstrap.IBlockRendering;
import appeng.bootstrap.IItemRendering;
import appeng.core.AppEng;
public class SpatialPylonRendering extends BlockRenderingCustomizer {
public class SpatialPylonRendering extends BlockRenderingCustomizer
{
private static final ResourceLocation MODEL_ID = new ResourceLocation(AppEng.MOD_ID,
"models/blocks/spatial_pylon/builtin");
private static final ResourceLocation MODEL_ID = new ResourceLocation( AppEng.MOD_ID, "models/blocks/spatial_pylon/builtin" );
@Override
@OnlyIn(Dist.CLIENT)
public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
rendering.renderType(RenderType.getCutout());
// FIXME rendering.builtInModel( MODEL_ID.getResourcePath(), new
// SpatialPylonModel() );
// FIXME rendering.stateMapper( this::mapState );
}
@Override
@OnlyIn( Dist.CLIENT )
public void customize( IBlockRendering rendering, IItemRendering itemRendering )
{
rendering.renderType(RenderType.getCutout());
// FIXME rendering.builtInModel( MODEL_ID.getResourcePath(), new SpatialPylonModel() );
// FIXME rendering.stateMapper( this::mapState );
}
// FIXME private Map<BlockState, ModelResourceLocation> mapState( Block block )
// FIXME {
// FIXME return ImmutableMap.of( block.getDefaultState(), new ModelResourceLocation( MODEL_ID, "normal" ) );
// FIXME }
// FIXME private Map<BlockState, ModelResourceLocation> mapState( Block block )
// FIXME {
// FIXME return ImmutableMap.of( block.getDefaultState(), new
// ModelResourceLocation( MODEL_ID, "normal" ) );
// FIXME }
}
src/main/java/appeng/client/render/spatial/SpatialPylonTextureType.java
+2 -4
View File
@@ -18,8 +18,6 @@
package appeng.client.render.spatial;
enum SpatialPylonTextureType
{
BASE, BASE_END, BASE_SPANNED, DIM, DIM_END, DIM_SPANNED, RED, RED_END, RED_SPANNED
enum SpatialPylonTextureType {
BASE, BASE_END, BASE_SPANNED, DIM, DIM_END, DIM_SPANNED, RED, RED_END, RED_SPANNED
}