Anvilcraft/thaumic-machinery
2
1
Fork 0
generated from tilera/1710mod
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

fix: apparatus rendering

Browse source 
closes #2
This commit is contained in:
LordMZTE 2023-05-27 14:54:06 +02:00
parent 7e65f0d606
commit b0237e5d1e
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
20 changed files with 823 additions and 911 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/net/anvilcraft/thaummach/blocks/BlockApparatus.java
View file

@ -2,7 +2,6 @@ package net.anvilcraft.thaummach.blocks;
import java.util.Random; import java.util.Random;
import cpw.mods.fml.common.FMLCommonHandler;
import net.anvilcraft.thaummach.AuraUtils; import net.anvilcraft.thaummach.AuraUtils;
import net.anvilcraft.thaummach.GuiID; import net.anvilcraft.thaummach.GuiID;
import net.anvilcraft.thaummach.ITileGui; import net.anvilcraft.thaummach.ITileGui;
@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
public abstract class BlockApparatus extends BlockContainer { public abstract class BlockApparatus extends BlockContainer {
protected int currentPass; protected int currentPass;
@ -134,17 +132,6 @@ public abstract class BlockApparatus extends BlockContainer {
super.breakBlock(world, x, y, z, block, meta); super.breakBlock(world, x, y, z, block, meta);
} }
@Override
public boolean canRenderInPass(int n) {
this.currentPass = n;
return true;
}
@Override
public int getRenderBlockPass() {
return this.currentPass;
}
@Override @Override
public void onPostBlockPlaced(World world, int x, int y, int z, int meta) { public void onPostBlockPlaced(World world, int x, int y, int z, int meta) {
world.setBlockMetadataWithNotify(x, y, z, meta, 3); world.setBlockMetadataWithNotify(x, y, z, meta, 3);

102
src/main/java/net/anvilcraft/thaummach/render/apparatus/AbstractTankApparatusRenderer.java
View file

@ -31,71 +31,65 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
BlockApparatus block = (BlockApparatus) block_; BlockApparatus block = (BlockApparatus) block_;
float w1; float w1;
float w2; float w2;
if (block.getRenderBlockPass() == 0 || inv) { w1 = 0.0625F;
w1 = 0.0625F; w2 = 0.125F;
w2 = 0.125F; IIcon t1 = this.getBottomIcon((Apparatus) block);
IIcon t1 = this.getBottomIcon((Apparatus) block); IIcon t2 = this.getSideIcon((Apparatus) block);
IIcon t2 = this.getSideIcon((Apparatus) block);
rb.setRenderBounds(w1, 0.0F, w1, 1.0F - w1, 1.0F, 1.0F - w1); rb.setRenderBounds(w1, 0.0F, w1, 1.0F - w1, 1.0F, 1.0F - w1);
if (inv) { if (inv) {
BlockRenderer.drawFaces(rb, block, t1, t1, t2, t2, t2, t2, false); BlockRenderer.drawFaces(rb, block, t1, t1, t2, t2, t2, t2, false);
} else { } else {
rb.renderStandardBlock(block, i, j, k);
}
if (!inv) {
rb.overrideBlockTexture = this.getBottomIcon((Apparatus) block);
TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k);
HelperLocation loc = new HelperLocation(tc);
loc.facing = ForgeDirection.WEST;
TileEntity te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing)
&& !(te instanceof TileConduitTank)) {
rb.setRenderBounds(0.0F, 0.5F - w2, 0.5F - w2, w1, 0.5F + w2, 0.5F + w2);
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} }
if (!inv) { loc = new HelperLocation(tc);
rb.overrideBlockTexture = this.getBottomIcon((Apparatus) block); loc.facing = ForgeDirection.EAST;
TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k); te = loc.getConnectableTile(w);
HelperLocation loc = new HelperLocation(tc); if (te != null && tc.getConnectable(loc.facing)
loc.facing = ForgeDirection.WEST; && !(te instanceof TileConduitTank)) {
TileEntity te = loc.getConnectableTile(w); rb.setRenderBounds(
if (te != null && tc.getConnectable(loc.facing) 1.0F - w1, 0.5F - w2, 0.5F - w2, 1.0F, 0.5F + w2, 0.5F + w2
&& !(te instanceof TileConduitTank)) { );
rb.setRenderBounds( rb.renderStandardBlock(block, i, j, k);
0.0F, 0.5F - w2, 0.5F - w2, w1, 0.5F + w2, 0.5F + w2 }
);
rb.renderStandardBlock(block, i, j, k);
}
loc = new HelperLocation(tc); loc = new HelperLocation(tc);
loc.facing = ForgeDirection.EAST; loc.facing = ForgeDirection.NORTH;
te = loc.getConnectableTile(w); te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing) if (te != null && tc.getConnectable(loc.facing)
&& !(te instanceof TileConduitTank)) { && !(te instanceof TileConduitTank)) {
rb.setRenderBounds( rb.setRenderBounds(0.5F - w2, 0.5F - w2, 0.0F, 0.5F + w2, 0.5F + w2, w1);
1.0F - w1, 0.5F - w2, 0.5F - w2, 1.0F, 0.5F + w2, 0.5F + w2 rb.renderStandardBlock(block, i, j, k);
); }
rb.renderStandardBlock(block, i, j, k);
}
loc = new HelperLocation(tc); loc = new HelperLocation(tc);
loc.facing = ForgeDirection.NORTH; loc.facing = ForgeDirection.SOUTH;
te = loc.getConnectableTile(w); te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing) if (te != null && tc.getConnectable(loc.facing)
&& !(te instanceof TileConduitTank)) { && !(te instanceof TileConduitTank)) {
rb.setRenderBounds( rb.setRenderBounds(
0.5F - w2, 0.5F - w2, 0.0F, 0.5F + w2, 0.5F + w2, w1 0.5F - w2, 0.5F - w2, 1.0F - w1, 0.5F + w2, 0.5F + w2, 1.0F
); );
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
}
loc = new HelperLocation(tc);
loc.facing = ForgeDirection.SOUTH;
te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing)
&& !(te instanceof TileConduitTank)) {
rb.setRenderBounds(
0.5F - w2, 0.5F - w2, 1.0F - w1, 0.5F + w2, 0.5F + w2, 1.0F
);
rb.renderStandardBlock(block, i, j, k);
}
} }
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;
if (block.getRenderBlockPass() == 0 && !inv) { if (!inv) {
w1 = 0.003F; w1 = 0.003F;
w2 = 0.0625F; w2 = 0.0625F;
TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k); TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k);

187
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitApparatusRenderer.java
View file

