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/parts/automation/PlaneModels.java
+17 -29
View File
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import net.minecraft.util.ResourceLocation;
@@ -43,56 +44,43 @@ public class PlaneModels
public static final ResourceLocation MODEL_CHASSIS_ON = new ResourceLocation( AppEng.MOD_ID, "part/transition_plane_on" );
public static final ResourceLocation MODEL_CHASSIS_HAS_CHANNEL = new ResourceLocation( AppEng.MOD_ID, "part/transition_plane_has_channel" );
private final Map<PlaneConnections, IPartModel> modelsOff;
private final IPartModel modelOff;
private final Map<PlaneConnections, IPartModel> modelsOn;
private final IPartModel modelOn;
private final Map<PlaneConnections, IPartModel> modelsHasChannel;
private final IPartModel modelHasChannel;
public PlaneModels( String prefixOff, String prefixOn )
public PlaneModels( String planeOffLocation, String planeOnLocation )
{
Map<PlaneConnections, IPartModel> modelsOff = new HashMap<>();
Map<PlaneConnections, IPartModel> modelsOn = new HashMap<>();
Map<PlaneConnections, IPartModel> modelsHasChannel = new HashMap<>();
ResourceLocation planeOff = new ResourceLocation( AppEng.MOD_ID, planeOffLocation );
ResourceLocation planeOn = new ResourceLocation( AppEng.MOD_ID, planeOnLocation );
for( PlaneConnections permutation : PlaneConnections.PERMUTATIONS )
{
ResourceLocation planeOff = new ResourceLocation( AppEng.MOD_ID, prefixOff + permutation.getFilenameSuffix() );
ResourceLocation planeOn = new ResourceLocation( AppEng.MOD_ID, prefixOn + permutation.getFilenameSuffix() );
modelsOff.put( permutation, new PartModel( MODEL_CHASSIS_OFF, planeOff ) );
modelsOn.put( permutation, new PartModel( MODEL_CHASSIS_ON, planeOff ) );
modelsHasChannel.put( permutation, new PartModel( MODEL_CHASSIS_HAS_CHANNEL, planeOn ) );
}
this.modelsOff = ImmutableMap.copyOf( modelsOff );
this.modelsOn = ImmutableMap.copyOf( modelsOn );
this.modelsHasChannel = ImmutableMap.copyOf( modelsHasChannel );
this.modelOff = new PartModel( MODEL_CHASSIS_OFF, planeOff );
this.modelOn = new PartModel( MODEL_CHASSIS_ON, planeOff );
this.modelHasChannel = new PartModel( MODEL_CHASSIS_HAS_CHANNEL, planeOn );
}
public IPartModel getModel( PlaneConnections connections, boolean hasPower, boolean hasChannel )
public IPartModel getModel(boolean hasPower, boolean hasChannel)
{
if( hasPower && hasChannel )
{
return this.modelsHasChannel.get( connections );
return modelHasChannel;
}
else if( hasPower )
{
return this.modelsOn.get( connections );
return modelOn;
}
else
{
return this.modelsOff.get( connections );
return modelOff;
}
}
public List<IPartModel> getModels()
{
List<IPartModel> result = new ArrayList<>();
this.modelsOff.values().forEach( result::add );
this.modelsOn.values().forEach( result::add );
this.modelsHasChannel.values().forEach( result::add );
return result;
return ImmutableList.of(
modelOff, modelOn, modelHasChannel
);
}
}