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

1.15 port

Browse Source
This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/cablebus/QuadRotator.java
+9 -9
View File
@@ -26,10 +26,10 @@ import javax.vecmath.Matrix4f;
import javax.vecmath.Point3f;
import javax.vecmath.Vector3f;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.Direction;
import appeng.client.render.FacingToRotation;
import appeng.core.AELog;
@@ -42,9 +42,9 @@ import appeng.core.AELog;
public class QuadRotator
{
public List<BakedQuad> rotateQuads( List<BakedQuad> quads, EnumFacing newForward, EnumFacing newUp )
public List<BakedQuad> rotateQuads( List<BakedQuad> quads, Direction newForward, Direction newUp )
{
if( newForward == EnumFacing.NORTH && newUp == EnumFacing.UP )
if( newForward == Direction.NORTH && newUp == Direction.UP )
{
return quads; // This is the default orientation
}
@@ -59,18 +59,18 @@ public class QuadRotator
return result;
}
private BakedQuad rotateQuad( BakedQuad quad, EnumFacing forward, EnumFacing up )
private BakedQuad rotateQuad( BakedQuad quad, Direction forward, Direction up )
{
// Sanitize forward/up
if( forward.getAxis() == up.getAxis() )
{
if( up.getAxis() == EnumFacing.Axis.Y )
if( up.getAxis() == Direction.Axis.Y )
{
up = EnumFacing.NORTH;
up = Direction.NORTH;
}
else
{
up = EnumFacing.UP;
up = Direction.UP;
}
}
@@ -149,7 +149,7 @@ public class QuadRotator
}
}
EnumFacing newFace = rotation.rotate( quad.getFace() );
Direction newFace = rotation.rotate( quad.getFace() );
return new BakedQuad( newData, quad.getTintIndex(), newFace, quad.getSprite(), quad.shouldApplyDiffuseLighting(), quad.getFormat() );
}