@ -1,7 +1,6 @@
package net.anvilcraft.thaummach.render.apparatus.apparati.fragile; package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
import dev.tilera.auracore.api.HelperLocation; import dev.tilera.auracore.api.HelperLocation;
import dev.tilera.auracore.api.machine.IConnection;
import net.anvilcraft.thaummach.blocks.BlockApparatusFragile; import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
import net.anvilcraft.thaummach.tiles.TileConduit; import net.anvilcraft.thaummach.tiles.TileConduit;
@ -41,55 +40,51 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
boolean visible = false; boolean visible = false;
total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis); total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis);
hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis); hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
if (block.getRenderBlockPass() == 0) { rb.overrideBlockTexture = block.iconConduit;
rb.overrideBlockTexture = block.iconConduit; rb.setRenderBounds(w6, w6, w6, w6 + w4, w6 + w4, w6 + w4);
rb.setRenderBounds(w6, w6, w6, w6 + w4, w6 + w4, w6 + w4); rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z); visible = tc.pureVis + tc.taintedVis >= 0.1F;
visible = tc.pureVis + tc.taintedVis >= 0.1F; if (visible) {
if (visible) { b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis)); tessellator.setBrightness(20 + (int) (b * 210.0F));
tessellator.setBrightness(20 + (int) (b * 210.0F)); tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); rb.setRenderBounds(wq, wq, wq, 1.0F - wq, wq + hfill, 1.0F - wq);
rb.setRenderBounds(wq, wq, wq, 1.0F - wq, wq + hfill, 1.0F - wq); rb.overrideBlockTexture = null;
rb.overrideBlockTexture = null; rb.renderFaceXNeg(
rb.renderFaceXNeg( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); rb.renderFaceXPos(
rb.renderFaceXPos( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); rb.renderFaceYNeg(
rb.renderFaceYNeg( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); rb.renderFaceYPos(
rb.renderFaceYPos( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); rb.renderFaceZNeg(
rb.renderFaceZNeg( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); rb.renderFaceZPos(
rb.renderFaceZPos( block, (double) x, (double) y, (double) z, block.iconTcubeanim
block, (double) x, (double) y, (double) z, block.iconTcubeanim );
); if (/*!Config.lowGfx && Config.pipedrips && */ Minecraft.getMinecraft()
if (/*!Config.lowGfx && Config.pipedrips && */ Minecraft .theWorld.rand.nextInt(50)
.getMinecraft() == 1
.theWorld.rand.nextInt(50) && w.isAirBlock(x, y - 1, z) && tc.pureVis + tc.taintedVis > 3.5F) {
== 1 // TODO: FXDrip
&& w.isAirBlock(x, y - 1, z) //FXDrip obj = new FXDrip(
&& tc.pureVis + tc.taintedVis > 3.5F) { // w,
// TODO: FXDrip // (double) ((float) x + w6 + w.rand.nextFloat() * w4),
//FXDrip obj = new FXDrip( // (double) ((float) y + w6 - 0.05F),
// w, // (double) ((float) z + w6 + w.rand.nextFloat() * w4)
// (double) ((float) x + w6 + w.rand.nextFloat() * w4), //);
// (double) ((float) y + w6 - 0.05F), //obj.func_40097_b(
// (double) ((float) z + w6 + w.rand.nextFloat() * w4) // (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F),
//); // 0.0F,
//obj.func_40097_b( // (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F)
// (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F), //);
// 0.0F, //ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
// (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F)
//);
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
}
} }
} }
@ -100,63 +95,53 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
TileEntity te = loc.getConnectableTile(w); TileEntity te = loc.getConnectableTile(w);
if (te != null) { if (te != null) {
if (block.getRenderBlockPass() == 0) { switch (loc.facing.getOpposite().ordinal()) {
switch (loc.facing.getOpposite().ordinal()) { case 0:
case 0: rb.setRenderBounds(w6, w6 + w4, w6, w6 + w4, 1.0F, w6 + w4);
rb.setRenderBounds( rb.renderStandardBlock(block, x, y, z);
w6, w6 + w4, w6, w6 + w4, 1.0F, w6 + w4 break;
); case 1:
rb.renderStandardBlock(block, x, y, z); rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, w6, w6 + w4);
break; rb.renderStandardBlock(block, x, y, z);
case 1: break;
rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, w6, w6 + w4); case 2:
rb.renderStandardBlock(block, x, y, z); rb.setRenderBounds(w6, w6, w6 + w4, w6 + w4, w6 + w4, 1.0F);
break; rb.renderStandardBlock(block, x, y, z);
case 2: break;
rb.setRenderBounds( case 3:
w6, w6, w6 + w4, w6 + w4, w6 + w4, 1.0F rb.setRenderBounds(w6, w6, 0.0F, w6 + w4, w6 + w4, w6);
); rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z); break;
break; case 4:
case 3: rb.setRenderBounds(w6 + w4, w6, w6, 1.0F, w6 + w4, w6 + w4);
rb.setRenderBounds(w6, w6, 0.0F, w6 + w4, w6 + w4, w6); rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z); break;
break; case 5:
case 4: rb.setRenderBounds(0.0F, w6, w6, w6, w6 + w4, w6 + w4);
rb.setRenderBounds( rb.renderStandardBlock(block, x, y, z);
w6 + w4, w6, w6, 1.0F, w6 + w4, w6 + w4 }
);
rb.renderStandardBlock(block, x, y, z);
break;
case 5:
rb.setRenderBounds(0.0F, w6, w6, w6, w6 + w4, w6 + w4);
rb.renderStandardBlock(block, x, y, z);
}
if (visible) { if (visible) {
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;
tessellator.setBrightness(20 + (int) (b * 210.0F)); tessellator.setBrightness(20 + (int) (b * 210.0F));
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
renderConduitVis( renderConduitVis(
w, w,
rb, rb,
x, x,
y, y,
z, z,
block, block,
loc.facing.getOpposite().ordinal(), loc.facing.getOpposite().ordinal(),
hfill hfill
); );
rb.overrideBlockTexture = block.iconConduitExtension; rb.overrideBlockTexture = block.iconConduitExtension;
}
} }
} }
} }
} else { } else {
rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, 1.0F, w6 + w4); rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, 1.0F, w6 + w4);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
rb, block, block.iconConduitInventory, false
);
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

160
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitValveAdvancedApparatusRenderer.java
View file

@ -1,7 +1,6 @@
package net.anvilcraft.thaummach.render.apparatus.apparati.fragile; package net.anvilcraft.thaummach.render.apparatus.apparati.fragile;
import dev.tilera.auracore.api.HelperLocation; import dev.tilera.auracore.api.HelperLocation;
import dev.tilera.auracore.api.machine.IConnection;
import net.anvilcraft.thaummach.blocks.BlockApparatusFragile; import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer; import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
import net.anvilcraft.thaummach.tiles.TileConduitValveAdvanced; import net.anvilcraft.thaummach.tiles.TileConduitValveAdvanced;
@ -41,48 +40,42 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
float total = 0.0F; float total = 0.0F;
float hfill = 0.0F; float hfill = 0.0F;
boolean visible = false; boolean visible = false;
if (block.getRenderBlockPass() == 0) { switch (tc.setting) {
switch (tc.setting) { case 0:
case 0: rb.overrideBlockTexture = block.iconValveAdvancedOff;
rb.overrideBlockTexture = block.iconValveAdvancedOff; break;
break; case 1:
case 1: rb.overrideBlockTexture = block.iconValveAdvancedOnVis;
rb.overrideBlockTexture = block.iconValveAdvancedOnVis; break;
break; case 2:
case 2: rb.overrideBlockTexture = block.iconValveAdvancedOnTaint;
rb.overrideBlockTexture = block.iconValveAdvancedOnTaint; }
}
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4); rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
rb.overrideBlockTexture = block.iconConduitExtension; rb.overrideBlockTexture = block.iconConduitExtension;
} else { visible = tc.pureVis + tc.taintedVis >= 0.1F;
visible = tc.pureVis + tc.taintedVis >= 0.1F; if (visible) {
if (visible) { b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
b = Math.min( total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis);
1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis) hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
); tessellator.setBrightness(20 + (int) (b * 210.0F));
total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis); tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis); if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1
tessellator.setBrightness(20 + (int) (b * 210.0F)); && w.isAirBlock(i, j - 1, k) && tc.pureVis + tc.taintedVis > 3.5F) {
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); // TODO: WTF
if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1 //FXDrip obj = new FXDrip(
&& w.isAirBlock(i, j - 1, k) // w,
&& tc.pureVis + tc.taintedVis > 3.5F) { // (double) ((float) i + w4 + w.rand.nextFloat() * w6),
// TODO: WTF // (double) ((float) j + w4 - 0.05F),
//FXDrip obj = new FXDrip( // (double) ((float) k + w4 + w.rand.nextFloat() * w6)
// w, //);
// (double) ((float) i + w4 + w.rand.nextFloat() * w6), //obj.func_40097_b(
// (double) ((float) j + w4 - 0.05F), // (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F),
// (double) ((float) k + w4 + w.rand.nextFloat() * w6) // 0.0F,
//); // (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F)
//obj.func_40097_b( //);
// (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F), //ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
// 0.0F,
// (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F)
//);
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
}
} }
} }
@ -92,60 +85,47 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
TileEntity te = loc.getConnectableTile(w); TileEntity te = loc.getConnectableTile(w);
if (te != null) { if (te != null) {
if (block.getRenderBlockPass() == 0) { switch (dir) {
switch (dir) { case 0:
case 0: rb.setRenderBounds(
rb.setRenderBounds( w6, 1.0F - w4, w6, 1.0F - w6, 1.0F, 1.0F - w6
w6, 1.0F - w4, w6, 1.0F - w6, 1.0F, 1.0F - w6 );
); rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); break;
break; case 1:
case 1: rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, w6, 1.0F - w6);
rb.setRenderBounds( rb.renderStandardBlock(block, i, j, k);
w6, 0.0F, w6, 1.0F - w6, w6, 1.0F - w6 break;
); case 2:
rb.renderStandardBlock(block, i, j, k); rb.setRenderBounds(
break; w6, w6, 1.0F - w4, 1.0F - w6, 1.0F - w6, 1.0F
case 2: );
rb.setRenderBounds( rb.renderStandardBlock(block, i, j, k);
w6, w6, 1.0F - w4, 1.0F - w6, 1.0F - w6, 1.0F break;
); case 3:
rb.renderStandardBlock(block, i, j, k); rb.setRenderBounds(w6, w6, 0.0F, 1.0F - w6, 1.0F - w6, w4);
break; rb.renderStandardBlock(block, i, j, k);
case 3: break;
rb.setRenderBounds( case 4:
w6, w6, 0.0F, 1.0F - w6, 1.0F - w6, w4 rb.setRenderBounds(
); 1.0F - w4, w6, w6, 1.0F, 1.0F - w6, 1.0F - w6
rb.renderStandardBlock(block, i, j, k); );
break; rb.renderStandardBlock(block, i, j, k);
case 4: break;
rb.setRenderBounds( case 5:
1.0F - w4, w6, w6, 1.0F, 1.0F - w6, 1.0F - w6 rb.setRenderBounds(0.0F, w6, w6, w4, 1.0F - w6, 1.0F - w6);
); rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k);
break;
case 5:
rb.setRenderBounds(
0.0F, w6, w6, w4, 1.0F - w6, 1.0F - w6
);
rb.renderStandardBlock(block, i, j, k);
}
} else if (visible && (((IConnection)te).getPureVis() + ((IConnection)te).getTaintedVis() > 0.1F || !((IConnection)te).isVisConduit())) {
ConduitApparatusRenderer.renderConduitVis(
w, rb, i, j, k, block, dir, hfill
);
} }
ConduitApparatusRenderer.renderConduitVis(
w, rb, i, j, k, block, dir, hfill
);
} }
} }
} else { } else {
rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6); rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
rb, block, block.iconConduitInventory, false
);
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4); rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconValveAdvancedOff, false);
rb, block, block.iconValveAdvancedOff, false
);
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

64
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/ConduitValveApparatusRenderer.java
View file

@ -39,39 +39,35 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
float total = 0.0F; float total = 0.0F;
float hfill = 0.0F; float hfill = 0.0F;
boolean visible = tc.pureVis + tc.taintedVis >= 0.1F; boolean visible = tc.pureVis + tc.taintedVis >= 0.1F;
if (block.getRenderBlockPass() == 0) { if (tc.open) {
if (tc.open) { rb.overrideBlockTexture = block.iconValveOn;
rb.overrideBlockTexture = block.iconValveOn;
} else {
rb.overrideBlockTexture = block.iconValveOff;
}
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
rb.renderStandardBlock(block, i, j, k);
rb.overrideBlockTexture = block.iconConduitExtension;
} else { } else {
if (visible) { rb.overrideBlockTexture = block.iconValveOff;
total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis); }
hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
tessellator.setBrightness(20 + (int) (b * 210.0F)); rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F); rb.renderStandardBlock(block, i, j, k);
if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1 rb.overrideBlockTexture = block.iconConduitExtension;
&& w.isAirBlock(i, j - 1, k) if (visible) {
&& tc.pureVis + tc.taintedVis > 3.5F) { total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis);
// TODO: FXDrip hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
//FXDrip obj = new FXDrip( tessellator.setBrightness(20 + (int) (b * 210.0F));
// w, tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
// (double) ((float) i + w4 + w.rand.nextFloat() * w6), if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1
// (double) ((float) j + w4 - 0.05F), && w.isAirBlock(i, j - 1, k) && tc.pureVis + tc.taintedVis > 3.5F) {
// (double) ((float) k + w4 + w.rand.nextFloat() * w6) // TODO: FXDrip
//); //FXDrip obj = new FXDrip(
//obj.func_40097_b( // w,
// (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F), // (double) ((float) i + w4 + w.rand.nextFloat() * w6),
// 0.0F, // (double) ((float) j + w4 - 0.05F),
// (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F) // (double) ((float) k + w4 + w.rand.nextFloat() * w6)
//); //);
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj); //obj.func_40097_b(
} // (0.4F + w.rand.nextFloat() * 0.2F) * (b + 0.1F),
// 0.0F,
// (0.8F + w.rand.nextFloat() * 0.2F) * (b + 0.1F)
//);
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
} }
} }
@ -151,9 +147,7 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
} }
} else { } else {
rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6); rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
rb, block, block.iconConduitInventory, false
);
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4); rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
BlockRenderer.drawFaces(rb, block, block.iconValveOn, false); BlockRenderer.drawFaces(rb, block, block.iconValveOn, false);
} }

161
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/FilterApparatusRenderer.java
View file

@ -31,57 +31,55 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
float w4 = 0.25F; float w4 = 0.25F;
float w3 = 0.1875F; float w3 = 0.1875F;
float w2 = 0.125F; float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(w2, 0.0F, w2, 1.0F - w2, w3, 1.0F - w2);
rb.setRenderBounds(w2, 0.0F, w2, 1.0F - w2, w3, 1.0F - w2); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconFilterBottom,
block.iconFilterBottom, block.iconFilterBottom,
block.iconFilterBottom, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, false
false );
); } else {
} else { rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z); }
}
rb.setRenderBounds(w2, 1.0F - w3, w2, 1.0F - w2, 1.0F, 1.0F - w2); rb.setRenderBounds(w2, 1.0F - w3, w2, 1.0F - w2, 1.0F, 1.0F - w2);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconFilterBottom, block.iconFilterBottom,
block.iconFilterBottom, block.iconFilterBottom,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
false false
); );
} else { } else {
rb.renderStandardBlock(block, x, y, z); rb.renderStandardBlock(block, x, y, z);
} }
rb.setRenderBounds(w3, w3, w3, 1.0F - w3, 1.0F - w3, 1.0F - w3); rb.setRenderBounds(w3, w3, w3, 1.0F - w3, 1.0F - w3, 1.0F - w3);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconFilterBottom, block.iconFilterBottom,
block.iconFilterBottom, block.iconFilterBottom,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
block.iconFilterSide, block.iconFilterSide,
false false
); );
} else { } else {
rb.renderStandardBlock(block, x, y, z); rb.renderStandardBlock(block, x, y, z);
}
} }
if (!inv) { if (!inv) {
@ -93,17 +91,13 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
float total = 0.0F; float total = 0.0F;
float hfill = 0.0F; float hfill = 0.0F;
boolean visible = false; boolean visible = false;
if (block.getRenderBlockPass() != 0) { visible = tc.pureVis + tc.taintedVis >= 0.1F;
visible = tc.pureVis + tc.taintedVis >= 0.1F; if (visible) {
if (visible) { b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
b = Math.min( total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis);
1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis) hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
); tessellator.setBrightness(20 + (int) (b * 210.0F));
total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis); tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
tessellator.setBrightness(20 + (int) (b * 210.0F));
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
}
} }
for (int dir = 2; dir < 6; ++dir) { for (int dir = 2; dir < 6; ++dir) {
@ -124,34 +118,27 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
TileEntity te = loc.getConnectableTile(w); TileEntity te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing)) { if (te != null && tc.getConnectable(loc.facing)) {
if (block.getRenderBlockPass() == 0) { rb.overrideBlockTexture = block.iconConduitConnection;
rb.overrideBlockTexture = block.iconConduitConnection; switch (dir) {
switch (dir) { case 2:
case 2: rb.setRenderBounds(w6, w6, 1.0F - w3, w6 + w4, w6 + w4, 1.0F);
rb.setRenderBounds( rb.renderStandardBlock(block, x, y, z);
w6, w6, 1.0F - w3, w6 + w4, w6 + w4, 1.0F break;
); case 3:
rb.renderStandardBlock(block, x, y, z); rb.setRenderBounds(w6, w6, 0.0F, w6 + w4, w6 + w4, w3);
break; rb.renderStandardBlock(block, x, y, z);
case 3: break;
rb.setRenderBounds(w6, w6, 0.0F, w6 + w4, w6 + w4, w3); case 4:
rb.renderStandardBlock(block, x, y, z); rb.setRenderBounds(1.0F - w3, w6, w6, 1.0F, w6 + w4, w6 + w4);
break; rb.renderStandardBlock(block, x, y, z);
case 4: break;
rb.setRenderBounds( case 5:
1.0F - w3, w6, w6, 1.0F, w6 + w4, w6 + w4 rb.setRenderBounds(0.0F, w6, w6, w3, w6 + w4, w6 + w4);
); rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z);
break;
case 5:
rb.setRenderBounds(0.0F, w6, w6, w3, w6 + w4, w6 + w4);
rb.renderStandardBlock(block, x, y, z);
}
} else if (visible && (((IConnection)te).getPureVis() + ((IConnection)te).getTaintedVis() > 0.1F || !((IConnection)te).isVisConduit())) {
ConduitApparatusRenderer.renderConduitVis(
w, rb, x, y, z, block, dir, hfill
);
} }
ConduitApparatusRenderer.renderConduitVis(
w, rb, x, y, z, block, dir, hfill
);
} }
} }
} }

32
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/fragile/PurifierApparatusRenderer.java
View file

@ -22,23 +22,21 @@ public class PurifierApparatusRenderer implements IApparatusRenderer {
boolean inv boolean inv
) { ) {
BlockApparatusFragile block = (BlockApparatusFragile) block_; BlockApparatusFragile block = (BlockApparatusFragile) block_;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconPurifierTop,
block.iconPurifierTop, block.iconPurifierTop,
block.iconPurifierTop, block.iconPurifierFront,
block.iconPurifierFront, block.iconPurifierFront,
block.iconPurifierFront, block.iconPurifierSide,
block.iconPurifierSide, block.iconPurifierSide,
block.iconPurifierSide, false
false );
); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k);
}
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

4
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/ArcaneFurnaceApparatusRenderer.java
View file

