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/CableBusContainer.java
+1 -1
View File
@@ -1243,7 +1243,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
continue;
}
renderState.getPartFlags().put( facing, part.getRenderFlag() );
renderState.getPartModelData().put( facing, part.getModelData() );
// This will add the part's bounding boxes to the render state, which is required for facades
final AEPartLocation loc = AEPartLocation.fromFacing( facing );
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+13 -2
View File
@@ -73,15 +73,18 @@ import appeng.util.Platform;
import appeng.util.item.AEItemStack;
import net.minecraft.world.storage.loot.LootContext;
import net.minecraft.world.storage.loot.LootParameters;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.ToolType;
import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.common.util.FakePlayerFactory;
import javax.annotation.Nonnull;
public class PartAnnihilationPlane extends PartBasicState implements IGridTickable, IWorldCallable<TickRateModulation>
{
private static final PlaneModels MODELS = new PlaneModels( "part/annihilation_plane_", "part/annihilation_plane_on_" );
private static final PlaneModels MODELS = new PlaneModels( "part/annihilation_plane", "part/annihilation_plane_on" );
@PartModels
public static List<IPartModel> getModels()
@@ -576,6 +579,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
{
this.isAccepting = true;
getTile().requestModelDataUpdate();
try
{
this.getProxy().getTick().alertDevice( this.getProxy().getNode() );
@@ -589,7 +594,13 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
@Override
public IPartModel getStaticModels()
{
return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() );
return MODELS.getModel( this.isPowered(), this.isActive() );
}
@Nonnull
@Override
public IModelData getModelData() {
return new PlaneModelData(getConnections());
}
/**
src/main/java/appeng/parts/automation/PartFormationPlane.java
+10 -2
View File
@@ -43,6 +43,7 @@ import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.items.IItemHandler;
@@ -78,13 +79,14 @@ import appeng.util.inv.InvOperation;
import appeng.util.prioritylist.FuzzyPriorityList;
import appeng.util.prioritylist.PrecisePriorityList;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
{
private static final PlaneModels MODELS = new PlaneModels( "part/formation_plane_", "part/formation_plane_on_" );
private static final PlaneModels MODELS = new PlaneModels( "part/formation_plane", "part/formation_plane_on" );
@PartModels
public static List<IPartModel> getModels()
@@ -374,7 +376,13 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
@Override
public IPartModel getStaticModels()
{
return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() );
return MODELS.getModel( this.isPowered(), this.isActive() );
}
@Nonnull
@Override
public IModelData getModelData() {
return new PlaneModelData(getConnections());
}
@Override
src/main/java/appeng/parts/automation/PartIdentityAnnihilationPlane.java
+10 -2
View File
@@ -32,14 +32,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.client.model.data.IModelData;
import javax.annotation.Nonnull;
import java.util.List;
public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
{
private static final PlaneModels MODELS = new PlaneModels( "part/identity_annihilation_plane_", "part/identity_annihilation_plane_on_" );
private static final PlaneModels MODELS = new PlaneModels( "part/identity_annihilation_plane", "part/identity_annihilation_plane_on" );
@PartModels
public static List<IPartModel> getModels()
@@ -90,7 +92,13 @@ public class PartIdentityAnnihilationPlane extends PartAnnihilationPlane
@Override
public IPartModel getStaticModels()
{
return MODELS.getModel( this.getConnections(), this.isPowered(), this.isActive() );
return MODELS.getModel( this.isPowered(), this.isActive() );
}
@Nonnull
@Override
public IModelData getModelData() {
return new PlaneModelData(getConnections());
}
}
src/main/java/appeng/parts/automation/PlaneBakedModel.java
+29 -22
View File
@@ -19,63 +19,70 @@
package appeng.parts.automation;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.*;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
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.client.renderer.vertex.VertexFormat;
import net.minecraft.util.Direction;
import appeng.client.render.cablebus.CubeBuilder;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
import net.minecraftforge.client.model.data.IModelData;
/**
* Built-in model for annihilation planes that supports connected textures.
*/
public class PlaneBakedModel implements IBakedModel
public class PlaneBakedModel implements IDynamicBakedModel
{
private static final PlaneConnections DEFAULT_PERMUTATION = PlaneConnections.of(false, false, false, false);
private final TextureAtlasSprite frontTexture;
private final List<BakedQuad> quads;
private final Map<PlaneConnections, List<BakedQuad>> quads;
PlaneBakedModel( TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture, PlaneConnections connections )
PlaneBakedModel( TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture )
{
this.frontTexture = frontTexture;
List<BakedQuad> quads = new ArrayList<>( 4 * 6 );
quads = new HashMap<>(PlaneConnections.PERMUTATIONS.size());
// Create all possible permutations (16)
for (PlaneConnections permutation : PlaneConnections.PERMUTATIONS) {
List<BakedQuad> quads = new ArrayList<>(4 * 6);
CubeBuilder builder = new CubeBuilder( quads );
CubeBuilder builder = new CubeBuilder(quads);
builder.setTextures( sidesTexture, sidesTexture, frontTexture, backTexture, sidesTexture, sidesTexture );
builder.setTextures(sidesTexture, sidesTexture, frontTexture, backTexture, sidesTexture, sidesTexture);
// Keep the orientation of the X axis in mind here. When looking at a quad facing north from the front,
// The X-axis points left
int minX = connections.isRight() ? 0 : 1;
int maxX = connections.isLeft() ? 16 : 15;
int minY = connections.isDown() ? 0 : 1;
int maxY = connections.isUp() ? 16 : 15;
// Keep the orientation of the X axis in mind here. When looking at a quad facing north from the front,
// The X-axis points left
int minX = permutation.isRight() ? 0 : 1;
int maxX = permutation.isLeft() ? 16 : 15;
int minY = permutation.isDown() ? 0 : 1;
int maxY = permutation.isUp() ? 16 : 15;
builder.addCube( minX, minY, 0, maxX, maxY, 1 );
builder.addCube(minX, minY, 0, maxX, maxY, 1);
this.quads = ImmutableList.copyOf( quads );
this.quads.put(permutation, ImmutableList.copyOf(quads));
}
}
@Override
public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, Random rand )
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand, IModelData modelData)
{
if( side == null )
{
return this.quads;
PlaneConnections connections = DEFAULT_PERMUTATION;
if (modelData instanceof PlaneModelData) {
connections = ((PlaneModelData) modelData).getConnections();
}
return this.quads.get(connections);
}
else
{
src/main/java/appeng/parts/automation/PlaneModel.java
+12 -24
View File
@@ -28,55 +28,43 @@ 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 net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.geometry.IModelGeometry;
/**
* Built-in model for annihilation planes that supports connected textures.
*/
public class PlaneModel implements IUnbakedModel
public class PlaneModel implements IModelGeometry<PlaneModel>
{
private final Material frontTexture;
private final Material sidesTexture;
private final Material backTexture;
private final PlaneConnections connections;
public PlaneModel( ResourceLocation frontTexture, ResourceLocation sidesTexture, ResourceLocation backTexture, PlaneConnections connections )
public PlaneModel( ResourceLocation frontTexture, ResourceLocation sidesTexture, ResourceLocation backTexture )
{
this.frontTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, frontTexture );
this.sidesTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, sidesTexture );
this.backTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, backTexture );
this.connections = connections;
}
@Override
public Collection<ResourceLocation> getDependencies()
{
return Collections.emptyList();
public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function<Material, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) {
TextureAtlasSprite frontSprite = spriteGetter.apply( this.frontTexture );
TextureAtlasSprite sidesSprite = spriteGetter.apply( this.sidesTexture );
TextureAtlasSprite backSprite = spriteGetter.apply( this.backTexture );
return new PlaneBakedModel( frontSprite, sidesSprite, backSprite );
}
@Override
public Collection<Material> getTextures( Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
{
public Collection<Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors) {
return Arrays.asList( frontTexture, sidesTexture, backTexture );
}
@Nullable
@Override
public IBakedModel bakeModel( ModelBakery modelBakeryIn, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn, ResourceLocation locationIn )
{
TextureAtlasSprite frontSprite = spriteGetterIn.apply( this.frontTexture );
TextureAtlasSprite sidesSprite = spriteGetterIn.apply( this.sidesTexture );
TextureAtlasSprite backSprite = spriteGetterIn.apply( this.backTexture );
return new PlaneBakedModel( frontSprite, sidesSprite, backSprite, this.connections );
}
}
src/main/java/appeng/parts/automation/PlaneModelData.java
+17
View File
@@ -0,0 +1,17 @@
package appeng.parts.automation;
import appeng.client.render.model.AEInternalModelData;
public class PlaneModelData extends AEInternalModelData {
private final PlaneConnections connections;
public PlaneModelData(PlaneConnections connections) {
this.connections = connections;
}
public PlaneConnections getConnections() {
return connections;
}
}
src/main/java/appeng/parts/automation/PlaneModelLoader.java
+30
View File
@@ -0,0 +1,30 @@
package appeng.parts.automation;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IModelLoader;
public class PlaneModelLoader implements IModelLoader<PlaneModel> {
public static final PlaneModelLoader INSTANCE = new PlaneModelLoader();
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
}
@Override
public PlaneModel read(JsonDeserializationContext deserializationContext, JsonObject modelContents) {
String frontTexture = modelContents.get("front").getAsString();
String sidesTexture = modelContents.get("sides").getAsString();
String backTexture = modelContents.get("back").getAsString();
return new PlaneModel(
new ResourceLocation(frontTexture),
new ResourceLocation(sidesTexture),
new ResourceLocation(backTexture)
);
}
}
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
);
}
}
src/main/java/appeng/parts/p2p/P2PModels.java
+1 -1
View File
@@ -38,7 +38,7 @@ class P2PModels
public static final ResourceLocation MODEL_STATUS_OFF = new ResourceLocation( AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_off" );
public static final ResourceLocation MODEL_STATUS_ON = new ResourceLocation( AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_on" );
public static final ResourceLocation MODEL_STATUS_HAS_CHANNEL = new ResourceLocation( AppEng.MOD_ID, "part/p2p/p2p_tunnel_status_has_channel" );
public static final ResourceLocation MODEL_FREQUENCY = new ResourceLocation( AppEng.MOD_ID, "part/builtin/p2p_tunnel_frequency" );
public static final ResourceLocation MODEL_FREQUENCY = new ResourceLocation( AppEng.MOD_ID, "part/p2p/p2p_tunnel_frequency" );
private final IPartModel modelsOff;
private final IPartModel modelsOn;
src/main/java/appeng/parts/p2p/PartP2PTunnel.java
+6 -2
View File
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Optional;
import appeng.client.render.cablebus.P2PTunnelFrequencyModelData;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
@@ -52,6 +53,9 @@ import appeng.me.cache.P2PCache;
import appeng.me.cache.helpers.TunnelCollection;
import appeng.parts.PartBasicState;
import appeng.util.Platform;
import net.minecraftforge.client.model.data.IModelData;
import net.minecraftforge.client.model.data.ModelDataMap;
import net.minecraftforge.client.model.data.ModelProperty;
public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
@@ -437,7 +441,7 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
}
@Override
public Long getRenderFlag()
public IModelData getModelData()
{
long ret = Short.toUnsignedLong( this.getFrequency() );
@@ -446,6 +450,6 @@ public abstract class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicSt
ret |= 0x10000L;
}
return ret;
return new P2PTunnelFrequencyModelData(ret);
}
}