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

Work on GUIs (specifically to get SkyChest GUI)

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-02 02:14:09 +02:00
parent 271e8889a1
commit 9f63859769
109 changed files with 1133 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/render/DummyFluidDispatcherBakedModel.java
+2 -1
View File
@@ -35,6 +35,7 @@ import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.entity.LivingEntity;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
@@ -101,7 +102,7 @@ public class DummyFluidDispatcherBakedModel extends DelegateBakedModel
FluidStack fluidStack = itemFacade.getFluidStack( stack );
if( fluidStack == null )
{
fluidStack = new FluidStack( FluidRegistry.WATER, Fluid.BUCKET_VOLUME );
fluidStack = new FluidStack( Fluids.WATER, FluidAttributes.BUCKET_VOLUME );
}
TextureAtlasSprite sprite = DummyFluidDispatcherBakedModel.this.bakedTextureGetter.apply( fluidStack.getFluid().getStill( fluidStack ) );
src/main/java/appeng/client/render/SpatialSkyRender.java
+8 -8
View File
@@ -73,9 +73,9 @@ public class SpatialSkyRender extends IRenderHandler
GlStateManager.disableFog();
GlStateManager.disableAlpha();
GlStateManager.disableBlend();
RenderSystem.disableBlend();
GlStateManager.depthMask( false );
GlStateManager.color( 0.0f, 0.0f, 0.0f, 1.0f );
RenderSystem.color4f( 0.0f, 0.0f, 0.0f, 1.0f );
final Tessellator tessellator = Tessellator.getInstance();
final BufferBuilder VertexBuffer = tessellator.getBuffer();
@@ -117,7 +117,7 @@ public class SpatialSkyRender extends IRenderHandler
VertexBuffer.pos( 100.0D, -100.0D, 100.0D ).endVertex();
VertexBuffer.pos( 100.0D, -100.0D, -100.0D ).endVertex();
tessellator.draw();
GlStateManager.enableTexture2D();
RenderSystem.enableTexture();
GlStateManager.popMatrix();
}
@@ -127,24 +127,24 @@ public class SpatialSkyRender extends IRenderHandler
{
GlStateManager.disableFog();
GlStateManager.disableAlpha();
GlStateManager.enableBlend();
RenderSystem.enableBlend();
GlStateManager.disableTexture2D();
GlStateManager.depthMask( false );
OpenGlHelper.glBlendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0 );
RenderHelper.disableStandardItemLighting();
GlStateManager.color( fade, fade, fade, 1.0f );
RenderSystem.color4f( fade, fade, fade, 1.0f );
GlStateManager.callList( this.dspList );
}
GlStateManager.depthMask( true );
GlStateManager.enableBlend();
RenderSystem.enableBlend();
GlStateManager.enableAlpha();
GlStateManager.enableTexture2D();
RenderSystem.enableTexture();
GlStateManager.enableFog();
GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
}
private void renderTwinkles()
src/main/java/appeng/client/render/StackSizeRenderer.java
+12 -12
View File
@@ -56,36 +56,36 @@ public class StackSizeRenderer
{
final String craftLabelText = AEConfig.instance().useTerminalUseLargeFont() ? GuiText.LargeFontCraft.getLocal() : GuiText.SmallFontCraft
.getLocal();
GlStateManager.disableLighting();
GlStateManager.disableDepth();
GlStateManager.disableBlend();
RenderSystem.disableLighting();
RenderSystem.disableDepthTest();
RenderSystem.disableBlend();
GlStateManager.pushMatrix();
GlStateManager.scale( scaleFactor, scaleFactor, scaleFactor );
final int X = (int) ( ( (float) xPos + offset + 16.0f - fontRenderer.getStringWidth( craftLabelText ) * scaleFactor ) * inverseScaleFactor );
final int Y = (int) ( ( (float) yPos + offset + 16.0f - 7.0f * scaleFactor ) * inverseScaleFactor );
fontRenderer.drawStringWithShadow( craftLabelText, X, Y, 16777215 );
GlStateManager.popMatrix();
GlStateManager.enableLighting();
GlStateManager.enableDepth();
GlStateManager.enableBlend();
RenderSystem.enableLighting();
RenderSystem.enableDepthTest();
RenderSystem.enableBlend();
}
if( aeStack.getStackSize() > 0 )
{
final String stackSize = this.getToBeRenderedStackSize( aeStack.getStackSize() );
GlStateManager.disableLighting();
GlStateManager.disableDepth();
GlStateManager.disableBlend();
RenderSystem.disableLighting();
RenderSystem.disableDepthTest();
RenderSystem.disableBlend();
GlStateManager.pushMatrix();
GlStateManager.scale( scaleFactor, scaleFactor, scaleFactor );
final int X = (int) ( ( (float) xPos + offset + 16.0f - fontRenderer.getStringWidth( stackSize ) * scaleFactor ) * inverseScaleFactor );
final int Y = (int) ( ( (float) yPos + offset + 16.0f - 7.0f * scaleFactor ) * inverseScaleFactor );
fontRenderer.drawStringWithShadow( stackSize, X, Y, 16777215 );
GlStateManager.popMatrix();
GlStateManager.enableLighting();
GlStateManager.enableDepth();
GlStateManager.enableBlend();
RenderSystem.enableLighting();
RenderSystem.enableDepthTest();
RenderSystem.enableBlend();
}
fontRenderer.setUnicodeFlag( unicodeFlag );
src/main/java/appeng/client/render/crafting/ItemEncodedPatternBakedModel.java
+1 -1
View File
@@ -145,7 +145,7 @@ class ItemEncodedPatternBakedModel implements IBakedModel
// Now retroactively handle the isGui3d call, for which we always return false below
if( selectedModel.isGui3d() != ItemEncodedPatternBakedModel.this.baseModel.isGui3d() )
{
GlStateManager.enableLighting();
RenderSystem.enableLighting();
}
if( selectedModel instanceof IBakedModel )
src/main/java/appeng/client/render/tesr/CrankTESR.java
+2 -2
View File
@@ -54,8 +54,8 @@ public class CrankTESR extends TileEntityRenderer<TileCrank>
Tessellator tessellator = Tessellator.getInstance();
this.bindTexture( TextureMap.LOCATION_BLOCKS_TEXTURE );
RenderHelper.disableStandardItemLighting();
GlStateManager.blendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
GlStateManager.enableBlend();
RenderSystem.blendFunc( GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA );
RenderSystem.enableBlend();
GlStateManager.disableCull();
if( Minecraft.isAmbientOcclusionEnabled() )
src/main/java/appeng/client/render/tesr/InscriberTESR.java
+4 -4
View File
@@ -50,8 +50,8 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
FacingToRotation.get( tile.getForward(), tile.getUp() ).glRotateCurrentMat();
GlStateManager.translate( -0.5F, -0.5F, -0.5F );
GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
GlStateManager.disableLighting();
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
RenderSystem.disableLighting();
GlStateManager.disableRescaleNormal();
// render sides of stamps
@@ -128,7 +128,7 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
Tessellator.getInstance().draw();
// render items.
GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
IItemHandler tileInv = tile.getInternalInventory();
@@ -169,7 +169,7 @@ public final class InscriberTESR extends TileEntityRenderer<TileInscriber>
}
GlStateManager.popMatrix();
GlStateManager.enableLighting();
RenderSystem.enableLighting();
GlStateManager.enableRescaleNormal();
}