Skip to content

Commit d3d4d23

Browse files
committed
Removed remnants of the pressure mechanic as it was never used.
1 parent d348929 commit d3d4d23

File tree

4 files changed

+2
-50
lines changed

4 files changed

+2
-50
lines changed

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/tiles/TileEntityFluidPipe.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
import java.util.HashMap;
1111

1212
public class TileEntityFluidPipe extends TileEntityFluidContainer{
13-
public boolean isPressurized = false;
14-
public TileEntityFluidContainer last = null;
13+
public TileEntityFluidContainer last = null;
1514

1615
public float size = 0.5f;
1716

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/tiles/TileEntityFluidTank.java

-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public void extractFluids(){
4444
}
4545

4646
public void pressurizePipes(TileEntityFluidPipe pipe, ArrayList<HashMap<String,Integer>> already){
47-
pipe.isPressurized = true;
4847
for (Direction dir : Direction.values()) {
4948
TileEntity tile = dir.getTileEntity(worldObj,this);
5049
if (tile instanceof TileEntityFluidPipe) {
@@ -58,14 +57,12 @@ public void pressurizePipes(TileEntityFluidPipe pipe, ArrayList<HashMap<String,I
5857
list.put("y",tile.y);
5958
list.put("z",tile.z);
6059
already.add(list);
61-
((TileEntityFluidPipe) tile).isPressurized = true;
6260
pressurizePipes((TileEntityFluidPipe) tile,already);
6361
}
6462
}
6563
}
6664

6765
public void unpressurizePipes(TileEntityFluidPipe pipe,ArrayList<HashMap<String,Integer>> already){
68-
pipe.isPressurized = false;
6966
for (Direction dir : Direction.values()) {
7067
TileEntity tile = dir.getTileEntity(worldObj,this);
7168
if (tile instanceof TileEntityFluidPipe) {
@@ -79,7 +76,6 @@ public void unpressurizePipes(TileEntityFluidPipe pipe,ArrayList<HashMap<String,
7976
list.put("y",tile.y);
8077
list.put("z",tile.z);
8178
already.add(list);
82-
((TileEntityFluidPipe) tile).isPressurized = false;
8379
unpressurizePipes((TileEntityFluidPipe) tile,already);
8480
}
8581
}

fluids/src/main/java/sunsetsatellite/catalyst/fluids/impl/tiles/TileEntityMultiFluidTank.java

-43
Original file line numberDiff line numberDiff line change
@@ -36,52 +36,9 @@ public void extractFluids(){
3636
Connection connection = e.getValue();
3737
TileEntity tile = dir.getTileEntity(worldObj,this);
3838
if (tile instanceof TileEntityFluidPipe) {
39-
pressurizePipes((TileEntityFluidPipe) tile, new ArrayList<>());
4039
moveFluids(dir, (TileEntityFluidPipe) tile);
4140
((TileEntityFluidPipe) tile).rememberTicks = 100;
4241
}
4342
}
4443
}
45-
46-
public void pressurizePipes(TileEntityFluidPipe pipe, ArrayList<HashMap<String,Integer>> already){
47-
pipe.isPressurized = true;
48-
for (Direction dir : Direction.values()) {
49-
TileEntity tile = dir.getTileEntity(worldObj,this);
50-
if (tile instanceof TileEntityFluidPipe) {
51-
for (HashMap<String, Integer> V2 : already) {
52-
if (V2.get("x") == tile.x && V2.get("y") == tile.y && V2.get("z") == tile.z) {
53-
return;
54-
}
55-
}
56-
HashMap<String,Integer> list = new HashMap<>();
57-
list.put("x",tile.x);
58-
list.put("y",tile.y);
59-
list.put("z",tile.z);
60-
already.add(list);
61-
((TileEntityFluidPipe) tile).isPressurized = true;
62-
pressurizePipes((TileEntityFluidPipe) tile,already);
63-
}
64-
}
65-
}
66-
67-
public void unpressurizePipes(TileEntityFluidPipe pipe,ArrayList<HashMap<String,Integer>> already){
68-
pipe.isPressurized = false;
69-
for (Direction dir : Direction.values()) {
70-
TileEntity tile = dir.getTileEntity(worldObj,this);
71-
if (tile instanceof TileEntityFluidPipe) {
72-
for (HashMap<String, Integer> V2 : already) {
73-
if (V2.get("x") == tile.x && V2.get("y") == tile.y && V2.get("z") == tile.z) {
74-
return;
75-
}
76-
}
77-
HashMap<String,Integer> list = new HashMap<>();
78-
list.put("x",tile.x);
79-
list.put("y",tile.y);
80-
list.put("z",tile.z);
81-
already.add(list);
82-
((TileEntityFluidPipe) tile).isPressurized = false;
83-
unpressurizePipes((TileEntityFluidPipe) tile,already);
84-
}
85-
}
86-
}
8744
}

fluids/src/main/java/sunsetsatellite/catalyst/fluids/render/RenderFluidInPipe.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void doRender(Tessellator tessellator, TileEntity tileEntity1, double d2,
102102
GL11.glEnable(GL11.GL_LIGHTING);
103103
GL11.glPopMatrix();
104104
}
105-
if(flag2 && ((TileEntityFluidPipe) tileEntity1).isPressurized || (blockAccess.getBlockTileEntity(i,j+1,k) instanceof TileEntityFluidPipe && ((TileEntityFluidPipe) blockAccess.getBlockTileEntity(i,j+1,k)).getFluidInSlot(0) != null)){
105+
if(flag2 && (blockAccess.getBlockTileEntity(i,j+1,k) instanceof TileEntityFluidPipe && ((TileEntityFluidPipe) blockAccess.getBlockTileEntity(i,j+1,k)).getFluidInSlot(0) != null)){
106106
GL11.glPushMatrix();
107107
GL11.glTranslatef((float)d2, (float)d4, (float)d6);
108108
GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F);

0 commit comments

Comments
 (0)