@ -23,7 +23,7 @@ public class ArcaneFurnaceApparatusRenderer implements IApparatusRenderer {
boolean inv boolean inv
) { ) {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
if (block.getRenderBlockPass() == 0 && !inv) { if (!inv) {
float w3 = 0.1875F; float w3 = 0.1875F;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
@ -62,7 +62,7 @@ public class ArcaneFurnaceApparatusRenderer implements IApparatusRenderer {
(double) ((float) (k + 1) - w3), (double) ((float) (k + 1) - w3),
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
} else if (inv) { } else {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,

160
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/BoreApparatusRenderer.java
View file

@ -24,100 +24,98 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
boolean inv boolean inv
) { ) {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
if (block.getRenderBlockPass() == 0 || inv) { boolean b1 = false;
boolean b1 = false; boolean b2 = false;
boolean b2 = false; boolean b3 = false;
boolean b3 = false; if (!inv) {
if (!inv) { TileBore te = (TileBore) w.getTileEntity(i, j, k);
TileBore te = (TileBore) w.getTileEntity(i, j, k); if (te.orientation == 0 || te.orientation == 1) {
if (te.orientation == 0 || te.orientation == 1) { b1 = true;
b1 = true;
}
if (te.orientation == 4 || te.orientation == 5) {
b2 = true;
}
if (te.orientation == 2 || te.orientation == 3) {
b3 = true;
}
} }
float t2x = 0.125F; if (te.orientation == 4 || te.orientation == 5) {
float t4x = 0.25F; b2 = true;
IIcon t1 = block.iconGenerator3;
IIcon t2 = block.iconGenerator2;
IIcon tx = block.iconGenerator3;
rb.overrideBlockTexture = tx;
rb.setRenderBounds(t2x, t2x, t2x, 1.0F - t2x, 1.0F - t2x, 1.0F - t2x);
if (inv) {
BlockRenderer.drawFaces(rb, block, t1, true);
} else {
rb.renderStandardBlock(block, i, j, k);
} }
if (b1) { if (te.orientation == 2 || te.orientation == 3) {
tx = t2; b3 = true;
} else {
tx = t1;
} }
}
rb.overrideBlockTexture = tx; float t2x = 0.125F;
rb.setRenderBounds(t4x, 0.0F, t4x, 1.0F - t4x, t2x, 1.0F - t4x); float t4x = 0.25F;
if (inv) { IIcon t1 = block.iconGenerator3;
BlockRenderer.drawFaces(rb, block, tx, true); IIcon t2 = block.iconGenerator2;
} else { IIcon tx = block.iconGenerator3;
rb.renderStandardBlock(block, i, j, k); rb.overrideBlockTexture = tx;
} rb.setRenderBounds(t2x, t2x, t2x, 1.0F - t2x, 1.0F - t2x, 1.0F - t2x);
if (inv) {
BlockRenderer.drawFaces(rb, block, t1, true);
} else {
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(t4x, 1.0F - t2x, t4x, 1.0F - t4x, 1.0F, 1.0F - t4x); if (b1) {
if (inv) { tx = t2;
BlockRenderer.drawFaces(rb, block, tx, true); } else {
} else { tx = t1;
rb.renderStandardBlock(block, i, j, k); }
}
if (b2) { rb.overrideBlockTexture = tx;
tx = t2; rb.setRenderBounds(t4x, 0.0F, t4x, 1.0F - t4x, t2x, 1.0F - t4x);
} else { if (inv) {
tx = t1; BlockRenderer.drawFaces(rb, block, tx, true);
} } else {
rb.renderStandardBlock(block, i, j, k);
}
rb.overrideBlockTexture = tx; rb.setRenderBounds(t4x, 1.0F - t2x, t4x, 1.0F - t4x, 1.0F, 1.0F - t4x);
rb.setRenderBounds(0.0F, t4x, t4x, t2x, 1.0F - t4x, 1.0F - t4x); if (inv) {
if (inv) { BlockRenderer.drawFaces(rb, block, tx, true);
BlockRenderer.drawFaces(rb, block, tx, true); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); }
}
rb.setRenderBounds(1.0F - t2x, t4x, t4x, 1.0F, 1.0F - t4x, 1.0F - t4x); if (b2) {
if (inv) { tx = t2;
BlockRenderer.drawFaces(rb, block, tx, true); } else {
} else { tx = t1;
rb.renderStandardBlock(block, i, j, k); }
}
if (b3) { rb.overrideBlockTexture = tx;
tx = t2; rb.setRenderBounds(0.0F, t4x, t4x, t2x, 1.0F - t4x, 1.0F - t4x);
} else { if (inv) {
tx = t1; BlockRenderer.drawFaces(rb, block, tx, true);
} } else {
rb.renderStandardBlock(block, i, j, k);
}
rb.overrideBlockTexture = tx; rb.setRenderBounds(1.0F - t2x, t4x, t4x, 1.0F, 1.0F - t4x, 1.0F - t4x);
rb.setRenderBounds(t4x, t4x, 0.0F, 1.0F - t4x, 1.0F - t4x, t2x); if (inv) {
if (inv) { BlockRenderer.drawFaces(rb, block, tx, true);
BlockRenderer.drawFaces(rb, block, tx, true); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); }
}
rb.setRenderBounds(t4x, t4x, 1.0F - t2x, 1.0F - t4x, 1.0F - t4x, 1.0F); if (b3) {
if (inv) { tx = t2;
BlockRenderer.drawFaces(rb, block, tx, true); } else {
} else { tx = t1;
rb.renderStandardBlock(block, i, j, k); }
}
rb.overrideBlockTexture = tx;
rb.setRenderBounds(t4x, t4x, 0.0F, 1.0F - t4x, 1.0F - t4x, t2x);
if (inv) {
BlockRenderer.drawFaces(rb, block, tx, true);
} else {
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(t4x, t4x, 1.0F - t2x, 1.0F - t4x, 1.0F - t4x, 1.0F);
if (inv) {
BlockRenderer.drawFaces(rb, block, tx, true);
} else {
rb.renderStandardBlock(block, i, j, k);
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

143
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/CrucibleApparatusRenderer.java
View file

@ -29,14 +29,11 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
MetaVals md = MetaVals.get(meta); MetaVals md = MetaVals.get(meta);
IIcon[] icons = getIcons(block, md); IIcon[] icons = getIcons(block, md);
if (block.getRenderBlockPass() == 0 && !inv) { if (!inv) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} else if (inv && } else if ((md == MetaVals.NORMAL_CRUCIBLE || md == MetaVals.EYES_CRUCIBLE
(md == MetaVals.NORMAL_CRUCIBLE || md == MetaVals.THAUMIUM_CRUCIBLE)) {
|| md == MetaVals.EYES_CRUCIBLE
|| md == MetaVals.THAUMIUM_CRUCIBLE)
) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
@ -49,7 +46,7 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
icons[5], icons[5],
true true
); );
} else if (inv && md == MetaVals.SOUL_CRUCIBLE) { } else if (md == MetaVals.SOUL_CRUCIBLE) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
@ -88,75 +85,73 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
f5 = 0.123F; f5 = 0.123F;
if (!inv) { if (!inv) {
if (block.getRenderBlockPass() == 0) { rb.renderFaceXPos(
rb.renderFaceXPos( block, (double) ((float) i - 1.0F + f5), (double) j, (double) k, c
block, (double) ((float) i - 1.0F + f5), (double) j, (double) k, c );
); rb.renderFaceXNeg(
rb.renderFaceXNeg( block, (double) ((float) i + 1.0F - f5), (double) j, (double) k, c
block, (double) ((float) i + 1.0F - f5), (double) j, (double) k, c );
); rb.renderFaceZPos(
rb.renderFaceZPos( block, (double) i, (double) j, (double) ((float) k - 1.0F + f5), c
block, (double) i, (double) j, (double) ((float) k - 1.0F + f5), c );
); rb.renderFaceZNeg(
rb.renderFaceZNeg( block, (double) i, (double) j, (double) ((float) k + 1.0F - f5), c
block, (double) i, (double) j, (double) ((float) k + 1.0F - f5), c );
); rb.renderFaceYPos(
block, (double) i, (double) ((float) j - 1.0F + 0.25F), (double) k, c1
);
rb.renderFaceYNeg(
block, (double) i, (double) ((float) j + 1.0F - 0.75F), (double) k, c1
);
TileCrucible tc = (TileCrucible) w.getTileEntity(i, j, k);
float tvis = tc.pureVis + tc.taintedVis;
if (tvis > 0.1F) {
float h = Math.min(tvis, tc.maxVis);
float level = 0.75F * (h / tc.maxVis);
if (tc.maxVis == tvis) {
level = (float) ((double) level - 0.001);
}
float b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
tessellator.setBrightness(20 + (int) (b * 210.0F));
rb.renderFaceYPos( rb.renderFaceYPos(
block, (double) i, (double) ((float) j - 1.0F + 0.25F), (double) k, c1 block,
(double) i,
(double) ((float) j + 0.25F + level - 1.0F),
(double) k,
block.iconTcubeanim
); );
rb.renderFaceYNeg( if (tvis > tc.maxVis) {
block, (double) i, (double) ((float) j + 1.0F - 0.75F), (double) k, c1 // TODO: WTF
); //rb.renderSouthFace(
// block,
TileCrucible tc = (TileCrucible) w.getTileEntity(i, j, k); // (double) i,
float tvis = tc.pureVis + tc.taintedVis; // (double) j,
if (tvis > 0.1F) { // (double) k,
float h = Math.min(tvis, tc.maxVis); // mod_ThaumCraft.visDripFX
float level = 0.75F * (h / tc.maxVis); //);
if (tc.maxVis == tvis) { //rb.renderNorthFace(
level = (float) ((double) level - 0.001); // block,
} // (double) i,
// (double) j,
float b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis)); // (double) k,
tessellator.setBrightness(20 + (int) (b * 210.0F)); // mod_ThaumCraft.visDripFX
rb.renderFaceYPos( //);
block, //rb.renderWestFace(
(double) i, // block,
(double) ((float) j + 0.25F + level - 1.0F), // (double) i,
(double) k, // (double) j,
block.iconTcubeanim // (double) k,
); // mod_ThaumCraft.visDripFX
if (tvis > tc.maxVis) { //);
// TODO: WTF //rb.renderEastFace(
//rb.renderSouthFace( // block,
// block, // (double) i,
// (double) i, // (double) j,
// (double) j, // (double) k,
// (double) k, // mod_ThaumCraft.visDripFX
// mod_ThaumCraft.visDripFX //);
//);
//rb.renderNorthFace(
// block,
// (double) i,
// (double) j,
// (double) k,
// mod_ThaumCraft.visDripFX
//);
//rb.renderWestFace(
// block,
// (double) i,
// (double) j,
// (double) k,
// mod_ThaumCraft.visDripFX
//);
//rb.renderEastFace(
// block,
// (double) i,
// (double) j,
// (double) k,
// mod_ThaumCraft.visDripFX
//);
}
} }
} }
} }

112
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/CrystallizerApparatusRenderer.java
View file

@ -24,64 +24,62 @@ public class CrystallizerApparatusRenderer implements IApparatusRenderer {
) { ) {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
float w2 = 0.125F; float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F);
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconCrystallizerBottom,
block.iconCrystallizerBottom, block.iconCrystallizerTop,
block.iconCrystallizerTop, block.iconCrystallizerSide,
block.iconCrystallizerSide, block.iconCrystallizerSide,
block.iconCrystallizerSide, block.iconCrystallizerSide,
block.iconCrystallizerSide, block.iconCrystallizerSide,
block.iconCrystallizerSide, true
true );
); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); }
}
// TODO: no inside in inventory // TODO: no inside in inventory
if (!inv) { if (!inv) {
float w3 = 0.1875F; float w3 = 0.1875F;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F);
rb.renderFaceXPos( rb.renderFaceXPos(
block, block,
(double) ((float) (i - 1) + w3), (double) ((float) (i - 1) + w3),
(double) j, (double) j,
(double) k, (double) k,
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
rb.renderFaceXNeg( rb.renderFaceXNeg(
block, block,
(double) ((float) (i + 1) - w3), (double) ((float) (i + 1) - w3),
(double) j, (double) j,
(double) k, (double) k,
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
rb.renderFaceZPos( rb.renderFaceZPos(
block, block,
(double) i, (double) i,
(double) j, (double) j,
(double) ((float) (k - 1) + w3), (double) ((float) (k - 1) + w3),
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
rb.renderFaceZNeg( rb.renderFaceZNeg(
block, block,
(double) i, (double) i,
(double) j, (double) j,
(double) ((float) (k + 1) - w3), (double) ((float) (k + 1) - w3),
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
rb.renderFaceYPos( rb.renderFaceYPos(
block, block,
(double) i, (double) i,
(double) ((float) j - 0.49F), (double) ((float) j - 0.49F),
(double) k, (double) k,
block.iconArcaneFurnaceInside block.iconArcaneFurnaceInside
); );
}
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

110
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/GeneratorApparatusRenderer.java
View file

@ -25,67 +25,59 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
float w2 = 0.125F; float w2 = 0.125F;
float w4 = 0.25F; float w4 = 0.25F;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(w4, 0.0F, w4, 1.0F - w4, w2, 1.0F - w4);
rb.setRenderBounds(w4, 0.0F, w4, 1.0F - w4, w2, 1.0F - w4); if (inv) {
if (inv) { BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true); } else {
} else { rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(w4, 1.0F - w2, w4, 1.0F - w4, 1.0F, 1.0F - w4);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(
1.0F - w2, 0.5F - w4, 0.5F - w4, 1.0F, 0.5F + w4, 0.5F + w4
);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(0.0F, 0.5F - w4, 0.5F - w4, w2, 0.5F + w4, 0.5F + w4);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(
0.5F - w4, 0.5F - w4, 1.0F - w2, 0.5F + w4, 0.5F + w4, 1.0F
);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(0.5F - w4, 0.5F - w4, 0.0F, 0.5F + w4, 0.5F + w4, w2);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
} }
if (block.getRenderBlockPass() == 1 || inv) { rb.setRenderBounds(w4, 1.0F - w2, w4, 1.0F - w4, 1.0F, 1.0F - w4);
rb.overrideBlockTexture = null; if (inv) {
rb.setRenderBounds(w2, w2, w2, 1.0F - w2, 1.0F - w2, 1.0F - w2); BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
if (inv) { } else {
BlockRenderer.drawFaces(rb, block, block.iconGenerator4, true); rb.renderStandardBlock(block, x, y, z);
} else { }
rb.renderFaceYNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceYPos(block, x, y, z, block.iconGenerator4); rb.setRenderBounds(1.0F - w2, 0.5F - w4, 0.5F - w4, 1.0F, 0.5F + w4, 0.5F + w4);
rb.renderFaceXNeg(block, x, y, z, block.iconGenerator4); if (inv) {
rb.renderFaceXPos(block, x, y, z, block.iconGenerator4); BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
rb.renderFaceZNeg(block, x, y, z, block.iconGenerator4); } else {
rb.renderFaceZPos(block, x, y, z, block.iconGenerator4); rb.renderStandardBlock(block, x, y, z);
} }
rb.setRenderBounds(0.0F, 0.5F - w4, 0.5F - w4, w2, 0.5F + w4, 0.5F + w4);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(0.5F - w4, 0.5F - w4, 1.0F - w2, 0.5F + w4, 0.5F + w4, 1.0F);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.setRenderBounds(0.5F - w4, 0.5F - w4, 0.0F, 0.5F + w4, 0.5F + w4, w2);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
} else {
rb.renderStandardBlock(block, x, y, z);
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(w2, w2, w2, 1.0F - w2, 1.0F - w2, 1.0F - w2);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator4, true);
} else {
rb.renderFaceYNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceYPos(block, x, y, z, block.iconGenerator4);
rb.renderFaceXNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceXPos(block, x, y, z, block.iconGenerator4);
rb.renderFaceZNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceZPos(block, x, y, z, block.iconGenerator4);
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

166
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/SoulBrazierApparatusRenderer.java
View file

@ -24,94 +24,92 @@ public class SoulBrazierApparatusRenderer implements IApparatusRenderer {
) { ) {
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
if (block.getRenderBlockPass() == 0 || inv) { float t4 = 0.25F;
float t4 = 0.25F; float t2 = 0.125F;
float t2 = 0.125F; float t6 = 0.375F;
float t6 = 0.375F; rb.setRenderBounds(t2, 0.5F, t6, t4, 1.0F, 1.0F - t6);
rb.setRenderBounds(t2, 0.5F, t6, t4, 1.0F, 1.0F - t6); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, true
true );
); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); }
}
rb.setRenderBounds(t6, 0.5F, t2, 1.0F - t6, 1.0F, t4); rb.setRenderBounds(t6, 0.5F, t2, 1.0F - t6, 1.0F, t4);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
true true
); );
} else { } else {
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} }
rb.setRenderBounds(1.0F - t4, 0.5F, t6, 1.0F - t2, 1.0F, 1.0F - t6); rb.setRenderBounds(1.0F - t4, 0.5F, t6, 1.0F - t2, 1.0F, 1.0F - t6);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
true true
); );
} else { } else {
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} }
rb.setRenderBounds(t6, 0.5F, 1.0F - t4, 1.0F - t6, 1.0F, 1.0F - t2); rb.setRenderBounds(t6, 0.5F, 1.0F - t4, 1.0F - t6, 1.0F, 1.0F - t2);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
true true
); );
} else { } else {
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} }
rb.setRenderBounds(t4, 0.0F, t4, 1.0F - t4, 0.5F + t4, 1.0F - t4); rb.setRenderBounds(t4, 0.0F, t4, 1.0F - t4, 0.5F + t4, 1.0F - t4);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
block.iconSoulBrazierBottom, block.iconSoulBrazierBottom,
true true
); );
} else { } else {
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
}
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

