Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9
This commit is contained in:
commit
00fc80b071
10 changed files with 75 additions and 22 deletions
src/main/java/techreborn/client
|
@ -28,22 +28,18 @@ public class ContainerAesu extends RebornContainer {
|
|||
tile = tileaesu;
|
||||
this.player = player;
|
||||
|
||||
// input
|
||||
//this.addSlotToContainer(new Slot(tileaesu.inventory, 0, 116, 23));
|
||||
// this.addSlotToContainer(new Slot(tileaesu.inventory, 1, 116, 59));
|
||||
|
||||
int i;
|
||||
|
||||
for (i = 0; i < 3; ++i) {
|
||||
for (int j = 0; j < 9; ++j) {
|
||||
this.addSlotToContainer(new Slot(player.inventory, j + i * 9
|
||||
+ 9, 8 + j * 18, 84 + i * 18));
|
||||
+ 9, 8 + j * 18, 115 + i * 18));
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < 9; ++i) {
|
||||
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18,
|
||||
142));
|
||||
173));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@ public class GuiAesu extends GuiContainer {
|
|||
TileAesu tileaesu) {
|
||||
super(new ContainerAesu(tileaesu, player));
|
||||
this.xSize = 176;
|
||||
this.ySize = 165;
|
||||
this.ySize = 197;
|
||||
aesu = tileaesu;
|
||||
this.containerAesu = (ContainerAesu) this.inventorySlots;
|
||||
}
|
||||
|
|
|
@ -9,6 +9,8 @@ import net.minecraft.client.renderer.texture.TextureMap;
|
|||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import techreborn.blocks.BlockNuke;
|
||||
import techreborn.entitys.EntityNukePrimed;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
||||
|
@ -41,20 +43,18 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
|
|||
blockrendererdispatcher.renderBlockBrightness(ModBlocks.nuke.getDefaultState(), entity.getBrightness(partialTicks));
|
||||
GlStateManager.translate(0.0F, 0.0F, 1.0F);
|
||||
if (entity.fuse / 5 % 2 == 0) {
|
||||
GlStateManager.disableTexture2D();
|
||||
GlStateManager.disableLighting();
|
||||
GlStateManager.enableBlend();
|
||||
GlStateManager.blendFunc(770, 772);
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, f2);
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1F);
|
||||
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
|
||||
GlStateManager.enablePolygonOffset();
|
||||
blockrendererdispatcher.renderBlockBrightness(Blocks.tnt.getDefaultState(), 1.0F);
|
||||
blockrendererdispatcher.renderBlockBrightness(ModBlocks.nuke.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
|
||||
GlStateManager.doPolygonOffset(0.0F, 0.0F);
|
||||
GlStateManager.disablePolygonOffset();
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.enableTexture2D();
|
||||
}
|
||||
GlStateManager.popMatrix();
|
||||
super.doRender(entity, x, y, z, entityYaw, partialTicks);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue