tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feat: small fluid pipe rendering

Browse source
This commit is contained in:
Timo Ley 2023-02-17 19:45:19 +01:00
parent 74231c0d07
commit 3bf4ef52ef
4 changed files with 42 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -4,4 +4,4 @@ FMP_version=1.2.0.347
CCLIB_version=1.1.3.141
NEI_version=1.0.5.120
CCC_version=1.0.7.48
mod_version=9.12.1
mod_version=9.13.0

1
src/main/java/mekanism/api/MekanismConfig.java
View file

@ -89,6 +89,7 @@ public class MekanismConfig {
public static boolean doMultiblockSparkle = true;
public static int multiblockSparkleIntensity = 6;
public static ModelType modelType = ModelType.MODERN;
public static boolean smallPipeFluid = false;
}
public static class machines {

2
src/main/java/mekanism/client/ClientProxy.java
View file

@ -275,6 +275,8 @@ public class ClientProxy extends CommonProxy {
client.modelType = modelType;
}
client.smallPipeFluid = Mekanism.configuration.get("client", "SmallPipeFluid", false).getBoolean();
if (Mekanism.configuration.hasChanged()) {
Mekanism.configuration.save();
}

67
src/main/java/mekanism/client/render/RenderPartTransmitter.java
View file

@ -19,6 +19,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismConfig;
import mekanism.client.model.ModelTransporterBox;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D;
@ -64,7 +65,7 @@ public class RenderPartTransmitter implements IIconSelfRegister {
public static Map<String, CCModel> contents_models;
private static final int stages = 100;
private static final double height = 0.45;
private static final double height = 0.35;
private static final double offset = 0.015;
private ModelTransporterBox modelBox = new ModelTransporterBox();
@ -435,13 +436,13 @@ public class RenderPartTransmitter implements IIconSelfRegister {
switch (side) {
case UNKNOWN: {
toReturn.minX = 0.25 + offset;
toReturn.minY = 0.25 + offset;
toReturn.minZ = 0.25 + offset;
toReturn.minX = getFluidValue1() + offset;
toReturn.minY = getFluidValue1() + offset;
toReturn.minZ = getFluidValue1() + offset;
toReturn.maxX = 0.75 - offset;
toReturn.maxY = 0.25 + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = 0.75 - offset;
toReturn.maxX = getFluidValue2() - offset;
toReturn.maxY = getFluidValue1() + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = getFluidValue2() - offset;
break;
}
case DOWN: {
@ -450,13 +451,13 @@ public class RenderPartTransmitter implements IIconSelfRegister {
toReturn.minZ = 0.5 - (((float) i / (float) stages) * height) / 2;
toReturn.maxX = 0.5 + (((float) i / (float) stages) * height) / 2;
toReturn.maxY = 0.25 + offset;
toReturn.maxY = getFluidValue1() + offset;
toReturn.maxZ = 0.5 + (((float) i / (float) stages) * height) / 2;
break;
}
case UP: {
toReturn.minX = 0.5 - (((float) i / (float) stages) * height) / 2;
toReturn.minY = 0.25 - offset + ((float) i / (float) stages) * height;
toReturn.minY = getFluidValue1() - offset + ((float) i / (float) stages) * height;
toReturn.minZ = 0.5 - (((float) i / (float) stages) * height) / 2;
toReturn.maxX = 0.5 + (((float) i / (float) stages) * height) / 2;
@ -465,43 +466,43 @@ public class RenderPartTransmitter implements IIconSelfRegister {
break;
}
case NORTH: {
toReturn.minX = 0.25 + offset;
toReturn.minY = 0.25 + offset;
toReturn.minX = getFluidValue1() + offset;
toReturn.minY = getFluidValue1() + offset;
toReturn.minZ = 0.0;
toReturn.maxX = 0.75 - offset;
toReturn.maxY = 0.25 + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = 0.25 + offset;
toReturn.maxX = getFluidValue2() - offset;
toReturn.maxY = getFluidValue1() + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = getFluidValue1() + offset;
break;
}
case SOUTH: {
toReturn.minX = 0.25 + offset;
toReturn.minY = 0.25 + offset;
toReturn.minZ = 0.75 - offset;
toReturn.minX = getFluidValue1() + offset;
toReturn.minY = getFluidValue1() + offset;
toReturn.minZ = getFluidValue2() - offset;
toReturn.maxX = 0.75 - offset;
toReturn.maxY = 0.25 + offset + ((float) i / (float) stages) * height;
toReturn.maxX = getFluidValue2() - offset;
toReturn.maxY = getFluidValue1() + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = 1.0;
break;
}
case WEST: {
toReturn.minX = 0.0;
toReturn.minY = 0.25 + offset;
toReturn.minZ = 0.25 + offset;
toReturn.minY = getFluidValue1() + offset;
toReturn.minZ = getFluidValue1() + offset;
toReturn.maxX = 0.25 + offset;
toReturn.maxY = 0.25 + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = 0.75 - offset;
toReturn.maxX = getFluidValue1() + offset;
toReturn.maxY = getFluidValue1() + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = getFluidValue2() - offset;
break;
}
case EAST: {
toReturn.minX = 0.75 - offset;
toReturn.minY = 0.25 + offset;
toReturn.minZ = 0.25 + offset;
toReturn.minX = getFluidValue2() - offset;
toReturn.minY = getFluidValue1() + offset;
toReturn.minZ = getFluidValue1() + offset;
toReturn.maxX = 1.0;
toReturn.maxY = 0.25 + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = 0.75 - offset;
toReturn.maxY = getFluidValue1() + offset + ((float) i / (float) stages) * height;
toReturn.maxZ = getFluidValue2() - offset;
break;
}
}
@ -821,4 +822,12 @@ public class RenderPartTransmitter implements IIconSelfRegister {
cachedLiquids.clear();
cachedOverlays.clear();
}
public double getFluidValue1() {
return MekanismConfig.client.smallPipeFluid ? 0.315 : 0.25;
}
public double getFluidValue2() {
return MekanismConfig.client.smallPipeFluid ? 0.685 : 0.75;
}
}