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 cpw.mods.fml.common.FMLCommonHandler;
import net.anvilcraft.thaummach.AuraUtils;
import net.anvilcraft.thaummach.GuiID;
import net.anvilcraft.thaummach.ITileGui;
@ -20,7 +19,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
public abstract class BlockApparatus extends BlockContainer {
protected int currentPass;
@ -134,17 +132,6 @@ public abstract class BlockApparatus extends BlockContainer {
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
public void onPostBlockPlaced(World world, int x, int y, int z, int meta) {
world.setBlockMetadataWithNotify(x, y, z, meta, 3);

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

@ -31,7 +31,6 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
BlockApparatus block = (BlockApparatus) block_;
float w1;
float w2;
if (block.getRenderBlockPass() == 0 || inv) {
w1 = 0.0625F;
w2 = 0.125F;
IIcon t1 = this.getBottomIcon((Apparatus) block);
@ -52,9 +51,7 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
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.setRenderBounds(0.0F, 0.5F - w2, 0.5F - w2, w1, 0.5F + w2, 0.5F + w2);
rb.renderStandardBlock(block, i, j, k);
}
@ -74,9 +71,7 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing)
&& !(te instanceof TileConduitTank)) {
rb.setRenderBounds(
0.5F - w2, 0.5F - w2, 0.0F, 0.5F + w2, 0.5F + w2, w1
);
rb.setRenderBounds(0.5F - w2, 0.5F - w2, 0.0F, 0.5F + w2, 0.5F + w2, w1);
rb.renderStandardBlock(block, i, j, k);
}
@ -91,11 +86,10 @@ public abstract class AbstractTankApparatusRenderer<Apparatus extends BlockAppar
rb.renderStandardBlock(block, i, j, k);
}
}
}
rb.overrideBlockTexture = null;
if (block.getRenderBlockPass() == 0 && !inv) {
if (!inv) {
w1 = 0.003F;
w2 = 0.0625F;
TileConduitTank tc = (TileConduitTank) w.getTileEntity(i, j, k);

27
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;
import dev.tilera.auracore.api.HelperLocation;
import dev.tilera.auracore.api.machine.IConnection;
import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
import net.anvilcraft.thaummach.tiles.TileConduit;
@ -41,7 +40,6 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
boolean visible = false;
total = Math.min(tc.pureVis + tc.taintedVis, tc.maxVis);
hfill = (1.0F - wq * 2.0F) * (total / tc.maxVis);
if (block.getRenderBlockPass() == 0) {
rb.overrideBlockTexture = block.iconConduit;
rb.setRenderBounds(w6, w6, w6, w6 + w4, w6 + w4, w6 + w4);
rb.renderStandardBlock(block, x, y, z);
@ -70,12 +68,10 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
rb.renderFaceZPos(
block, (double) x, (double) y, (double) z, block.iconTcubeanim
);
if (/*!Config.lowGfx && Config.pipedrips && */ Minecraft
.getMinecraft()
if (/*!Config.lowGfx && Config.pipedrips && */ Minecraft.getMinecraft()
.theWorld.rand.nextInt(50)
== 1
&& w.isAirBlock(x, y - 1, z)
&& tc.pureVis + tc.taintedVis > 3.5F) {
&& w.isAirBlock(x, y - 1, z) && tc.pureVis + tc.taintedVis > 3.5F) {
// TODO: FXDrip
//FXDrip obj = new FXDrip(
// w,
@ -91,7 +87,6 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
}
}
}
rb.overrideBlockTexture = block.iconConduitExtension;
for (int dir = 0; dir < 6; ++dir) {
@ -100,12 +95,9 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
TileEntity te = loc.getConnectableTile(w);
if (te != null) {
if (block.getRenderBlockPass() == 0) {
switch (loc.facing.getOpposite().ordinal()) {
case 0:
rb.setRenderBounds(
w6, w6 + w4, w6, w6 + w4, 1.0F, w6 + w4
);
rb.setRenderBounds(w6, w6 + w4, w6, w6 + w4, 1.0F, w6 + w4);
rb.renderStandardBlock(block, x, y, z);
break;
case 1:
@ -113,9 +105,7 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
rb.renderStandardBlock(block, x, y, z);
break;
case 2:
rb.setRenderBounds(
w6, w6, w6 + w4, w6 + w4, w6 + w4, 1.0F
);
rb.setRenderBounds(w6, w6, w6 + w4, w6 + w4, w6 + w4, 1.0F);
rb.renderStandardBlock(block, x, y, z);
break;
case 3:
@ -123,9 +113,7 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
rb.renderStandardBlock(block, x, y, z);
break;
case 4:
rb.setRenderBounds(
w6 + w4, w6, w6, 1.0F, w6 + w4, w6 + w4
);
rb.setRenderBounds(w6 + w4, w6, w6, 1.0F, w6 + w4, w6 + w4);
rb.renderStandardBlock(block, x, y, z);
break;
case 5:
@ -151,12 +139,9 @@ public class ConduitApparatusRenderer implements IApparatusRenderer {
}
}
}
}
} else {
rb.setRenderBounds(w6, 0.0F, w6, w6 + w4, 1.0F, w6 + w4);
BlockRenderer.drawFaces(
rb, block, block.iconConduitInventory, false
);
BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
}
rb.overrideBlockTexture = null;

34
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;
import dev.tilera.auracore.api.HelperLocation;
import dev.tilera.auracore.api.machine.IConnection;
import net.anvilcraft.thaummach.blocks.BlockApparatusFragile;
import net.anvilcraft.thaummach.render.apparatus.IApparatusRenderer;
import net.anvilcraft.thaummach.tiles.TileConduitValveAdvanced;
@ -41,7 +40,6 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
float total = 0.0F;
float hfill = 0.0F;
boolean visible = false;
if (block.getRenderBlockPass() == 0) {
switch (tc.setting) {
case 0:
rb.overrideBlockTexture = block.iconValveAdvancedOff;
@ -56,19 +54,15 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
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 {
visible = tc.pureVis + tc.taintedVis >= 0.1F;
if (visible) {
b = Math.min(
1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis)
);
b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
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));
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1
&& w.isAirBlock(i, j - 1, k)
&& tc.pureVis + tc.taintedVis > 3.5F) {
&& w.isAirBlock(i, j - 1, k) && tc.pureVis + tc.taintedVis > 3.5F) {
// TODO: WTF
//FXDrip obj = new FXDrip(
// w,
@ -84,7 +78,6 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
}
}
}
for (int dir = 0; dir < 6; ++dir) {
HelperLocation loc = new HelperLocation(tc);
@ -92,7 +85,6 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
TileEntity te = loc.getConnectableTile(w);
if (te != null) {
if (block.getRenderBlockPass() == 0) {
switch (dir) {
case 0:
rb.setRenderBounds(
@ -101,9 +93,7 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
rb.renderStandardBlock(block, i, j, k);
break;
case 1:
rb.setRenderBounds(
w6, 0.0F, w6, 1.0F - w6, w6, 1.0F - w6
);
rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, w6, 1.0F - w6);
rb.renderStandardBlock(block, i, j, k);
break;
case 2:
@ -113,9 +103,7 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
rb.renderStandardBlock(block, i, j, k);
break;
case 3:
rb.setRenderBounds(
w6, w6, 0.0F, 1.0F - w6, 1.0F - w6, w4
);
rb.setRenderBounds(w6, w6, 0.0F, 1.0F - w6, 1.0F - w6, w4);
rb.renderStandardBlock(block, i, j, k);
break;
case 4:
@ -125,27 +113,19 @@ public class ConduitValveAdvancedApparatusRenderer implements IApparatusRenderer
rb.renderStandardBlock(block, i, j, k);
break;
case 5:
rb.setRenderBounds(
0.0F, w6, w6, w4, 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);
}
} else if (visible && (((IConnection)te).getPureVis() + ((IConnection)te).getTaintedVis() > 0.1F || !((IConnection)te).isVisConduit())) {
ConduitApparatusRenderer.renderConduitVis(
w, rb, i, j, k, block, dir, hfill
);
}
}
}
} else {
rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
BlockRenderer.drawFaces(
rb, block, block.iconConduitInventory, false
);
BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
BlockRenderer.drawFaces(
rb, block, block.iconValveAdvancedOff, false
);
BlockRenderer.drawFaces(rb, block, block.iconValveAdvancedOff, false);
}
rb.overrideBlockTexture = null;

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

@ -39,7 +39,6 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
float total = 0.0F;
float hfill = 0.0F;
boolean visible = tc.pureVis + tc.taintedVis >= 0.1F;
if (block.getRenderBlockPass() == 0) {
if (tc.open) {
rb.overrideBlockTexture = block.iconValveOn;
} else {
@ -49,15 +48,13 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
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 {
if (visible) {
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));
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
if (Minecraft.getMinecraft().theWorld.rand.nextInt(50) == 1
&& w.isAirBlock(i, j - 1, k)
&& tc.pureVis + tc.taintedVis > 3.5F) {
&& w.isAirBlock(i, j - 1, k) && tc.pureVis + tc.taintedVis > 3.5F) {
// TODO: FXDrip
//FXDrip obj = new FXDrip(
// w,
@ -73,7 +70,6 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
//ModLoader.getMinecraftInstance().effectRenderer.addEffect(obj);
}
}
}
for (int dir = 0; dir < 6; ++dir) {
HelperLocation loc = new HelperLocation(tc);
@ -151,9 +147,7 @@ public class ConduitValveApparatusRenderer implements IApparatusRenderer {
}
} else {
rb.setRenderBounds(w6, 0.0F, w6, 1.0F - w6, 1.0F, 1.0F - w6);
BlockRenderer.drawFaces(
rb, block, block.iconConduitInventory, false
);
BlockRenderer.drawFaces(rb, block, block.iconConduitInventory, false);
rb.setRenderBounds(w4, w4, w4, 1.0F - w4, 1.0F - w4, 1.0F - w4);
BlockRenderer.drawFaces(rb, block, block.iconValveOn, false);
}

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