2
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/VoidChestApparatusRenderer.java
View file

@ -36,7 +36,7 @@ public class VoidChestApparatusRenderer implements IApparatusRenderer {
block.iconVoidChestSide, block.iconVoidChestSide,
true true
); );
} else if (block.getRenderBlockPass() == 0) { } else {
rb.renderStandardBlock(block, x, y, z); rb.renderStandardBlock(block, x, y, z);
} }
} }

2
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/metal/VoidInterfaceApparatusRenderer.java
View file

@ -26,7 +26,6 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
float t3x = 0.1875F; float t3x = 0.1875F;
float t4x = 0.25F; float t4x = 0.25F;
BlockApparatusMetal block = (BlockApparatusMetal) block_; BlockApparatusMetal block = (BlockApparatusMetal) block_;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, t3x, 1.0F); rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, t3x, 1.0F);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
@ -77,7 +76,6 @@ public class VoidInterfaceApparatusRenderer implements IApparatusRenderer {
} else { } else {
rb.renderStandardBlock(block, x, y, z); rb.renderStandardBlock(block, x, y, z);
} }
}
rb.setRenderBounds(t1x, t3x, t1x, 1.0F - t1x, 0.5F - t4x, 1.0F - t1x); rb.setRenderBounds(t1x, t3x, t1x, 1.0F - t1x, 0.5F - t4x, 1.0F - t1x);
if (!inv) { if (!inv) {

142
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/wood/CondenserApparatusRenderer.java
View file

@ -28,89 +28,79 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
float w4 = 0.25F; float w4 = 0.25F;
float w3 = 0.1875F; float w3 = 0.1875F;
float w2 = 0.125F; float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(w3, 1.0F - w4, w3, 1.0F - w3, 1.0F, 1.0F - w3);
rb.setRenderBounds(w3, 1.0F - w4, w3, 1.0F - w3, 1.0F, 1.0F - w3); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconCondenserTop,
block.iconCondenserTop, block.iconCondenserTop,
block.iconCondenserTop, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, false
false );
); } else {
} else { rb.renderStandardBlock(block, i, j, k);
rb.renderStandardBlock(block, i, j, k); }
}
rb.setRenderBounds(w3, 0.0F, w3, 1.0F - w3, w4, 1.0F - w3); rb.setRenderBounds(w3, 0.0F, w3, 1.0F - w3, w4, 1.0F - w3);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
block.iconCondenserTop, block.iconCondenserTop,
block.iconCondenserTop, block.iconCondenserTop,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
block.iconCondenserSide, block.iconCondenserSide,
false false
); );
} else { } else {
rb.renderStandardBlock(block, i, j, k); rb.renderStandardBlock(block, i, j, k);
} }
rb.overrideBlockTexture = block.iconCondenserPart; rb.overrideBlockTexture = block.iconCondenserPart;
rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F); rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
rb, block, block.iconCondenserPart, false } else {
); rb.renderStandardBlock(block, i, j, k);
} else { }
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2); rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
rb, block, block.iconCondenserPart, false } else {
); rb.renderStandardBlock(block, i, j, k);
} else { }
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F); rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
rb, block, block.iconCondenserPart, false } else {
); rb.renderStandardBlock(block, i, j, k);
} else { }
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2); rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
if (inv) { if (inv) {
BlockRenderer.drawFaces( BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
rb, block, block.iconCondenserPart, false } else {
); rb.renderStandardBlock(block, i, j, k);
} else { }
rb.renderStandardBlock(block, i, j, k);
}
if (!inv) { if (!inv) {
TileCondenser tc = (TileCondenser) w.getTileEntity(i, j, k); TileCondenser tc = (TileCondenser) w.getTileEntity(i, j, k);
if (tc != null && tc.hasUpgrade((byte) 0)) { if (tc != null && tc.hasUpgrade((byte) 0)) {
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4); rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
rb.renderFaceXNeg(block, i, j, k, block.iconCondenserSpeedUpgrade); rb.renderFaceXNeg(block, i, j, k, block.iconCondenserSpeedUpgrade);
rb.renderFaceXPos(block, i, j, k, block.iconCondenserSpeedUpgrade); rb.renderFaceXPos(block, i, j, k, block.iconCondenserSpeedUpgrade);
rb.renderFaceZNeg(block, i, j, k, block.iconCondenserSpeedUpgrade); rb.renderFaceZNeg(block, i, j, k, block.iconCondenserSpeedUpgrade);
rb.renderFaceZPos(block, i, j, k, block.iconCondenserSpeedUpgrade); rb.renderFaceZPos(block, i, j, k, block.iconCondenserSpeedUpgrade);
}
} }
} }

