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

Fixed formation planes.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-10 00:25:44 +02:00
parent 3e206ee544
commit bd16641638
52 changed files with 557 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java
+6 -12
View File
@@ -31,13 +31,11 @@ import java.util.Random;
import javax.annotation.Nullable;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.MissingTextureSprite;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
@@ -46,7 +44,6 @@ import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.client.model.data.EmptyModelData;
import net.minecraftforge.client.model.data.IModelData;
import appeng.api.parts.IPartBakedModel;
import appeng.api.parts.IPartModel;
import appeng.api.util.AECableType;
import appeng.api.util.AEColor;
@@ -116,6 +113,11 @@ public class CableBusBakedModel implements IBakedModel
continue;
}
IModelData partModelData = renderState.getPartModelData().get(facing);
if (partModelData == null) {
partModelData = EmptyModelData.INSTANCE;
}
for( ResourceLocation model : partModel.getModels() )
{
IBakedModel bakedModel = this.partModels.get( model );
@@ -125,15 +127,7 @@ public class CableBusBakedModel implements IBakedModel
throw new IllegalStateException( "Trying to use an unregistered part model: " + model );
}
List<BakedQuad> partQuads;
if( bakedModel instanceof IPartBakedModel )
{
partQuads = ( (IPartBakedModel) bakedModel ).getPartQuads( renderState.getPartFlags().get( facing ), rand );
}
else
{
partQuads = bakedModel.getQuads( state, null, rand );
}
List<BakedQuad> partQuads = bakedModel.getQuads(state, null, rand, partModelData);
// Rotate quads accordingly
QuadRotator rotator = new QuadRotator();
src/main/java/appeng/client/render/cablebus/CableBusRenderState.java
+7 -5
View File
@@ -30,6 +30,7 @@ import net.minecraft.util.Direction;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ILightReader;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import appeng.api.parts.IPartModel;
@@ -84,7 +85,8 @@ public class CableBusRenderState
// facades on this cable bus
private List<AxisAlignedBB> boundingBoxes = new ArrayList<>();
private EnumMap<Direction, Long> partFlags = new EnumMap<>( Direction.class );
// Additional model data passed to the part models
private EnumMap<Direction, IModelData> partModelData = new EnumMap<>( Direction.class );
public CableCoreType getCoreType()
{
@@ -186,9 +188,9 @@ public class CableBusRenderState
return this.boundingBoxes;
}
public EnumMap<Direction, Long> getPartFlags()
public EnumMap<Direction, IModelData> getPartModelData()
{
return this.partFlags;
return this.partModelData;
}
@Override
@@ -203,7 +205,7 @@ public class CableBusRenderState
result = prime * result + ( ( this.channelsOnSide == null ) ? 0 : this.channelsOnSide.hashCode() );
result = prime * result + ( ( this.connectionTypes == null ) ? 0 : this.connectionTypes.hashCode() );
result = prime * result + ( ( this.coreType == null ) ? 0 : this.coreType.hashCode() );
result = prime * result + ( ( this.partFlags == null ) ? 0 : this.partFlags.hashCode() );
result = prime * result + ( ( this.partModelData == null ) ? 0 : this.partModelData.hashCode() );
return result;
}
@@ -228,6 +230,6 @@ public class CableBusRenderState
return this.cableColor == other.cableColor && this.cableType == other.cableType && this.coreType == other.coreType && Objects
.equals( this.attachmentConnections, other.attachmentConnections ) && Objects.equals( this.cableBusAdjacent, other.cableBusAdjacent ) && Objects
.equals( this.channelsOnSide, other.channelsOnSide ) && Objects.equals( this.connectionTypes, other.connectionTypes ) && Objects
.equals( this.partFlags, other.partFlags );
.equals( this.partModelData, other.partModelData);
}
}
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyBakedModel.java
+27 -29
View File
@@ -12,18 +12,19 @@ import com.google.common.cache.CacheBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.Direction;
import appeng.api.parts.IPartBakedModel;
import appeng.api.util.AEColor;
import appeng.util.Platform;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
public class P2PTunnelFrequencyBakedModel implements IBakedModel, IPartBakedModel
public class P2PTunnelFrequencyBakedModel implements IDynamicBakedModel
{
private final TextureAtlasSprite texture;
private final static Cache<Long, List<BakedQuad>> modelCache = CacheBuilder.newBuilder().maximumSize( 100 ).build();
@@ -41,36 +42,16 @@ public class P2PTunnelFrequencyBakedModel implements IBakedModel, IPartBakedMode
}
@Override
public List<BakedQuad> getPartQuads( Long partFlags, Random rand )
public List<BakedQuad> getQuads( BlockState state, Direction side, Random rand, IModelData modelData )
{
try
{
return modelCache.get( partFlags, () ->
{
short frequency = 0;
boolean active = false;
if( partFlags != null )
{
frequency = (short) ( partFlags.longValue() & 0xffffL );
active = ( partFlags.longValue() & 0x10000L ) != 0;
}
return this.getQuadsForFrequency( frequency, active );
} );
}
catch( ExecutionException e )
if( side != null || !(modelData instanceof P2PTunnelFrequencyModelData) )
{
return Collections.emptyList();
}
}
@Override
public List<BakedQuad> getQuads( BlockState state, Direction side, Random rand )
{
if( side != null )
{
return Collections.emptyList();
}
return this.getPartQuads( null, rand );
P2PTunnelFrequencyModelData freqModelData = (P2PTunnelFrequencyModelData) modelData;
return this.getPartQuads( freqModelData.getFrequency());
}
private List<BakedQuad> getQuadsForFrequency( final short frequency, final boolean active )
@@ -94,7 +75,7 @@ public class P2PTunnelFrequencyBakedModel implements IBakedModel, IPartBakedMode
}
else
{
final float cv[] = c.dye.getColorComponentValues();
final float[] cv = c.dye.getColorComponentValues();
cb.setColorRGB( cv[0] * 0.5f, cv[1] * 0.5f, cv[2] * 0.5f );
}
@@ -108,6 +89,23 @@ public class P2PTunnelFrequencyBakedModel implements IBakedModel, IPartBakedMode
return cb.getOutput();
}
private List<BakedQuad> getPartQuads(long partFlags)
{
try
{
return modelCache.get( partFlags, () ->
{
short frequency = (short) ( partFlags & 0xffffL );
boolean active = ( partFlags & 0x10000L ) != 0;
return this.getQuadsForFrequency( frequency, active );
} );
}
catch( ExecutionException e )
{
return Collections.emptyList();
}
}
@Override
public boolean isAmbientOcclusion()
{
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java
+12 -22
View File
@@ -9,41 +9,25 @@ import javax.annotation.Nullable;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.Material;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.model.*;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.ResourceLocation;
import appeng.core.AppEng;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
public class P2PTunnelFrequencyModel implements IUnbakedModel
public class P2PTunnelFrequencyModel implements IModelGeometry<P2PTunnelFrequencyModel>
{
private static final Material TEXTURE = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation( AppEng.MOD_ID, "parts/p2p_tunnel_frequency" ) );
@Override
public Collection<ResourceLocation> getDependencies()
{
return Collections.emptyList();
}
@Override
public Collection<Material> getTextures( Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
{
return Collections.singleton( TEXTURE );
}
@Nullable
@Override
public IBakedModel bakeModel( ModelBakery modelBakeryIn, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn, ResourceLocation locationIn )
{
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) {
try
{
final TextureAtlasSprite texture = spriteGetterIn.apply( TEXTURE );
final TextureAtlasSprite texture = spriteGetter.apply( TEXTURE );
return new P2PTunnelFrequencyBakedModel( texture );
}
catch( Exception e )
@@ -51,4 +35,10 @@ public class P2PTunnelFrequencyModel implements IUnbakedModel
throw new RuntimeException( e );
}
}
@Override
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
return Collections.singleton( TEXTURE );
}
}
src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java
+23
View File
@@ -0,0 +1,23 @@
package appeng.client.render.cablebus;
import appeng.client.render.model.AEInternalModelData;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import javax.annotation.Nullable;
public final class P2PTunnelFrequencyModelData extends AEInternalModelData {
public static final ModelProperty<Long> FREQUENCY = new ModelProperty<>();
private final long frequency;
public P2PTunnelFrequencyModelData(long frequency) {
this.frequency = frequency;
}
public long getFrequency() {
return frequency;
}
}
src/main/java/appeng/client/render/model/AEInternalModelData.java
+27
View File
@@ -0,0 +1,27 @@
package appeng.client.render.model;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import javax.annotation.Nullable;
public abstract class AEInternalModelData implements IModelData {
@Override
public final boolean hasProperty(ModelProperty<?> prop) {
throw new IllegalStateException("This model data must be used by internal models only.");
}
@Nullable
@Override
public final <T> T getData(ModelProperty<T> prop) {
throw new IllegalStateException("This model data must be used by internal models only.");
}
@Nullable
@Override
public final <T> T setData(ModelProperty<T> prop, T data) {
throw new IllegalStateException("This model data must be used by internal models only.");
}
}