@ -31,7 +31,6 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
float w4 = 0.25F;
float w3 = 0.1875F;
float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(w2, 0.0F, w2, 1.0F - w2, w3, 1.0F - w2);
if (inv) {
BlockRenderer.drawFaces(
@ -82,7 +81,6 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
} else {
rb.renderStandardBlock(block, x, y, z);
}
}
if (!inv) {
float w6 = 0.375F;
@ -93,18 +91,14 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
float total = 0.0F;
float hfill = 0.0F;
boolean visible = false;
if (block.getRenderBlockPass() != 0) {
visible = tc.pureVis + tc.taintedVis >= 0.1F;
if (visible) {
b = Math.min(
1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis)
);
b = Math.min(1.0F, tc.pureVis / (tc.taintedVis + tc.pureVis));
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));
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
}
}
for (int dir = 2; dir < 6; ++dir) {
HelperLocation loc = new HelperLocation(tc);
@ -124,13 +118,10 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
TileEntity te = loc.getConnectableTile(w);
if (te != null && tc.getConnectable(loc.facing)) {
if (block.getRenderBlockPass() == 0) {
rb.overrideBlockTexture = block.iconConduitConnection;
switch (dir) {
case 2:
rb.setRenderBounds(
w6, w6, 1.0F - w3, w6 + w4, w6 + w4, 1.0F
);
rb.setRenderBounds(w6, w6, 1.0F - w3, w6 + w4, w6 + w4, 1.0F);
rb.renderStandardBlock(block, x, y, z);
break;
case 3:
@ -138,23 +129,19 @@ public class FilterApparatusRenderer implements IApparatusRenderer {
rb.renderStandardBlock(block, x, y, z);
break;
case 4:
rb.setRenderBounds(
1.0F - w3, w6, w6, 1.0F, w6 + w4, w6 + w4
);
rb.setRenderBounds(1.0F - w3, w6, w6, 1.0F, w6 + w4, w6 + w4);
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
);
}
}
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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

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

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

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

@ -24,7 +24,6 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
boolean inv
) {
BlockApparatusMetal block = (BlockApparatusMetal) block_;
if (block.getRenderBlockPass() == 0 || inv) {
boolean b1 = false;
boolean b2 = false;
boolean b3 = false;
@ -118,7 +117,6 @@ public class BoreApparatusRenderer implements IApparatusRenderer {
} else {
rb.renderStandardBlock(block, i, j, k);
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

13
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_;
MetaVals md = MetaVals.get(meta);
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.renderStandardBlock(block, i, j, k);
} else if (inv &&
(md == MetaVals.NORMAL_CRUCIBLE
|| md == MetaVals.EYES_CRUCIBLE
|| md == MetaVals.THAUMIUM_CRUCIBLE)
) {
} else if ((md == MetaVals.NORMAL_CRUCIBLE || md == MetaVals.EYES_CRUCIBLE
|| md == MetaVals.THAUMIUM_CRUCIBLE)) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
BlockRenderer.drawFaces(
rb,
@ -49,7 +46,7 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
icons[5],
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);
BlockRenderer.drawFaces(
rb,
@ -88,7 +85,6 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
f5 = 0.123F;
if (!inv) {
if (block.getRenderBlockPass() == 0) {
rb.renderFaceXPos(
block, (double) ((float) i - 1.0F + f5), (double) j, (double) k, c
);
@ -159,7 +155,6 @@ public class CrucibleApparatusRenderer implements IApparatusRenderer {
}
}
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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

@ -24,7 +24,6 @@ public class CrystallizerApparatusRenderer implements IApparatusRenderer {
) {
BlockApparatusMetal block = (BlockApparatusMetal) block_;
float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F + w2, 1.0F);
if (inv) {
BlockRenderer.drawFaces(
@ -82,7 +81,6 @@ public class CrystallizerApparatusRenderer implements IApparatusRenderer {
block.iconArcaneFurnaceInside
);
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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

@ -25,7 +25,6 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
BlockApparatusMetal block = (BlockApparatusMetal) block_;
float w2 = 0.125F;
float w4 = 0.25F;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(w4, 0.0F, w4, 1.0F - w4, w2, 1.0F - w4);
if (inv) {
BlockRenderer.drawFaces(rb, block, block.iconGenerator1, true);
@ -40,9 +39,7 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
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
);
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 {
@ -56,9 +53,7 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
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
);
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 {
@ -71,9 +66,7 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
} else {
rb.renderStandardBlock(block, x, y, z);
}
}
if (block.getRenderBlockPass() == 1 || inv) {
rb.overrideBlockTexture = null;
rb.setRenderBounds(w2, w2, w2, 1.0F - w2, 1.0F - w2, 1.0F - w2);
if (inv) {
@ -86,7 +79,6 @@ public class GeneratorApparatusRenderer implements IApparatusRenderer {
rb.renderFaceZNeg(block, x, y, z, block.iconGenerator4);
rb.renderFaceZPos(block, x, y, z, block.iconGenerator4);
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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

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

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

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

@ -28,7 +28,6 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
float w4 = 0.25F;
float w3 = 0.1875F;
float w2 = 0.125F;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(w3, 1.0F - w4, w3, 1.0F - w3, 1.0F, 1.0F - w3);
if (inv) {
BlockRenderer.drawFaces(
@ -66,36 +65,28 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
rb.overrideBlockTexture = block.iconCondenserPart;
rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
if (inv) {
BlockRenderer.drawFaces(
rb, block, block.iconCondenserPart, false
);
BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
} else {
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
if (inv) {
BlockRenderer.drawFaces(
rb, block, block.iconCondenserPart, false
);
BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
} else {
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.5F - w2, w2, 0.0F, 0.5F + w2, 1.0F - w2, 1.0F);
if (inv) {
BlockRenderer.drawFaces(
rb, block, block.iconCondenserPart, false
);
BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
} else {
rb.renderStandardBlock(block, i, j, k);
}
rb.setRenderBounds(0.0F, w2, 0.5F - w2, 1.0F, 1.0F - w2, 0.5F + w2);
if (inv) {
BlockRenderer.drawFaces(
rb, block, block.iconCondenserPart, false
);
BlockRenderer.drawFaces(rb, block, block.iconCondenserPart, false);
} else {
rb.renderStandardBlock(block, i, j, k);
}
@ -112,7 +103,6 @@ public class CondenserApparatusRenderer implements IApparatusRenderer {
rb.renderFaceZPos(block, i, j, k, block.iconCondenserSpeedUpgrade);
}
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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

@ -25,7 +25,6 @@ public class RepairerApparatusRenderer implements IApparatusRenderer {
boolean inv
) {
BlockApparatusWood block = (BlockApparatusWood) block_;
if (block.getRenderBlockPass() == 0 || inv) {
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
if (inv) {
BlockRenderer.drawFaces(
@ -91,12 +90,10 @@ public class RepairerApparatusRenderer implements IApparatusRenderer {
BlockRenderer.drawFaces(
rb,
block,
((BlockApparatusMetal) TMBlocks.apparatusMetal)
.iconArcaneFurnaceInside,
((BlockApparatusMetal) TMBlocks.apparatusMetal).iconArcaneFurnaceInside,
false
);
}
}
rb.overrideBlockTexture = null;
rb.setRenderBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);

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;
public class ModelGenCore extends ModelBase {
private ModelRenderer cube;
private ModelRenderer cube = new ModelRenderer(this, "cube");
private ModelRenderer outer = new ModelRenderer(this, "glass");
public ModelGenCore(float f) {
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);
}
@Override
public void
render(Entity e, float f, float f1, float f2, float f3, float f4, float f5) {
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")
);
GL11.glEnable(2977);
GL11.glEnable(3042);
GL11.glEnable(0xba1);
GL11.glEnable(0xbe2);
GL11.glPushMatrix();
GL11.glEnable(32826);
GL11.glEnable(0x803a);
GL11.glBlendFunc(770, 771);
Color c = new Color(CrystalColors.getColorForShard(condenser.currentType));
GL11.glColor4f(
@ -81,9 +81,9 @@ public class TileCondenserRenderer extends TileEntitySpecialRenderer {
this.model.render();
GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glPopMatrix();
GL11.glDisable(32826);
GL11.glDisable(0x803a);
GL11.glPopMatrix();
GL11.glDisable(3042);
GL11.glDisable(0xbe2);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
if (condenser.hasUpgrade((byte) 1)) {
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;
import net.anvilcraft.thaummach.TMBlocks;
import net.anvilcraft.thaummach.blocks.BlockApparatusMetal;
import net.anvilcraft.thaummach.render.model.ModelGenCore;
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.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
@ -18,6 +23,10 @@ public class TileGeneratorRenderer extends TileEntitySpecialRenderer {
this.modelLoaded = 1;
}
BlockApparatusMetal block = (BlockApparatusMetal) TMBlocks.apparatusMetal;
GL11.glEnable(0xbe2);
GL11.glBlendFunc(0x302, 0x303);
float f2 = gen.rotation + f;
GL11.glPushMatrix();
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;
this.model.render(null, 0.0F, f2 * 1.0F, f3 * 0.01F, 0.0F, 0.0F, 0.0625F);
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