137
src/main/java/net/anvilcraft/thaummach/render/apparatus/apparati/wood/RepairerApparatusRenderer.java
View file

@ -25,77 +25,74 @@ public class RepairerApparatusRenderer implements IApparatusRenderer {
boolean inv boolean inv
) { ) {
BlockApparatusWood block = (BlockApparatusWood) block_; BlockApparatusWood block = (BlockApparatusWood) block_;
if (block.getRenderBlockPass() == 0 || inv) { rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); if (inv) {
if (inv) { BlockRenderer.drawFaces(
BlockRenderer.drawFaces( rb,
rb, block,
block, block.iconRestorerBottom,
block.iconRestorerBottom, block.iconRestorerBottom,
block.iconRestorerBottom, block.iconRestorerBottom,
block.iconRestorerBottom, block.iconRestorerBottom,
block.iconRestorerBottom, block.iconRestorerBottom,
block.iconRestorerBottom, block.iconRestorerBottom,
block.iconRestorerBottom, false
false );
); } else {
} else { rb.renderStandardBlock(block, x, y, z);
rb.renderStandardBlock(block, x, y, z); }
}
if (!inv) { if (!inv) {
rb.renderFaceYPos( rb.renderFaceYPos(
block, block,
(double) x, (double) x,
(double) ((float) y - 1.0F + 0.425F), (double) ((float) y - 1.0F + 0.425F),
(double) z, (double) z,
block.iconRestorerBottom block.iconRestorerBottom
); );
rb.renderFaceYNeg( rb.renderFaceYNeg(
block, block,
(double) x, (double) x,
(double) ((float) (y + 1) - 0.425F), (double) ((float) (y + 1) - 0.425F),
(double) z, (double) z,
block.iconRestorerBottom block.iconRestorerBottom
); );
rb.renderFaceXPos( rb.renderFaceXPos(
block, block,
(double) ((float) (x - 1) + 0.425F), (double) ((float) (x - 1) + 0.425F),
(double) y, (double) y,
(double) z, (double) z,
block.iconRestorerBottom block.iconRestorerBottom
); );
rb.renderFaceXNeg( rb.renderFaceXNeg(
block, block,
(double) ((float) (x + 1) - 0.425F), (double) ((float) (x + 1) - 0.425F),
(double) y, (double) y,
(double) z, (double) z,
block.iconRestorerBottom block.iconRestorerBottom
); );
rb.renderFaceZPos( rb.renderFaceZPos(
block, block,
(double) x, (double) x,
(double) y, (double) y,
(double) ((float) (z - 1) + 0.425F), (double) ((float) (z - 1) + 0.425F),
block.iconRestorerBottom block.iconRestorerBottom
); );
rb.renderFaceZNeg( rb.renderFaceZNeg(
block, block,
(double) x, (double) x,
(double) y, (double) y,
(double) ((float) (z + 1) - 0.425F), (double) ((float) (z + 1) - 0.425F),
block.iconRestorerBottom block.iconRestorerBottom
); );
} else { } else {
rb.setRenderBounds(0.01F, 0.01F, 0.01F, 0.99F, 0.99F, 0.99F); rb.setRenderBounds(0.01F, 0.01F, 0.01F, 0.99F, 0.99F, 0.99F);
BlockRenderer.drawFaces( BlockRenderer.drawFaces(
rb, rb,
block, block,
((BlockApparatusMetal) TMBlocks.apparatusMetal) ((BlockApparatusMetal) TMBlocks.apparatusMetal).iconArcaneFurnaceInside,
.iconArcaneFurnaceInside, false
false );
);
}
} }
rb.overrideBlockTexture = null; rb.overrideBlockTexture = null;

4
src/main/java/net/anvilcraft/thaummach/render/model/ModelGenCore.java
View file

@ -6,16 +6,14 @@ import net.minecraft.entity.Entity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public class ModelGenCore extends ModelBase { public class ModelGenCore extends ModelBase {
private ModelRenderer cube; private ModelRenderer cube = new ModelRenderer(this, "cube");
private ModelRenderer outer = new ModelRenderer(this, "glass"); private ModelRenderer outer = new ModelRenderer(this, "glass");
public ModelGenCore(float f) { public ModelGenCore(float f) {
this.outer.setTextureOffset(0, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8); this.outer.setTextureOffset(0, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
this.cube = new ModelRenderer(this, "cube");
this.cube.setTextureOffset(32, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8); this.cube.setTextureOffset(32, 0).addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8);
} }
@Override
public void public void
render(Entity e, float f, float f1, float f2, float f3, float f4, float f5) { render(Entity e, float f, float f1, float f2, float f3, float f4, float f5) {
GL11.glPushMatrix(); GL11.glPushMatrix();

10
src/main/java/net/anvilcraft/thaummach/render/tile/TileCondenserRenderer.java
View file

@ -61,10 +61,10 @@ public class TileCondenserRenderer extends TileEntitySpecialRenderer {
new ResourceLocation("thaumcraft", "textures/models/crystal.png") new ResourceLocation("thaumcraft", "textures/models/crystal.png")
); );
GL11.glEnable(2977); GL11.glEnable(0xba1);
GL11.glEnable(3042); GL11.glEnable(0xbe2);
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glEnable(32826); GL11.glEnable(0x803a);
GL11.glBlendFunc(770, 771); GL11.glBlendFunc(770, 771);
Color c = new Color(CrystalColors.getColorForShard(condenser.currentType)); Color c = new Color(CrystalColors.getColorForShard(condenser.currentType));
GL11.glColor4f( GL11.glColor4f(
@ -81,9 +81,9 @@ public class TileCondenserRenderer extends TileEntitySpecialRenderer {
this.model.render(); this.model.render();
GL11.glScalef(1.0F, 1.0F, 1.0F); GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glDisable(32826); GL11.glDisable(0x803a);
GL11.glPopMatrix(); GL11.glPopMatrix();
GL11.glDisable(3042); GL11.glDisable(0xbe2);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
if (condenser.hasUpgrade((byte) 1)) { if (condenser.hasUpgrade((byte) 1)) {
this.drawDisk( this.drawDisk(

23
src/main/java/net/anvilcraft/thaummach/render/tile/TileGeneratorRenderer.java
View file

@ -1,7 +1,12 @@
package net.anvilcraft.thaummach.render.tile; package net.anvilcraft.thaummach.render.tile;
import net.anvilcraft.thaummach.TMBlocks;
import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
import net.anvilcraft.thaummach.render.model.ModelGenCore; import net.anvilcraft.thaummach.render.model.ModelGenCore;
import net.anvilcraft.thaummach.tiles.TileGenerator; import net.anvilcraft.thaummach.tiles.TileGenerator;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
@ -18,6 +23,10 @@ public class TileGeneratorRenderer extends TileEntitySpecialRenderer {
this.modelLoaded = 1; this.modelLoaded = 1;
} }
BlockApparatusMetal block = (BlockApparatusMetal) TMBlocks.apparatusMetal;
GL11.glEnable(0xbe2);
GL11.glBlendFunc(0x302, 0x303);
float f2 = gen.rotation + f; float f2 = gen.rotation + f;
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.3F, (float) z + 0.5F); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.3F, (float) z + 0.5F);
@ -27,6 +36,20 @@ public class TileGeneratorRenderer extends TileEntitySpecialRenderer {
f3 += f3 * f3; f3 += f3 * f3;
this.model.render(null, 0.0F, f2 * 1.0F, f3 * 0.01F, 0.0F, 0.0F, 0.0625F); this.model.render(null, 0.0F, f2 * 1.0F, f3 * 0.01F, 0.0F, 0.0F, 0.0625F);
GL11.glPopMatrix(); GL11.glPopMatrix();
this.bindTexture(TextureMap.locationBlocksTexture);
float w2 = 0.125F;
Tessellator.instance.startDrawingQuads();
RenderBlocks rb = RenderBlocks.getInstance();
rb.setRenderBounds(w2, w2, w2, 1.0f - w2, 1.0f - w2, 1.0f - w2);
rb.renderFaceYNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceYPos(block, x, y, z, block.iconGenerator4);
rb.renderFaceXNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceXPos(block, x, y, z, block.iconGenerator4);
rb.renderFaceZNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceZPos(block, x, y, z, block.iconGenerator4);
Tessellator.instance.draw();
GL11.glDisable(0xbe2);
} }
@Override @Override